[elpa] main f88876eb08: * elpa-packages (tramp): Use tramp.texi as doc.
branch: main
commit f88876eb08e8b1cb82b451a94607cd20a51f946e
Author: Michael Albinus
Commit: Michael Albinus
* elpa-packages (tramp): Use tramp.texi as doc.
---
elpa-packages | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/elpa-packages b/elpa-packages
index f2c60cac5d..4659c81c50 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -705,7 +705,7 @@
:branch "externals/tramp"
:main-file "trampver.el"
:make ("autoloads" "info")
- :doc "tramp.info")
+ :doc "tramp.texi")
(tramp-nspawn :url "https://github.com/bjc/tramp-nspawn";
:ignored-files ("COPYING"))
(tramp-theme :url nil)
[elpa] externals/cape 605b062c47: Use hashed symbols
branch: externals/cape commit 605b062c471adcb23f1e859248225188d29029fe Author: Daniel Mendler Commit: Daniel Mendler Use hashed symbols --- cape.el | 13 + 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/cape.el b/cape.el index 3c26bf2b71..87c6189c06 100644 --- a/cape.el +++ b/cape.el @@ -1165,10 +1165,15 @@ This function can be used as an advice around an existing Capf." ;;;###autoload (autoload 'cape-capf-silent "cape") ;;;###autoload (autoload 'cape-capf-super "cape") -(dolist (name '(accept-all buster case-fold debug inside-comment inside-faces -inside-string nonexclusive noninterruptible passthrough -predicate prefix-length properties purify silent super)) - (let ((wrapper (intern (format "cape-wrap-%s" name +(dolist (wrapper (list #'cape-wrap-accept-all #'cape-wrap-buster + #'cape-wrap-case-fold #'cape-wrap-debug + #'cape-wrap-inside-comment #'cape-wrap-inside-faces + #'cape-wrap-inside-string #'cape-wrap-nonexclusive + #'cape-wrap-noninterruptible #'cape-wrap-passthrough + #'cape-wrap-predicate #'cape-wrap-prefix-length + #'cape-wrap-properties #'cape-wrap-purify + #'cape-wrap-silent #'cape-wrap-super)) + (let ((name (string-remove-prefix "cape-wrap-" (symbol-name wrapper (defalias (intern (format "cape-capf-%s" name)) (lambda (capf &rest args) (lambda () (apply wrapper capf args))) (format "Create a %s Capf from CAPF.
[elpa] externals/corfu updated (d2b5d18155 -> f29735c1bb)
elpasync pushed a change to branch externals/corfu. from d2b5d18155 .gitignore backups new 5e47870fc6 Also set child-frame-border-width new f29735c1bb Also set child-frame-border Summary of changes: corfu.el | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-)
[elpa] externals/corfu 5e47870fc6 1/2: Also set child-frame-border-width
branch: externals/corfu commit 5e47870fc6103908a3b7d63cb7882c7095f53dc2 Author: Daniel Mendler Commit: Daniel Mendler Also set child-frame-border-width --- corfu.el | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/corfu.el b/corfu.el index 16d0546718..353516c9de 100644 --- a/corfu.el +++ b/corfu.el @@ -464,6 +464,11 @@ FRAME is the existing frame." `((parent-frame . ,parent) (minibuffer . ,(minibuffer-window parent)) (width . 0) (height . 0) (visibility . nil) + ;; XXX HACK The Emacs Mac Port does not support + ;; `internal-border-width', we also have to set + ;; `child-frame-border-width'. + (child-frame-border-width + . ,(alist-get 'internal-border-width corfu--frame-parameters)) ,@corfu--frame-parameters ;; XXX HACK Setting the same frame-parameter/face-background is not a nop. ;; Check before applying the setting. Without the check, the frame flickers @@ -471,7 +476,10 @@ FRAME is the existing frame." ;; parameter, otherwise the border is not updated. (let ((new (face-attribute 'corfu-border :background nil 'default))) (unless (equal (face-attribute 'internal-border :background frame 'default) new) -(set-face-background 'internal-border new frame))) +(set-face-background 'internal-border new frame)) + (unless (or (not (facep 'child-frame-border)) + (equal (face-attribute 'child-frame-border :background frame 'default) new)) +(set-face-background 'child-frame-border new frame))) ;; Reset frame parameters if they changed. For example `tool-bar-mode' ;; overrides the parameter `tool-bar-lines' for every frame, including child ;; frames. The child frame API is a pleasure to work with. It is full of
[elpa] externals/corfu f29735c1bb 2/2: Also set child-frame-border
branch: externals/corfu commit f29735c1bbc7ee3a3df95ae2388c794243e8470c Author: Daniel Mendler Commit: Daniel Mendler Also set child-frame-border See https://github.com/minad/corfu/commit/497c8534a267ec39ca80c7e27e70fca48c73563c --- corfu.el | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/corfu.el b/corfu.el index 353516c9de..bad2066fa4 100644 --- a/corfu.el +++ b/corfu.el @@ -327,6 +327,7 @@ See also the settings `corfu-auto-delay', `corfu-auto-prefix' and (border-width . 0) (outer-border-width . 0) (internal-border-width . 1) +(child-frame-border-width . 1) (left-fringe . 0) (right-fringe . 0) (vertical-scroll-bars . nil) @@ -464,11 +465,6 @@ FRAME is the existing frame." `((parent-frame . ,parent) (minibuffer . ,(minibuffer-window parent)) (width . 0) (height . 0) (visibility . nil) - ;; XXX HACK The Emacs Mac Port does not support - ;; `internal-border-width', we also have to set - ;; `child-frame-border-width'. - (child-frame-border-width - . ,(alist-get 'internal-border-width corfu--frame-parameters)) ,@corfu--frame-parameters ;; XXX HACK Setting the same frame-parameter/face-background is not a nop. ;; Check before applying the setting. Without the check, the frame flickers @@ -477,6 +473,8 @@ FRAME is the existing frame." (let ((new (face-attribute 'corfu-border :background nil 'default))) (unless (equal (face-attribute 'internal-border :background frame 'default) new) (set-face-background 'internal-border new frame)) + ;; XXX The Emacs Mac Port does not support `internal-border', we also have + ;; to set `child-frame-border'. (unless (or (not (facep 'child-frame-border)) (equal (face-attribute 'child-frame-border :background frame 'default) new)) (set-face-background 'child-frame-border new frame)))
[elpa] externals/ef-themes updated (e145251771 -> 5471d064d3)
elpasync pushed a change to branch externals/ef-themes. from e145251771 ef-arbutus: tweak prompt and keybind mappings new 567ae4246d ef-arbutus: tweak the fg-dim value new 5471d064d3 ef-arbutus: tweak the green-faint value Summary of changes: contrast-ratios.org | 4 ++-- ef-arbutus-theme.el | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
[elpa] externals/ef-themes 567ae4246d 1/2: ef-arbutus: tweak the fg-dim value
branch: externals/ef-themes commit 567ae4246d366f66391110b0ffec04d5726484c8 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou ef-arbutus: tweak the fg-dim value --- contrast-ratios.org | 2 +- ef-arbutus-theme.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrast-ratios.org b/contrast-ratios.org index 665acf3f62..2a7c50e5b2 100644 --- a/contrast-ratios.org +++ b/contrast-ratios.org @@ -57,7 +57,7 @@ C1 and C2 are color values written in hexadecimal RGB." | Name | | #ffead8 | #f0d8cf | #e7d2cb | #f7e2d2 | |+-+-+-+-+-| | fg-main| #393330 | 10.66 |9.13 |8.57 |9.92 | -| fg-dim | #6c697f |4.54 |3.89 |3.65 |4.23 | +| fg-dim | #6e678f |4.50 |3.86 |3.62 |4.19 | | fg-alt | #8a5f4a |4.72 |4.04 |3.79 |4.39 | | red| #bf |6.31 |5.41 |5.08 |5.88 | | red-warmer | #b20f00 |6.08 |5.21 |4.89 |5.66 | diff --git a/ef-arbutus-theme.el b/ef-arbutus-theme.el index 3cf2287a4c..341cb428e2 100644 --- a/ef-arbutus-theme.el +++ b/ef-arbutus-theme.el @@ -51,7 +51,7 @@ (bg-main "#ffead8") (fg-main "#393330") (bg-dim "#f0d8cf") - (fg-dim "#6c697f") + (fg-dim "#6e678f") (bg-alt "#e7d2cb") (fg-alt "#8a5f4a")
[elpa] externals/ef-themes 5471d064d3 2/2: ef-arbutus: tweak the green-faint value
branch: externals/ef-themes commit 5471d064d302597481b46cbe918c345c4a48c1f1 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou ef-arbutus: tweak the green-faint value --- contrast-ratios.org | 2 +- ef-arbutus-theme.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrast-ratios.org b/contrast-ratios.org index 2a7c50e5b2..fafd56863a 100644 --- a/contrast-ratios.org +++ b/contrast-ratios.org @@ -66,7 +66,7 @@ C1 and C2 are color values written in hexadecimal RGB." | green | #007000 |5.43 |4.65 |4.36 |5.05 | | green-warmer | #557000 |4.86 |4.17 |3.91 |4.53 | | green-cooler | #00704f |5.25 |4.50 |4.22 |4.89 | -| green-faint| #3f714f |4.89 |4.19 |3.93 |4.55 | +| green-faint| #3f712f |4.98 |4.27 |4.01 |4.64 | | yellow | #906200 |4.58 |3.92 |3.68 |4.26 | | yellow-warmer | #b44405 |4.78 |4.09 |3.84 |4.45 | | yellow-cooler | #8a6340 |4.57 |3.92 |3.68 |4.26 | diff --git a/ef-arbutus-theme.el b/ef-arbutus-theme.el index 341cb428e2..fe8a0eadb0 100644 --- a/ef-arbutus-theme.el +++ b/ef-arbutus-theme.el @@ -67,7 +67,7 @@ (green "#007000") (green-warmer"#557000") (green-cooler"#00704f") - (green-faint "#3f714f") + (green-faint "#3f712f") (yellow "#906200") (yellow-warmer "#b44405") (yellow-cooler "#8a6340")
[elpa] externals/tramp 7e6c74baa3: Tramp ELPA version 2.6.2 released
branch: externals/tramp commit 7e6c74baa3e941ebf2eacbf58ab151e7b4851f8d Author: Michael Albinus Commit: Michael Albinus Tramp ELPA version 2.6.2 released --- README | 6 +-- test/tramp-tests.el | 106 +--- texi/tramp.texi | 6 +-- texi/trampver.texi | 2 +- tramp-cache.el | 8 ++-- tramp-compat.el | 1 + tramp-crypt.el | 24 ++-- tramp-sh.el | 36 +- tramp.el| 19 -- trampver.el | 6 +-- 10 files changed, 138 insertions(+), 76 deletions(-) diff --git a/README b/README index 50b6dd07ec..020cbe929e 100644 --- a/README +++ b/README @@ -32,11 +32,11 @@ Emacs 28 or older • Remove all byte-compiled Tramp files - $ rm -f ~/.emacs.d/elpa/tramp-2.6.1.5/tramp*.elc + $ rm -f ~/.emacs.d/elpa/tramp-2.6.2/tramp*.elc • Start Emacs with Tramp’s source files - $ emacs -L ~/.emacs.d/elpa/tramp-2.6.1.5 -l tramp + $ emacs -L ~/.emacs.d/elpa/tramp-2.6.2 -l tramp This should not give you the error. @@ -50,7 +50,7 @@ Mitigation of a bug in Emacs 29.1 - Due to a bug in Emacs 29.1, you must apply the following change prior -installation or upgrading Tramp 2.6.1.5 from GNU ELPA: +installation or upgrading Tramp 2.6.2 from GNU ELPA: (when (string-equal emacs-version "29.1") (with-current-buffer diff --git a/test/tramp-tests.el b/test/tramp-tests.el index 7854466b81..a6a12571e6 100644 --- a/test/tramp-tests.el +++ b/test/tramp-tests.el @@ -3757,7 +3757,7 @@ This tests also `access-file', `file-readable-p', (should (eq (file-attribute-type attr) t))) ;; Cleanup. - (ignore-errors (delete-directory tmp-name1)) + (ignore-errors (delete-directory tmp-name1 'recursive)) (ignore-errors (delete-file tmp-name1)) (ignore-errors (delete-file tmp-name2)) @@ -5675,55 +5675,69 @@ If UNSTABLE is non-nil, the test is tagged as `:unstable'." (delete-exited-processes t) kill-buffer-query-functions command proc) -(dolist (sigcode '(2 INT)) - (unwind-protect - (with-temp-buffer - (setq command "trap 'echo boom; exit 1' 2; sleep 100" - proc (start-file-process-shell-command - (format "test1%s" sigcode) (current-buffer) command)) - (should (processp proc)) - (should (process-live-p proc)) - (should (equal (process-status proc) 'run)) - (should (numberp (process-get proc 'remote-pid))) - (should (equal (process-get proc 'remote-command) - (with-connection-local-variables - `(,shell-file-name ,shell-command-switch ,command - (should (zerop (signal-process proc sigcode))) - ;; Let the process accept the signal. - (with-timeout (10 (tramp--test-timeout-handler)) - (while (accept-process-output proc 0 nil t))) -(should-not (process-live-p proc))) +;; If PROCESS is a string, it must be a process name or a process +;; number. Check error handling. +(should-error + (signal-process (md5 (current-time-string)) 0) + :type 'wrong-type-argument) + +;; The PROCESS argument of `signal-process' can be a string. Test +;; this as well. +(dolist + (func '(identity + (lambda (x) (format "%s" (if (processp x) (process-name x) x) + (dolist (sigcode '(2 INT)) + (unwind-protect + (with-temp-buffer + (setq command "trap 'echo boom; exit 1' 2; sleep 100" + proc (start-file-process-shell-command + (format "test1-%s" sigcode) (current-buffer) command)) + (should (processp proc)) + (should (process-live-p proc)) + (should (equal (process-status proc) 'run)) + (should (numberp (process-get proc 'remote-pid))) + (should + (equal (process-get proc 'remote-command) + (with-connection-local-variables + `(,shell-file-name ,shell-command-switch ,command + (should (zerop (signal-process (funcall func proc) sigcode))) + ;; Let the process accept the signal. + (with-timeout (10 (tramp--test-timeout-handler)) + (while (accept-process-output proc 0 nil t))) + (should-not (process-live-p proc))) -;; Cleanup. -(ignore-errors (kill-process proc)) -(ignore-errors (delete-process proc))) + ;; Cleanup. + (ignore-errors (kill-process proc)) + (ignore-errors (delete-process proc))) - (unwind-protect - (with-temp-buffer - (setq command "trap 'echo boom; exit 1' 2; sleep 100" - proc (start-file-process-shell-command -
[nongnu] elpa/helm-core updated (7fd0054a50 -> 9262f9590c)
elpasync pushed a change to branch elpa/helm-core. from 7fd0054a50 Fix docstring adds 9262f9590c Simplify loop in helm--collect-pairs-in-string No new revisions were added by this update. Summary of changes: helm-lib.el | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-)
[nongnu] elpa/helm 9262f9590c: Simplify loop in helm--collect-pairs-in-string
branch: elpa/helm
commit 9262f9590c0a40f2f3339f10de2463e23659e726
Author: Thierry Volpiatto
Commit: Thierry Volpiatto
Simplify loop in helm--collect-pairs-in-string
---
helm-lib.el | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/helm-lib.el b/helm-lib.el
index a087d54c65..8c741013a3 100644
--- a/helm-lib.el
+++ b/helm-lib.el
@@ -607,9 +607,12 @@ E.g.: helm.el$
ls ""
(defsubst helm--collect-pairs-in-string (string)
- (cl-loop for str on (split-string string "" t) by 'cdr
- when (cdr str)
- collect (list (car str) (cadr str
+ ;; We want to collect e.g.
+ ;; in "abcd" -> (("a" "b") ("b" "c") ("c" "d"))
+ ;; and not (("a" "b") ("c" "d")) so we use by #'cdr which is the default.
+ ;; If the last pair have no cdr i.e. (s1 nil) ignore it.
+ (cl-loop for (s1 s2) on (split-string string "" t)
+ when s2 collect (list s1 s2)))
;;; Help routines.
;;
[elpa] main 16949d62d0: ; Fix last change
branch: main
commit 16949d62d0bf0068010441a543e4ee27c4aa440a
Author: Michael Albinus
Commit: Michael Albinus
; Fix last change
---
elpa-packages | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/elpa-packages b/elpa-packages
index 4659c81c50..ada5f01f28 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -705,7 +705,7 @@
:branch "externals/tramp"
:main-file "trampver.el"
:make ("autoloads" "info")
- :doc "tramp.texi")
+ :doc "texi/tramp.texi")
(tramp-nspawn :url "https://github.com/bjc/tramp-nspawn";
:ignored-files ("COPYING"))
(tramp-theme :url nil)
[elpa] externals/jinx 23c7bad2be 2/2: Reschedule on window selection change
branch: externals/jinx commit 23c7bad2be40a36043907b21f9dde72cb117ad3c Author: Daniel Mendler Commit: Daniel Mendler Reschedule on window selection change --- jinx.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jinx.el b/jinx.el index 06a1050077..2c25f7803b 100644 --- a/jinx.el +++ b/jinx.el @@ -259,7 +259,8 @@ checking." Internal variables (defvar jinx--schedule-hooks - '(window-state-change-hook window-scroll-functions post-command-hook) + '(window-selection-change-functions window-scroll-functions +window-state-change-hook post-command-hook) "Hooks which reschedule the spell checking timer, see `jinx--schedule'.") (defvar jinx--predicates
[elpa] externals/jinx updated (cba8589542 -> 23c7bad2be)
elpasync pushed a change to branch externals/jinx. from cba8589542 Avoid a little bit of timer consing new 86e5b734a1 Simplify rescheduling new 23c7bad2be Reschedule on window selection change Summary of changes: jinx.el | 24 +--- 1 file changed, 9 insertions(+), 15 deletions(-)
[elpa] externals/jinx 86e5b734a1 1/2: Simplify rescheduling
branch: externals/jinx commit 86e5b734a1cc7549cd28436e2ed8153d417394c1 Author: Daniel Mendler Commit: Daniel Mendler Simplify rescheduling --- jinx.el | 21 +++-- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/jinx.el b/jinx.el index 7e70ef32a4..06a1050077 100644 --- a/jinx.el +++ b/jinx.el @@ -258,9 +258,9 @@ checking." Internal variables -(defvar jinx--reschedule-hooks +(defvar jinx--schedule-hooks '(window-state-change-hook window-scroll-functions post-command-hook) - "Hooks which reschedule the spell checking timer, see `jinx--reschedule'.") + "Hooks which reschedule the spell checking timer, see `jinx--schedule'.") (defvar jinx--predicates (list #'jinx--face-ignored-p @@ -547,14 +547,7 @@ If CHECK is non-nil, always check first." (with-current-buffer buffer (jinx--check-pending (window-start win) (window-end win))) -(defun jinx--reschedule (&rest _) - "Restart the global idle timer." - (when (timer--function jinx--timer) -(cancel-timer jinx--timer) -(timer-set-function jinx--timer nil)) - (jinx--schedule)) - -(defun jinx--schedule () +(defun jinx--schedule (&rest _) "Start the global idle timer." (when (and (not (timer--function jinx--timer)) (not completion-in-region-mode) ;; Corfu completion @@ -1037,16 +1030,16 @@ This command dispatches to the following commands: (seq-some #'derived-mode-p jinx-camel-modes)) jinx--session-words (split-string jinx-local-words)) (jinx--load-dicts) -(dolist (hook jinx--reschedule-hooks) - (add-hook hook #'jinx--reschedule nil t)) +(dolist (hook jinx--schedule-hooks) + (add-hook hook #'jinx--schedule nil t)) (jit-lock-register #'jinx--mark-pending)) (t (mapc #'kill-local-variable '(jinx--exclude-regexp jinx--include-faces jinx--exclude-faces jinx--camel jinx--dicts jinx--syntax-table jinx--session-words)) -(dolist (hook jinx--reschedule-hooks) - (remove-hook hook #'jinx--reschedule t)) +(dolist (hook jinx--schedule-hooks) + (remove-hook hook #'jinx--schedule t)) (jit-lock-unregister #'jinx--mark-pending) (jinx--cleanup
[elpa] externals/tramp 6a997f3da9: ; Use version 2.6.2.0
branch: externals/tramp commit 6a997f3da9da089b0ac0da82c1df70ab82e6e676 Author: Michael Albinus Commit: Michael Albinus ; Use version 2.6.2.0 --- README | 6 +++--- texi/trampver.texi | 2 +- trampver.el| 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README b/README index 020cbe929e..1eb217b4d3 100644 --- a/README +++ b/README @@ -32,11 +32,11 @@ Emacs 28 or older • Remove all byte-compiled Tramp files - $ rm -f ~/.emacs.d/elpa/tramp-2.6.2/tramp*.elc + $ rm -f ~/.emacs.d/elpa/tramp-2.6.2.0/tramp*.elc • Start Emacs with Tramp’s source files - $ emacs -L ~/.emacs.d/elpa/tramp-2.6.2 -l tramp + $ emacs -L ~/.emacs.d/elpa/tramp-2.6.2.0 -l tramp This should not give you the error. @@ -50,7 +50,7 @@ Mitigation of a bug in Emacs 29.1 - Due to a bug in Emacs 29.1, you must apply the following change prior -installation or upgrading Tramp 2.6.2 from GNU ELPA: +installation or upgrading Tramp 2.6.2.0 from GNU ELPA: (when (string-equal emacs-version "29.1") (with-current-buffer diff --git a/texi/trampver.texi b/texi/trampver.texi index 4c32a492eb..39c0e7d73a 100644 --- a/texi/trampver.texi +++ b/texi/trampver.texi @@ -7,7 +7,7 @@ @c In the Tramp GIT, the version number and the bug report address @c are auto-frobbed from configure.ac. -@set trampver 2.6.2 +@set trampver 2.6.2.0 @set trampurl https://www.gnu.org/software/tramp/ @set tramp-bug-report-address tramp-devel@@gnu.org @set emacsver 26.1 diff --git a/trampver.el b/trampver.el index b9db505e9f..91cf6690ff 100644 --- a/trampver.el +++ b/trampver.el @@ -7,7 +7,7 @@ ;; Maintainer: Michael Albinus ;; Keywords: comm, processes ;; Package: tramp -;; Version: 2.6.2 +;; Version: 2.6.2.0 ;; Package-Requires: ((emacs "26.1")) ;; Package-Type: multi ;; URL: https://www.gnu.org/software/tramp/ @@ -40,7 +40,7 @@ ;; ./configure" to change them. ;;;###tramp-autoload -(defconst tramp-version "2.6.2" +(defconst tramp-version "2.6.2.0" "This version of Tramp.") ;;;###tramp-autoload @@ -78,7 +78,7 @@ ;; Check for Emacs version. (let ((x (if (not (string-version-lessp emacs-version "26.1")) "ok" -(format "Tramp 2.6.2 is not fit for %s" +(format "Tramp 2.6.2.0 is not fit for %s" (replace-regexp-in-string "\n" "" (emacs-version)) (unless (string-equal "ok" x) (error "%s" x)))
[elpa] externals/tempel c04e114f80: Use cl-callf2
branch: externals/tempel commit c04e114f8081ed248f56ae6d0c8a6cfe7be88480 Author: Daniel Mendler Commit: Daniel Mendler Use cl-callf2 --- tempel.el | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tempel.el b/tempel.el index 2eab48160d..afe401698a 100644 --- a/tempel.el +++ b/tempel.el @@ -609,9 +609,7 @@ This is meant to be a source in `tempel-template-sources'." (when st (mapc #'delete-overlay (car st)) (unless tempel--active - (setq minor-mode-overriding-map-alist -(delq (assq-delete-all 'tempel--active minor-mode-overriding-map-alist) - minor-mode-overriding-map-alist) + (cl-callf2 assq-delete-all 'tempel--active minor-mode-overriding-map-alist (defun tempel-done () "Template completion is done."
[elpa] externals/corfu 63d1de2696: Use global variables, store initial state separately
branch: externals/corfu commit 63d1de2696adcb09a4ea01ba668635364e37a9c2 Author: Daniel Mendler Commit: Daniel Mendler Use global variables, store initial state separately --- corfu.el | 56 ++- extensions/corfu-echo.el | 8 +++ extensions/corfu-popupinfo.el | 42 3 files changed, 54 insertions(+), 52 deletions(-) diff --git a/corfu.el b/corfu.el index bad2066fa4..6b53f80ccc 100644 --- a/corfu.el +++ b/corfu.el @@ -265,59 +265,61 @@ See also the settings `corfu-auto-delay', `corfu-auto-prefix' and (defvar corfu--auto-timer (timer-create) "Auto completion timer.") -(defvar-local corfu--candidates nil +(defvar corfu--candidates nil "List of candidates.") -(defvar-local corfu--metadata nil +(defvar corfu--metadata nil "Completion metadata.") -(defvar-local corfu--base "" +(defvar corfu--base "" "Base string, which is concatenated with the candidate.") -(defvar-local corfu--total 0 +(defvar corfu--total 0 "Length of the candidate list `corfu--candidates'.") -(defvar-local corfu--hilit #'identity +(defvar corfu--hilit #'identity "Lazy candidate highlighting function.") -(defvar-local corfu--index -1 +(defvar corfu--index -1 "Index of current candidate or negative for prompt selection.") -(defvar-local corfu--preselect -1 +(defvar corfu--preselect -1 "Index of preselected candidate, negative for prompt selection.") -(defvar-local corfu--scroll 0 +(defvar corfu--scroll 0 "Scroll position.") -(defvar-local corfu--input nil +(defvar corfu--input nil "Cons of last prompt contents and point.") -(defvar-local corfu--preview-ov nil +(defvar corfu--preview-ov nil "Current candidate overlay.") -(defvar-local corfu--extra nil +(defvar corfu--extra nil "Extra completion properties.") -(defvar-local corfu--change-group nil +(defvar corfu--change-group nil "Undo change group.") (defvar corfu--frame nil "Popup frame.") -(defconst corfu--state-vars - '(corfu--base -corfu--candidates -corfu--hilit -corfu--index -corfu--preselect -corfu--scroll -corfu--input -corfu--total -corfu--preview-ov -corfu--extra -corfu--change-group -corfu--metadata) - "Buffer-local state variables used by Corfu.") +(defconst corfu--initial-state + (mapcar + (lambda (k) (cons k (symbol-value k))) + '(corfu--base + corfu--candidates + corfu--hilit + corfu--index + corfu--preselect + corfu--scroll + corfu--input + corfu--total + corfu--preview-ov + corfu--extra + corfu--change-group + corfu--metadata)) + "Initial Corfu state.") (defvar corfu--frame-parameters '((no-accept-focus . t) @@ -1171,7 +1173,7 @@ AUTO is non-nil when initializing auto completion." (remove-hook 'post-command-hook #'corfu--post-command) (when corfu--preview-ov (delete-overlay corfu--preview-ov)) (accept-change-group corfu--change-group) - (mapc #'kill-local-variable corfu--state-vars)) + (cl-loop for (k . v) in corfu--initial-state do (set k v))) (defun corfu-sort-length-alpha (list) "Sort LIST by length and alphabetically." diff --git a/extensions/corfu-echo.el b/extensions/corfu-echo.el index dd6342f1a5..761322a31b 100644 --- a/extensions/corfu-echo.el +++ b/extensions/corfu-echo.el @@ -50,10 +50,10 @@ subsequent delay." (choice :tag "Subsequent" number))) :group 'corfu) -(defvar-local corfu-echo--timer nil +(defvar corfu-echo--timer nil "Echo area message timer.") -(defvar-local corfu-echo--message nil +(defvar corfu-echo--message nil "Last echo message.") (defun corfu-echo--cancel (&optional msg) @@ -63,8 +63,8 @@ subsequent delay." (setq corfu-echo--timer nil)) (corfu-echo--show msg) (unless corfu-echo--message -(kill-local-variable 'corfu-echo--timer) -(kill-local-variable 'corfu-echo--message))) +(setq corfu-echo--timer nil + corfu-echo--message nil))) (defun corfu-echo--show (msg) "Show MSG in echo area." diff --git a/extensions/corfu-popupinfo.el b/extensions/corfu-popupinfo.el index 8ec30d8ad6..cd297bc2de 100644 --- a/extensions/corfu-popupinfo.el +++ b/extensions/corfu-popupinfo.el @@ -133,38 +133,40 @@ documentation from the backend is usually expensive." (fringe-indicator-alist (continuation))) "Buffer parameters.") -(defvar-local corfu-popupinfo--toggle 'init - "Local toggle state.") - -(defvar-local corfu-popupinfo--function - #'corfu-popupinfo--get-documentation - "Function called to obtain documentation string.") - (defvar corfu-popupinfo--frame nil "Info popup child frame.") (defvar corfu-popupinfo--timer nil "Corfu info popup auto display timer.") -(defvar-local corfu-popupinfo--candidate nil +(defvar corfu-popupinfo--toggle 'init + "Toggle state.") + +(defvar corfu-popupinfo--function + #'corfu-popupinfo--get-documentation + "Function called to obtain documenta
[nongnu] elpa/org-contrib fb6ed8f314: lisp/org-screen.el: Switch to lexical binding
branch: elpa/org-contrib commit fb6ed8f3146a30522e84dfd3cb9f8b7879197d6b Author: Ihor Radchenko Commit: Ihor Radchenko lisp/org-screen.el: Switch to lexical binding --- lisp/org-screen.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org-screen.el b/lisp/org-screen.el index 1dad47755f..07e471e3db 100644 --- a/lisp/org-screen.el +++ b/lisp/org-screen.el @@ -1,4 +1,4 @@ -;;; org-screen.el --- Integreate Org-mode with screen. +;;; org-screen.el --- Integreate Org-mode with screen. -*- lexical-binding: t; -*- ;; Copyright (c) 2008-2014, 2021 Andrew Hyatt ;;
[elpa] externals/org-remark eaa9dc77da: fix: after-revert-hook is wrongly set as global (#74)
branch: externals/org-remark commit eaa9dc77da0b281ec568324019140d27ca190dd3 Author: Noboru Ota Commit: Noboru Ota fix: after-revert-hook is wrongly set as global (#74) Function `org-remark-highlights-load' is set to `after-revert-hook'. Before this fix, it was wrongly set as a global hook. This caused the hook to call the function wrongly for buffers that do not have `org-remark-mode` enabled -- it is a local minor mode. --- org-remark.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org-remark.el b/org-remark.el index da560c7173..1c3e4ba9f6 100644 --- a/org-remark.el +++ b/org-remark.el @@ -6,7 +6,7 @@ ;; URL: https://github.com/nobiot/org-remark ;; Version: 1.2.1 ;; Created: 22 December 2020 -;; Last modified: 07 October 2023 +;; Last modified: 30 December 2023 ;; Package-Requires: ((emacs "27.1") (org "9.4")) ;; Keywords: org-mode, annotation, note-taking, marginal-notes, wp, @@ -366,7 +366,7 @@ recommended to turn it on as part of Emacs initialization. (add-hook 'after-save-hook #'org-remark-save nil :local) (add-hook 'org-remark-highlight-link-to-source-functions #'org-remark-highlight-link-to-source-default 80) - (add-hook 'after-revert-hook #'org-remark-highlights-load :local) + (add-hook 'after-revert-hook #'org-remark-highlights-load 80 :local) (add-hook 'clone-buffer-hook #'org-remark-highlights-load 80 :local)) (t ;; Deactivate
[elpa] externals/cape 9d1a90275c: Replace keyword wp with text
branch: externals/cape commit 9d1a90275c7a809ebc3c0cf928d28b58c2d54b7c Author: Daniel Mendler Commit: Daniel Mendler Replace keyword wp with text --- cape.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cape.el b/cape.el index 87c6189c06..8f4b8ffdeb 100644 --- a/cape.el +++ b/cape.el @@ -8,7 +8,7 @@ ;; Version: 1.1 ;; Package-Requires: ((emacs "27.1") (compat "29.1.4.4")) ;; Homepage: https://github.com/minad/cape -;; Keywords: abbrev, convenience, matching, completion, wp +;; Keywords: abbrev, convenience, matching, completion, text ;; This file is part of GNU Emacs.
[elpa] externals/corfu f9b9d87a6d: Replace keyword wp with text
branch: externals/corfu commit f9b9d87a6d1f9321d37f80745d3f685a36586ff5 Author: Daniel Mendler Commit: Daniel Mendler Replace keyword wp with text --- corfu.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/corfu.el b/corfu.el index 6b53f80ccc..833454d27b 100644 --- a/corfu.el +++ b/corfu.el @@ -8,7 +8,7 @@ ;; Version: 1.1 ;; Package-Requires: ((emacs "27.1") (compat "29.1.4.4")) ;; Homepage: https://github.com/minad/corfu -;; Keywords: abbrev, convenience, matching, completion, wp +;; Keywords: abbrev, convenience, matching, completion, text ;; This file is part of GNU Emacs.
[elpa] externals/jinx f9e1550ecb: Replace keyword wp with text
branch: externals/jinx commit f9e1550ecb8843ad48fbdd02ced3b2fcd7292fd7 Author: Daniel Mendler Commit: Daniel Mendler Replace keyword wp with text --- jinx.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jinx.el b/jinx.el index 2c25f7803b..71e813cc97 100644 --- a/jinx.el +++ b/jinx.el @@ -8,7 +8,7 @@ ;; Version: 1.1 ;; Package-Requires: ((emacs "27.1") (compat "29.1.4.4")) ;; Homepage: https://github.com/minad/jinx -;; Keywords: convenience, wp +;; Keywords: convenience, text ;; This file is part of GNU Emacs.
[elpa] externals/org-modern 0fd111d1f0: Replace keyword wp with text
branch: externals/org-modern commit 0fd111d1f086a681aa68f323e337c256c3070305 Author: Daniel Mendler Commit: Daniel Mendler Replace keyword wp with text --- org-modern.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org-modern.el b/org-modern.el index 55420e2cfd..3164e7b47c 100644 --- a/org-modern.el +++ b/org-modern.el @@ -8,7 +8,7 @@ ;; Version: 1.1 ;; Package-Requires: ((emacs "27.1") (compat "29.1.4.4")) ;; Homepage: https://github.com/minad/org-modern -;; Keywords: outlines, hypermedia, wp +;; Keywords: outlines, hypermedia, text ;; This file is part of GNU Emacs.
[elpa] externals/tempel d73b822430: Replace keyword wp with text
branch: externals/tempel commit d73b822430549a2e5321536eaaa6ad2c701075b6 Author: Daniel Mendler Commit: Daniel Mendler Replace keyword wp with text --- tempel.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tempel.el b/tempel.el index afe401698a..b263cb0456 100644 --- a/tempel.el +++ b/tempel.el @@ -8,7 +8,7 @@ ;; Version: 1.0 ;; Package-Requires: ((emacs "27.1") (compat "29.1.4.0")) ;; Homepage: https://github.com/minad/tempel -;; Keywords: abbrev, languages, tools, wp +;; Keywords: abbrev, languages, tools, text ;; This file is part of GNU Emacs.
[elpa] externals/dape 61ff3b61a8 2/5: Added batteries for Java debugging with JDTLS + plugin. (#34)
branch: externals/dape
commit 61ff3b61a86ae04a1dd5c74ecc04f4caaa419d7f
Author: Magiel Bruntink
Commit: GitHub
Added batteries for Java debugging with JDTLS + plugin. (#34)
* Added batteries for Java debugging with JDTLS + plugin.
* Fix typo and remove some blank lines.
* Fix indentation.
* Added ensure function for jdtls config.
---
README.org | 13 +
dape.el| 57 -
2 files changed, 69 insertions(+), 1 deletion(-)
diff --git a/README.org b/README.org
index 45de516275..ef2a44a7bd 100644
--- a/README.org
+++ b/README.org
@@ -129,6 +129,19 @@ Install with ~gem install debug~.
See https://github.com/ruby/debug for more information
+** Java - JDTLS with Java Debug Server plugin
+See https://github.com/eclipse-jdtls/eclipse.jdt.ls for installation of JDTLS.
+See https://github.com/microsoft/java-debug for installation of the Java Debug
Server plugin.
+The Java config depends on Eglot running JDTLS with the plugin prior to
starting Dape.
+Extend ~eglot-server-programs~ as follows to have JDTLS load the plugin:
+#+begin_src emacs-lisp
+ (add-to-list 'eglot-server-programs
+ `((java-mode java-ts-mode) .
+ ("jdtls"
+ :initializationOptions
+ (:bundles
["/PATH/TO/java-debug/com.microsoft.java.debug.plugin/target/com.microsoft.java.debug.plugin-VERSION.jar"]
+#+end_src
+
** Other untested adapters
If you find a working configuration for any other debug adapter please submit
a PR.
diff --git a/dape.el b/dape.el
index 6aedbc14fc..aa5435d0d5 100644
--- a/dape.el
+++ b/dape.el
@@ -226,7 +226,62 @@
;; rails server
;; bundle exec ruby foo.rb
;; bundle exec rake test
- -c (lambda () (read-string "Invoke command: "
+ -c (lambda () (read-string "Invoke command: ")))
+(jdtls
+ modes (java-mode java-ts-mode)
+ ensure (lambda (config)
+ (require 'eglot)
+ (let* ((target (plist-get config 'target))
+(target-file (cond ((functionp target) (funcall target))
+ ((stringp target) target
+ (unless target-file
+ (error "No debug target specified"))
+ (with-current-buffer (find-file target-file)
+ (unless (eglot-current-server)
+ (eglot-ensure)
+ (error "No running eglot server, starting one. Try again
when eglot server is running"))
+ (unless (seq-contains-p (eglot--server-capable
:executeCommandProvider :commands)
+ "vscode.java.resolveClasspath")
+ (error "jdtls instance does not bundle java-debug-server,
please install")
+ fn (lambda (config)
+ (pcase-let* ((target (plist-get config 'target))
+ (default-directory (project-root (project-current)))
+ (server (with-current-buffer (find-file target)
+(eglot-current-server)))
+ (`(,project-name ,main-class)
+ (split-string (plist-get config 'entrypoint) ":"))
+ (`[,module-paths ,class-paths]
+ (eglot-execute-command server
"vscode.java.resolveClasspath"
+ (vector main-class
project-name
+ (thread-first config
+ (plist-put :mainClass main-class)
+ (plist-put :projectName project-name)
+ (plist-put :modulePaths module-paths)
+ (plist-put :classPaths class-paths
+ port (lambda () (eglot-execute-command (eglot-current-server)
+ "vscode.java.startDebugSession"
nil))
+ entrypoint (lambda ()
+ (completing-read
+ "Main class: "
+ (cl-map 'list
+ (lambda (candidate)
+(concat (plist-get candidate :projectName) ":"
+(plist-get candidate :mainClass)))
+ (eglot-execute-command (eglot-current-server)
+ "vscode.java.resolveMainClass"
+ (project-name
(project-current
+ nil t))
+ target (lambda () (when (buffer-file-name)
+(file-relative-name (buffer-file-name)
+(project-root (project-current)
+ :args ""
+ :stopOnEntry nil
+ :type "java"
+ :request "launch"
+ :vmArgs " -XX:+ShowCodeDetailsInExceptionMessages"
+ :console "integratedConsole"
+ :internalConsoleOptions "neverOpen"))
+
"This variable holds the Dape configurations as an alist.
In this alist,
[elpa] externals/dape 7a1a44b6ff 4/5: Rework dape-cwd-fn
branch: externals/dape
commit 7a1a44b6ff0b7fd490e609f19a8717c775cdcf31
Author: Daniel Pettersson
Commit: Daniel Pettersson
Rework dape-cwd-fn
Clarify usage somewhat with usage of dape-cwd and dape-command-cwd
---
README.org | 6 +-
dape.el| 51 +--
2 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/README.org b/README.org
index ef2a44a7bd..abe9186ef0 100644
--- a/README.org
+++ b/README.org
@@ -60,11 +60,7 @@ Currently =Dape= does not come with any debug adapter
configuration.
;; (save-some-buffers t t)))
;; Projectile users
-;; (setq dape-cwd-fn (lambda (&optional skip-tramp-trim)
-;; (let ((root (projectile-project-root)))
-;; (if (and (not skip-tramp-trim)
(tramp-tramp-file-p root))
-;; (tramp-file-name-localname
(tramp-dissect-file-name root))
-;; root
+;; (setq dape-cwd-fn 'projectile-project-root)
)
#+end_src
diff --git a/dape.el b/dape.el
index f28dd604ae..80ea058dc8 100644
--- a/dape.el
+++ b/dape.el
@@ -77,7 +77,7 @@
fn dape-config-autoport
:type "lldb"
:request "launch"
- :cwd dape-cwd-fn
+ :cwd dape-cwd
:program dape-find-file
:args [])))
`((codelldb-cc
@@ -100,7 +100,7 @@
"OpenDebugAD7")
:type "cppdbg"
:request "launch"
- :cwd dape-cwd-fn
+ :cwd dape-cwd
:program dape-find-file
:MIMode ,(seq-find 'executable-find '("lldb" "gdb")))
(debugpy
@@ -119,7 +119,7 @@
port :autoport
:request "launch"
:type "executable"
- :cwd dape-cwd-fn
+ :cwd dape-cwd
:program dape-find-file-buffer-default
:justMyCode nil
:console "integratedTerminal"
@@ -130,20 +130,20 @@
fn (dape-config-autoport dape-config-tramp)
command "dlv"
command-args ("dap" "--listen" "127.0.0.1::autoport")
- command-cwd (lambda () (funcall dape-cwd-fn t))
+ command-cwd dape-command-cwd
port :autoport
:request "launch"
:type "debug"
- :cwd dape-cwd-fn
- :program dape-cwd-fn)
+ :cwd dape-cwd
+ :program dape-cwd)
(flutter
ensure dape-ensure-command
modes (dart-mode)
command "flutter"
command-args ("debug_adapter")
- command-cwd (lambda () (funcall dape-cwd-fn t))
+ command-cwd dape-command-cwd
:type "dart"
- :cwd dape-cwd-fn
+ :cwd dape-cwd
:program dape-find-file-buffer-default
:toolArgs ,(lambda () (vector "-d" (read-string "Device id: "
(godot
@@ -151,7 +151,7 @@
port 6006
:request "launch"
:type "server"
- :cwd dape-cwd-fn)
+ :cwd dape-cwd)
,@(let ((js-debug
`(modes (js-mode js-ts-mode)
ensure ,(lambda (config)
@@ -172,7 +172,7 @@
`((js-debug-node
,@js-debug
:type "pwa-node"
- :cwd dape-cwd-fn
+ :cwd dape-cwd
:program dape-find-file-buffer-default
:outputCapture "console"
:sourceMapRenames t
@@ -187,14 +187,14 @@
:url ,(lambda ()
(read-string "Url: "
"http://localhost:3000";))
- :webRoot dape-cwd-fn
+ :webRoot dape-cwd
:outputCapture "console")))
(lldb-vscode
modes (c-mode c-ts-mode c++-mode c++-ts-mode rust-mode rust-ts-mode)
ensure dape-ensure-command
command "lldb-vscode"
:type "lldb-vscode"
- :cwd dape-cwd-fn
+ :cwd dape-cwd
:program dape-find-file)
(netcoredbg
modes (csharp-mode csharp-ts-mode)
@@ -202,7 +202,7 @@
command "netcoredbg"
command-args ["--interpreter=vscode"]
:request "launch"
- :cwd dape-cwd-fn
+ :cwd dape-cwd
:program dape-find-file
:stopAtEntry nil)
(rdbg
@@ -210,7 +210,7 @@
ensure dape-ensure-command
command "rdbg"
command-args ("-O" "--host" "0.0.0.0" "--port" :autoport "-c" "--" :-c)
- command-cwd (lambda () (funcall dape-cwd-fn t))
+ command-cwd dape-command-cwd
fn ((lambda (config)
(plist-put config 'command-args
(mapcar (lambda (arg)
@@ -710,21 +710,28 @@ If PULSE pulse on after opening file."
(line-beginning-position 2)
'next-error)))
-(defun dape--default-cwd (&optional skip-tramp-trim)
- "Try to guess current project absolute file path.
-On SKIP-TRAMP-TRIM tramp prefix is keept in path."
- (let ((root (or (when-let ((project (project-current)))
-(expand-file-name (project-root project)))
- default-directory)))
-(if (and (not skip-tramp-trim) (tramp-tramp-file-p root))
+(def
[elpa] externals/dape 9ecd6ba580 5/5: Use stdout from adapter in repl
branch: externals/dape commit 9ecd6ba580ee49ef3804681369f09f7d2e7a9211 Author: Daniel Pettersson Commit: Daniel Pettersson Use stdout from adapter in repl Adds output from dlv to console --- dape-tests.el | 2 ++ dape.el | 14 ++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dape-tests.el b/dape-tests.el index 4e15dcbc78..163c3f7095 100644 --- a/dape-tests.el +++ b/dape-tests.el @@ -101,6 +101,8 @@ Helper for `dape-test--with-files'." (string-match-p "\\*dape-.+\\*" (buffer-name buffer))) (buffer-list +(dape-test--should + (not (process-list))) (advice-remove 'yes-or-no-p 'always-yes) ;; clean up files (delete-directory temp-dir t) diff --git a/dape.el b/dape.el index 80ea058dc8..c316fa11a4 100644 --- a/dape.el +++ b/dape.el @@ -1691,11 +1691,17 @@ Starts a new process as per request of the debug adapter." :buffer buffer :sentinel 'dape--process-sentinel :filter (lambda (_process string) - (dape--debug 'std-server - "Server stdout:\n%s" - string)) + (dape--repl-message string)) :noquery t -:file-handler t)) +:file-handler t +:stderr +(make-pipe-process + :name "Dape adapter stderr" + :filter (lambda (_process string) + (dape--debug 'std-server +"Server stdout:\n%s" +string)) + :buffer buffer))) (dape--debug 'info "Server process started %S" (process-command dape--server-process)) ;; FIXME Why do I need this?
[elpa] externals/dape 506054e7d9 3/5: Fix obsolete variable alias warning
branch: externals/dape commit 506054e7d9507117cc345377c7593dd203013cc6 Author: Daniel Pettersson Commit: Daniel Pettersson Fix obsolete variable alias warning --- dape.el | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dape.el b/dape.el index aa5435d0d5..f28dd604ae 100644 --- a/dape.el +++ b/dape.el @@ -367,16 +367,16 @@ Example value: "`display-buffer' action used when displaying source buffer." :type 'sexp) +(define-obsolete-variable-alias + 'dape-buffer-window-arrangment + 'dape-buffer-window-arrangement "0.3.0") + (defcustom dape-buffer-window-arrangement 'left "Rules for display dape buffers." :type '(choice (const :tag "GUD gdb like" gud) (const :tag "Left side" left) (const :tag "Right side" right))) -(define-obsolete-variable-alias - 'dape-buffer-window-arrangment - 'dape-buffer-window-arrangement "0.3.0") - (defcustom dape-stepping-granularity 'line "The granularity of one step in the stepping requests." :type '(choice (const :tag "Step statement" statement)
[elpa] externals/dape updated (00b226369c -> 9ecd6ba580)
elpasync pushed a change to branch externals/dape. from 00b226369c Fix spelling of arrangement #41 new 5f04353955 Fix ensure evaluation of command-cwd #42 new 61ff3b61a8 Added batteries for Java debugging with JDTLS + plugin. (#34) new 506054e7d9 Fix obsolete variable alias warning new 7a1a44b6ff Rework dape-cwd-fn new 9ecd6ba580 Use stdout from adapter in repl Summary of changes: README.org| 19 +--- dape-tests.el | 2 + dape.el | 141 +++--- 3 files changed, 122 insertions(+), 40 deletions(-)
[elpa] externals/dape 5f04353955 1/5: Fix ensure evaluation of command-cwd #42
branch: externals/dape
commit 5f04353955097ba0d6892c8a51310c0a08608b58
Author: Daniel Pettersson
Commit: Daniel Pettersson
Fix ensure evaluation of command-cwd #42
---
dape.el | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/dape.el b/dape.el
index 7644211c39..6aedbc14fc 100644
--- a/dape.el
+++ b/dape.el
@@ -130,7 +130,7 @@
fn (dape-config-autoport dape-config-tramp)
command "dlv"
command-args ("dap" "--listen" "127.0.0.1::autoport")
- command-cwd dape-cwd-fn
+ command-cwd (lambda () (funcall dape-cwd-fn t))
port :autoport
:request "launch"
:type "debug"
@@ -141,7 +141,7 @@
modes (dart-mode)
command "flutter"
command-args ("debug_adapter")
- command-cwd dape-cwd-fn
+ command-cwd (lambda () (funcall dape-cwd-fn t))
:type "dart"
:cwd dape-cwd-fn
:program dape-find-file-buffer-default
@@ -753,7 +753,8 @@ Replaces symbol and string occurences of \"autoport\"."
(dape--config-eval-value (plist-get config 'command
(unless (or (file-executable-p command)
(executable-find command t))
- (user-error "Unable to locate %S" command
+ (user-error "Unable to locate %s with default-directory %s"
+ command default-directory
(defun dape--overlay-region (&optional extended)
"List of beg and end of current line.
@@ -3458,12 +3459,14 @@ arrays [%S ...], if meant as an object replace (%S ...)
with (:%s ...)"
"Ensure that CONFIG is valid executable.
If SIGNAL is non nil raises an `user-error'."
(if-let ((ensure-fn (plist-get config 'ensure)))
- (let ((default-directory (or (plist-get config 'command-cwd)
- default-directory)))
+ (let ((default-directory
+ (or (when-let ((command-cwd (plist-get config 'command-cwd)))
+ (dape--config-eval-value command-cwd))
+ default-directory)))
(condition-case err
(or (funcall ensure-fn config) t)
(user-error
- (if signal (user-error (cdr err)) nil
+ (if signal (user-error (cadr err)) nil
t))
(defun dape--config-mode-p (config)
[nongnu] elpa/xah-fly-keys a18e0c1b96: xah-run-current-file now uses the same output buffer. (before, each time it runs, it creates a new buffer.)
branch: elpa/xah-fly-keys commit a18e0c1b9681b64710f691456b7e71cb8d30a875 Author: Xah Lee Commit: Xah Lee xah-run-current-file now uses the same output buffer. (before, each time it runs, it creates a new buffer.) --- xah-fly-keys.el | 28 +++- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/xah-fly-keys.el b/xah-fly-keys.el index d9e0120515..553f243da5 100644 --- a/xah-fly-keys.el +++ b/xah-fly-keys.el @@ -4,7 +4,7 @@ ;; Author: Xah Lee ( http://xahlee.info/ ) ;; Maintainer: Xah Lee -;; Version: 24.19.20231212124900 +;; Version: 24.19.20231230171204 ;; Created: 2013-09-10 ;; Package-Requires: ((emacs "27")) ;; Keywords: convenience, vi, vim, ergoemacs, keybinding @@ -2550,7 +2550,7 @@ You can customize this alist.") (defun xah-run-current-file () "Execute the current file. For example, if the current buffer is x.py, then it'll call python x.py in a shell. -Output is printed to buffer “*xah-run output*”. +Output is printed to buffer “*xah-run*”. File suffix is used to determine which program to run, set in the variable `xah-run-current-file-map'. When `universal-argument' is called first, prompt user to enter command line options. @@ -2558,22 +2558,24 @@ When `universal-argument' is called first, prompt user to enter command line opt If the file is modified or not saved, save it automatically before run. URL `http://xahlee.info/emacs/emacs/elisp_run_current_file.html' -Version: 2020-09-24 2022-09-18 2023-09-29 2023-12-04" +Version: 2020-09-24 2023-12-04 2023-12-30" (interactive) ;; (setenv "NO_COLOR" "1") ; 2022-09-10 for deno. default color has yellow parts, hard to see (when (not buffer-file-name) (user-error "Buffer is not file. Save it first.")) (when (buffer-modified-p) (save-buffer)) (let (xoutBuffer xextAppMap xfname xfExt xappCmdStr xcmdStr) -(setq xoutBuffer (generate-new-buffer-name "*xah-run output*") - xextAppMap xah-run-current-file-map - xfname buffer-file-name - xfExt (file-name-extension buffer-file-name) - xappCmdStr (cdr (assoc xfExt xextAppMap)) - xcmdStr - (when xappCmdStr -(format "%s %s &" -xappCmdStr -(shell-quote-argument xfname +(setq + ;; xoutBuffer (generate-new-buffer-name "*xah-run") + xoutBuffer "*xah-run*" + xextAppMap xah-run-current-file-map + xfname buffer-file-name + xfExt (file-name-extension buffer-file-name) + xappCmdStr (cdr (assoc xfExt xextAppMap)) + xcmdStr + (when xappCmdStr + (format "%s %s &" + xappCmdStr + (shell-quote-argument xfname ;; FIXME: Rather than `shell-command' with an `&', better use ;; `make-process' or `start-process' since we're not using the shell at all
