[nongnu] elpa/evil 157af04d2c: update evil-quit to handle tabs

[ELPA Syncer]

branch: elpa/evil
commit 157af04d2cf466e301e82b0e667c5e7203fd96a2
Author: Josh Mcguigan 
Commit: Tom Dalziel <33435574+tomd...@users.noreply.github.com>

update evil-quit to handle tabs
---
 evil-commands.el | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/evil-commands.el b/evil-commands.el
index d6b2e622af..4cebc879b3 100644
--- a/evil-commands.el
+++ b/evil-commands.el
@@ -3329,7 +3329,7 @@ for the last window in each frame."
 wins
 
 (evil-define-command evil-quit (&optional force)
-  "Closes the current window, current frame, Emacs.
+  "Closes the current window, current frame, current tab, Emacs.
 If the current frame belongs to some client the client connection
 is closed."
   :repeat nil
@@ -3347,9 +3347,12 @@ is closed."
(condition-case nil
(delete-frame)
  (error
-  (if force
-  (kill-emacs)
-(save-buffers-kill-emacs
+  (condition-case nil
+  (tab-bar-close-tab)
+(error
+ (if force
+ (kill-emacs)
+   (save-buffers-kill-emacs))
 
 (evil-define-command evil-quit-all (&optional bang)
   "Exits Emacs, asking for saving."

[nongnu] elpa/cider updated (0d2ba20c02 -> e86f2f74f6)

[ELPA Syncer]

elpasync pushed a change to branch elpa/cider.

  from  0d2ba20c02 Add a note about removing cider-fallback-eval:info down 
the road
   new  c1251c0c7c cider-eval-ns-form: use "P" instead of "p"
   new  3f3607f38c Use returned ns, not a magic match-string
   new  e86f2f74f6 Add changelog


Summary of changes:
 CHANGELOG.md  | 3 +++
 cider-eval.el | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

[nongnu] elpa/cider c1251c0c7c 1/3: cider-eval-ns-form: use "P" instead of "p"

[ELPA Syncer]

branch: elpa/cider
commit c1251c0c7ca22c4277485e67657743a223952c0b
Author: Daniel Skarda 
Commit: Bozhidar Batsov 

cider-eval-ns-form: use "P" instead of "p"

"p" is a number thus always true
---
 cider-eval.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cider-eval.el b/cider-eval.el
index c25fe4768f..3c5c7b547c 100644
--- a/cider-eval.el
+++ b/cider-eval.el
@@ -1333,7 +1333,7 @@ buffer, else display in a popup buffer."
 (defun cider-eval-ns-form (&optional undef-all)
   "Evaluate the current buffer's namespace form.
 When UNDEF-ALL is non-nil, unmap all symbols and aliases first."
-  (interactive "p")
+  (interactive "P")
   (when (clojure-find-ns)
 (save-excursion
   (goto-char (match-beginning 0))

[nongnu] elpa/cider e86f2f74f6 3/3: Add changelog

[ELPA Syncer]

branch: elpa/cider
commit e86f2f74f65eaa3aa2dd088ad2e0b1426a04c3e1
Author: Daniel Skarda 
Commit: Bozhidar Batsov 

Add changelog
---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb9a693e41..c45d489d15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@
 * [#3195](https://github.com/clojure-emacs/cider/issues/3195): Revert the 
change that resulted in `(error "Cyclic keymap inheritance")` on 
`cider-test-run-test`.
 * [#3182](https://github.com/clojure-emacs/cider/issues/3182): Don't try to 
invoke
 JVM-specific code outside of JVM Clojure.
+* [#3202](https://github.com/clojure-emacs/cider/pull/3202): Fix 
`cider-eval-ns-form`
+  * Do not always perform `undef-all`. Undef only with `C-u` prefix.
+  * Fix extraction of namespace name.
 
 ## 1.4.0 (2022-05-02)
 

[nongnu] elpa/cider 3f3607f38c 2/3: Use returned ns, not a magic match-string

[ELPA Syncer]

branch: elpa/cider
commit 3f3607f38cecc2059176b87c43729308da7e345f
Author: Daniel Skarda 
Commit: Bozhidar Batsov 

Use returned ns, not a magic match-string
---
 cider-eval.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cider-eval.el b/cider-eval.el
index 3c5c7b547c..223d81b791 100644
--- a/cider-eval.el
+++ b/cider-eval.el
@@ -1334,11 +1334,11 @@ buffer, else display in a popup buffer."
   "Evaluate the current buffer's namespace form.
 When UNDEF-ALL is non-nil, unmap all symbols and aliases first."
   (interactive "P")
-  (when (clojure-find-ns)
+  (when-let ((ns (clojure-find-ns)))
 (save-excursion
   (goto-char (match-beginning 0))
   (when undef-all
-(cider-undef-all (match-string 0)))
+(cider-undef-all ns))
   (cider-eval-defun-at-point
 
 (defun cider-read-and-eval (&optional value)

[nongnu] elpa/org-mime 1a57b9c926: support more quote title style

[ELPA Syncer]

branch: elpa/org-mime
commit 1a57b9c926e8b23b93c8c376a6d37d34fc949285
Author: Chen Bin 
Commit: Chen Bin 

support more quote title style
---
 org-mime.el| 24 ++--
 test/org-mime-tests.el |  8 
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/org-mime.el b/org-mime.el
index 9c91bfaf1f..332b428b77 100644
--- a/org-mime.el
+++ b/org-mime.el
@@ -171,11 +171,12 @@ Default (nil) selects the original org file."
   :group 'org-mime
   :type 'string)
 
-(defcustom org-mime-mail-quoted-separator
-  "^>[^>=]+==\\([^=\r\n]+\\)"
-  "Below this separator is mostly quoted mail."
+(defcustom org-mime-mail-quoted-separators
+  '("^>[^>=]+==\\([^=\r\n]+\\)$"
+"^\\(On [^\r\n]+ wrote:\\)$")
+  "Possible separators.  Below the separator is mostly quoted mail."
   :group 'org-mime
-  :type 'string)
+  :type '(repeat string))
 
 (defvar org-mime-export-options '(:with-latex dvipng)
   "Default export options which may override org buffer/subtree options.
@@ -499,9 +500,20 @@ CURRENT-FILE is used to calculate full path of images."
   (list :secure-tags (nreverse secure-tags)
 :part-tags (nreverse part-tags)
 
+(defun org-mime-find-quoted-separator (content)
+  "Find correct separator to extract quoted mail from CONTENT."
+  (let ((rlt (cl-find-if (lambda (p)
+  (string-match p content))
+org-mime-mail-quoted-separators)))
+(when org-mime-debug
+  (message "org-mime-find-quoted-separator called => %s" rlt))
+rlt))
+
 (defun org-mime-extract-my-reply (content)
   "Extract my reply from CONTENT (no quoted content)."
-  (let* ((arr (split-string content org-mime-mail-quoted-separator))
+  (let* ((quoted-separator (org-mime-find-quoted-separator content))
+ (arr (if quoted-separator (split-string content quoted-separator)
+(list content)))
  rlt)
 
 ;; extract reply
@@ -509,7 +521,7 @@ CURRENT-FILE is used to calculate full path of images."
 
 ;; extract quoted mail
 (when (> (length arr) 1)
-  (when (string-match org-mime-mail-quoted-separator content)
+  (when (and quoted-separator (string-match quoted-separator content) )
 (setq rlt (plist-put rlt
  'REPLY-QUOTED-TITLE
  (string-trim (match-string 1 content)
diff --git a/test/org-mime-tests.el b/test/org-mime-tests.el
index ed27f80a20..ee74224055 100644
--- a/test/org-mime-tests.el
+++ b/test/org-mime-tests.el
@@ -304,4 +304,12 @@
 (org-mime-revert-to-plain-text-mail)
 (should (string= (string-trim (buffer-string))
  "--text follows this line--\ntest\nhello"
+
+(ert-deftest test-org-mime-reply-quoted-separator ()
+  (should (not (org-mime-find-quoted-separator "No pattern")))
+  (should (string= (org-mime-find-quoted-separator "> \"chen\" == chen bin 
 writes:")
+   "^>[^>=]+==\\([^=\r\n]+\\)$"))
+  (should (string= (org-mime-find-quoted-separator "On Sat, May 14 2022 at 
23:30 -07, Chen Bin  wrote:")
+"^\\(On [^\r\n]+ wrote:\\)$")))
+
 (ert-run-tests-batch-and-exit)

[elpa] externals/dtache e3193146b4 06/19: Improve initialization of packages

[ELPA Syncer]

branch: externals/dtache
commit e3193146b48a7e54506d9132b246425872395228
Author: Niklas Eklund 
Commit: Niklas Eklund 

Improve initialization of packages
---
 dtache-init.el | 17 +++--
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/dtache-init.el b/dtache-init.el
index 36c08ec189..6e73d86a31 100644
--- a/dtache-init.el
+++ b/dtache-init.el
@@ -25,6 +25,8 @@
 
  Requirements
 
+(require 'subr-x)
+
 (declare-function dtache-shell-mode "dtache")
 (declare-function dtache-compile-start "dtache-compile")
 (declare-function dtache-dired-do-shell-command "dtache-dired")
@@ -44,7 +46,7 @@
 
  Variables
 
-(defvar dtache-package-integration '((compile . dtache-init-compile)
+(defvar dtache-init-package-integration '((compile . dtache-init-compile)
  (dired . dtache-init-dired)
  (dired-rsync . dtache-init-dired-rsync)
  (eshell . dtache-init-eshell)
@@ -54,19 +56,22 @@
  (vterm . dtache-init-vterm))
   "Alist which contain names of packages and their initialization function.")
 
-(defun dtache-init (&optional packages)
+(defun dtache-init (&optional block-packages)
   "Initialize `dtache' integration with all packages.
 
-Optionally provide a list of PACKAGES to enable integration for."
+Optionally provide a list of BLOCK-PACKAGES that should be blocked from
+being integrated with `dtache'."
 
   ;; Required for `dtache-shell-command' which is always provided
   (add-hook 'shell-mode-hook #'dtache-shell-mode)
 
   (let ((packages
- (or packages
- (seq-map #'car dtache-package-integration
+ (thread-last dtache-init-package-integration
+  (seq-remove (lambda (it)
+(member (car it) block-packages)))
+  (seq-map #'car
 (dolist (package packages)
-(funcall (alist-get package dtache-package-integration)
+(funcall (alist-get package dtache-init-package-integration)
 
 (defun dtache-init-shell ()
   "Initialize integration with `shell'."

[elpa] externals/dtache 34f5111023 11/19: Rename dtache-setup

[ELPA Syncer]

branch: externals/dtache
commit 34f511102320c7b730ad7fc4374b0a72fdac7c48
Author: Niklas Eklund 
Commit: Niklas Eklund 

Rename dtache-setup
---
 dtache.el   | 7 ---
 test/dtache-test.el | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dtache.el b/dtache.el
index a41558a6c3..db18093ffe 100644
--- a/dtache.el
+++ b/dtache.el
@@ -681,8 +681,9 @@ Optionally SUPPRESS-OUTPUT."

  "")))
 
-(defun dtache-setup ()
-  "Initialize `dtache'."
+;;;###autoload
+(defun dtache-initialize-sessions ()
+  "Initialize `dtache' sessions from the database."
 
   ;; Initialize sessions
   (unless dtache--sessions-initialized
@@ -786,7 +787,7 @@ This function uses the `notifications' library."
 
 (defun dtache-get-sessions ()
   "Return validated sessions."
-  (dtache-setup)
+  (dtache-initialize-sessions)
   (dtache--validate-unknown-sessions)
   (dtache--db-get-sessions))
 
diff --git a/test/dtache-test.el b/test/dtache-test.el
index 5d1ad9ea47..4f09fe0e31 100644
--- a/test/dtache-test.el
+++ b/test/dtache-test.el
@@ -38,7 +38,7 @@
   (dtache--remote-session-timer))
  (unwind-protect
  (progn
-   (dtache-setup)
+   (dtache-initialize-sessions)
,@body)
(delete-directory temp-directory t
 

[elpa] externals/dtache b5abeb8368 09/19: Add hidden source to dtache-consult

[ELPA Syncer]

branch: externals/dtache
commit b5abeb83685952bb4de79bed46d48039c5e6a141
Author: Niklas Eklund 
Commit: Niklas Eklund 

Add hidden source to dtache-consult
---
 dtache-consult.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dtache-consult.el b/dtache-consult.el
index 95b3d99957..c3ff79318d 100644
--- a/dtache-consult.el
+++ b/dtache-consult.el
@@ -43,6 +43,7 @@
   '(dtache-consult--source-session
 dtache-consult--source-active-session
 dtache-consult--source-inactive-session
+dtache-consult--source-hidden-session
 dtache-consult--source-success-session
 dtache-consult--source-failure-session
 dtache-consult--source-local-session

[elpa] externals/dtache 5a5b3f5db3 02/19: Fix names

[ELPA Syncer]

branch: externals/dtache
commit 5a5b3f5db3a03274faaf377ddbc41a523c66fce6
Author: Niklas Eklund 
Commit: Niklas Eklund 

Fix names
---
 dtache-vterm.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dtache-vterm.el b/dtache-vterm.el
index 573134afa3..2cb037d44a 100644
--- a/dtache-vterm.el
+++ b/dtache-vterm.el
@@ -51,7 +51,7 @@
  Functions
 
 ;;;###autoload
-(defun dtache-extra-vterm-send-input (&optional detach)
+(defun dtache-vterm-send-input (&optional detach)
   "Create a `dtache' session.
 
 Optionally DETACH from it."
@@ -71,7 +71,7 @@ Optionally DETACH from it."
 (vterm-send-return)))
 
 ;;;###autoload
-(defun dtache-extra-vterm-attach (session)
+(defun dtache-vterm-attach (session)
   "Attach to an active `dtache' SESSION."
   (interactive
(list
@@ -87,7 +87,7 @@ Optionally DETACH from it."
 (vterm-send-return)))
 
 ;;;###autoload
-(defun dtache-extra-vterm-detach ()
+(defun dtache-vterm-detach ()
   "Detach from a `dtache' session."
   (interactive)
   (process-send-string vterm--process dtache--dtach-detach-character))

[elpa] externals/dtache 3103ee6118 08/19: Update indentation

[ELPA Syncer]

branch: externals/dtache
commit 3103ee61188f97c9cc7746dd1064e37d5eb1ae34
Author: Niklas Eklund 
Commit: Niklas Eklund 

Update indentation
---
 dtache-init.el | 15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/dtache-init.el b/dtache-init.el
index 6e73d86a31..88873f0791 100644
--- a/dtache-init.el
+++ b/dtache-init.el
@@ -47,13 +47,13 @@
  Variables
 
 (defvar dtache-init-package-integration '((compile . dtache-init-compile)
- (dired . dtache-init-dired)
- (dired-rsync . dtache-init-dired-rsync)
- (eshell . dtache-init-eshell)
- (org . dtache-init-org)
- (projectile . dtache-init-projectile)
- (shell . dtache-init-shell)
- (vterm . dtache-init-vterm))
+  (dired . dtache-init-dired)
+  (dired-rsync . 
dtache-init-dired-rsync)
+  (eshell . dtache-init-eshell)
+  (org . dtache-init-org)
+  (projectile . dtache-init-projectile)
+  (shell . dtache-init-shell)
+  (vterm . dtache-init-vterm))
   "Alist which contain names of packages and their initialization function.")
 
 (defun dtache-init (&optional block-packages)
@@ -111,7 +111,6 @@ being integrated with `dtache'."
   (when (functionp #'vterm)
 (add-hook 'vterm-mode-hook #'dtache-vterm-mode)))
 
-
 (provide 'dtache-init)
 
 ;;; dtache-init.el ends here

[elpa] externals/dtache dc740b1b43 03/19: Address require in vterm

[ELPA Syncer]

branch: externals/dtache
commit dc740b1b438f920a8e9dae289f8a31fe9f47a49d
Author: Niklas Eklund 
Commit: Niklas Eklund 

Address require in vterm
---
 dtache-vterm.el | 17 ++---
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/dtache-vterm.el b/dtache-vterm.el
index 2cb037d44a..110bd5325f 100644
--- a/dtache-vterm.el
+++ b/dtache-vterm.el
@@ -25,28 +25,15 @@
 
  Requirements
 
-(require 'subr-x)
-
-(declare-function dtache-compile "dtache")
-(declare-function dtache-get-sessions "dtache")
-(declare-function dtache--host "dtache")
-(declare-function dtache-dtach-command "dtache")
-(declare-function dtache--session-host "dtache")
-(declare-function dtache--determine-session-state "dtache")
-(declare-function dtache-completing-read "dtache")
-
-(defvar dtache-session-origin)
-(defvar dtache--dtach-detach-character)
-(defvar dtache-session-action)
-(defvar dtache-session-mode)
+(require 'dtache)
 
 (declare-function vterm-send-C-a "vterm")
 (declare-function vterm-send-C-k "vterm")
 (declare-function vterm-send-C-e "vterm")
 (declare-function vterm-send-return "vterm")
+(declare-function vterm-end-of-line "vterm")
 
 (defvar vterm--process)
-(declare-function vterm-end-of-line "vterm")
 
  Functions
 

[elpa] externals/dtache 24ceed0282 12/19: Improve dtache-init

[ELPA Syncer]

branch: externals/dtache
commit 24ceed0282698adc5c9b0fb46cffd3935a2cb59d
Author: Niklas Eklund 
Commit: Niklas Eklund 

Improve dtache-init
---
 dtache-init.el | 49 +++--
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/dtache-init.el b/dtache-init.el
index 88873f0791..7dbe1bf4a0 100644
--- a/dtache-init.el
+++ b/dtache-init.el
@@ -46,32 +46,45 @@
 
  Variables
 
-(defvar dtache-init-package-integration '((compile . dtache-init-compile)
-  (dired . dtache-init-dired)
-  (dired-rsync . 
dtache-init-dired-rsync)
-  (eshell . dtache-init-eshell)
-  (org . dtache-init-org)
-  (projectile . dtache-init-projectile)
-  (shell . dtache-init-shell)
-  (vterm . dtache-init-vterm))
+(defcustom dtache-init-block-list nil
+  "A list of blocked packages."
+  :group 'dtache
+  :type 'list)
+
+(defcustom dtache-init-allow-list
+  '(compile dired dired-rsync eshell org projectile shell vterm)
+  "A list of allowed packages."
+  :group 'dtache
+  :type 'list)
+
+(defvar dtache-init--package-integration '((compile . dtache-init-compile)
+   (dired . dtache-init-dired)
+   (dired-rsync . 
dtache-init-dired-rsync)
+   (eshell . dtache-init-eshell)
+   (org . dtache-init-org)
+   (projectile . 
dtache-init-projectile)
+   (shell . dtache-init-shell)
+   (vterm . dtache-init-vterm))
   "Alist which contain names of packages and their initialization function.")
 
-(defun dtache-init (&optional block-packages)
-  "Initialize `dtache' integration with all packages.
+ Functions
 
-Optionally provide a list of BLOCK-PACKAGES that should be blocked from
-being integrated with `dtache'."
+;;;###autoload
+(defun dtache-init ()
+  "Initialize `dtache' integration with all packages."
 
   ;; Required for `dtache-shell-command' which is always provided
   (add-hook 'shell-mode-hook #'dtache-shell-mode)
 
-  (let ((packages
- (thread-last dtache-init-package-integration
+  (let ((init-functions
+ (thread-last dtache-init--package-integration
+  (seq-filter (lambda (it)
+(member (car it) dtache-init-allow-list)))
   (seq-remove (lambda (it)
-(member (car it) block-packages)))
-  (seq-map #'car
-(dolist (package packages)
-(funcall (alist-get package dtache-init-package-integration)
+(member (car it) dtache-init-block-list)))
+  (seq-map #'cdr
+(dolist (init-function init-functions)
+(funcall init-function
 
 (defun dtache-init-shell ()
   "Initialize integration with `shell'."

[elpa] externals/dtache 34f39efa36 14/19: Add string when attaching

[ELPA Syncer]

branch: externals/dtache
commit 34f39efa364e751a144d4528e924cbac135af184
Author: Niklas Eklund 
Commit: Niklas Eklund 

Add string when attaching

Add [attached] when attaching to a session. This is to make it
possible to navigate to previous prompts in shell/eshell
---
 dtache-eshell.el | 1 +
 dtache-shell.el  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dtache-eshell.el b/dtache-eshell.el
index 1f29d48c08..7e7e493a94 100644
--- a/dtache-eshell.el
+++ b/dtache-eshell.el
@@ -93,6 +93,7 @@ If prefix-argument directly DETACH from the session."
 (insert input)
 (setq end (point))
 (overlay-put (make-overlay begin end) 'invisible t)
+(overlay-put (make-overlay end end) 'before-string "[attached]")
 (insert " "))
   (setq dtache--buffer-session session)
   (call-interactively #'eshell-send-input))
diff --git a/dtache-shell.el b/dtache-shell.el
index 03065e7fcd..54cbcd33f9 100644
--- a/dtache-shell.el
+++ b/dtache-shell.el
@@ -82,6 +82,7 @@ cluttering the comint-history with dtach commands."
   ((symbol-function 'comint-add-to-input-history) (lambda (_) 
t)))
   (setq dtache--buffer-session session)
   (comint-kill-input)
+  (insert "[attached]")
   (comint-send-input))
   (dtache-open-session session
 

[elpa] externals/dtache 28430fbff4 13/19: Add setting for active session

[ELPA Syncer]

branch: externals/dtache
commit 28430fbff4832eb12d8d1d4a9c6d3ac829e90c2b
Author: Niklas Eklund 
Commit: Niklas Eklund 

Add setting for active session
---
 dtache.el | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/dtache.el b/dtache.el
index db18093ffe..2c925f35f0 100644
--- a/dtache.el
+++ b/dtache.el
@@ -121,6 +121,11 @@
   :type 'integer
   :group 'dtache)
 
+(defcustom dtache-open-active-session-action 'attach
+  "How to open an active session, allowed values are `attach' and `tail'."
+  :type 'symbol
+  :group 'dtache)
+
 (defcustom dtache-shell-command-session-action
   '(:attach dtache-shell-command-attach-session
 :view dtache-view-dwim
@@ -341,7 +346,10 @@ Optionally SUPPRESS-OUTPUT if prefix-argument is provided."
(list (dtache-completing-read (dtache-get-sessions
   (when (dtache-valid-session session)
 (if (eq 'active (dtache--session-state session))
-(dtache-attach-session session)
+(pcase dtache-open-active-session-action
+  ('attach (dtache-attach-session session))
+  ('tail (dtache-tail-session session))
+  (_ (message "`dtache-open-active-session-action' has an incorrect 
value")))
   (if-let ((view-fun (plist-get (dtache--session-action session) :view)))
   (funcall view-fun session)
 (dtache-view-dwim session)

[elpa] externals/dtache 7f63c79a06 07/19: Update dtache-command-format

[ELPA Syncer]

branch: externals/dtache
commit 7f63c79a069ac09ca1819c0a30d324ef417b0a51
Author: Niklas Eklund 
Commit: Niklas Eklund 

Update dtache-command-format
---
 dtache.el | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/dtache.el b/dtache.el
index dbb1a2991d..a41558a6c3 100644
--- a/dtache.el
+++ b/dtache.el
@@ -111,7 +111,7 @@
   :group 'dtache)
 
 (defcustom dtache-command-format
-  '(:width 50 :padding 4 :function dtache--command-str)
+  '(:width 90 :padding 4 :function dtache-command-str)
   "The format for displaying the command."
   :type 'integer
   :group 'dtache)
@@ -893,6 +893,13 @@ Optionally CONCAT the command return command into a 
string."
  (cand (completing-read "Select session: " collection nil t)))
 (dtache--decode-session cand)))
 
+(defun dtache-command-str (session max-length)
+  "Return SESSION's command as a string restrict it to MAX-LENGTH."
+  (let ((command (dtache--session-command session)))
+(if (<= (length command) max-length)
+command
+  (concat (substring (dtache--session-command session) 0 (- max-length 3)) 
"..."
+
  Support functions
 
 ; Session
@@ -1279,13 +1286,6 @@ If event is cased by an update to the `dtache' database, 
re-initialize
 
 ; UI
 
-(defun dtache--command-str (session max-length)
-  "Return SESSION's command as a string restrict it to MAX-LENGTH."
-  (let ((command (dtache--session-command session)))
-(if (<= (length command) max-length)
-command
-  (concat (substring (dtache--session-command session) 0 (- max-length 3)) 
"..."
-
 (defun dtache--metadata-str (session)
   "Return SESSION's metadata as a string."
   (string-join

[elpa] externals/dtache 65fd89d6d7 17/19: Disable show output on attach by default

[ELPA Syncer]

branch: externals/dtache
commit 65fd89d6d7d1626987e655c855947847beb15083
Author: Niklas Eklund 
Commit: Niklas Eklund 

Disable show output on attach by default
---
 dtache.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dtache.el b/dtache.el
index 0e791863c8..ead719122f 100644
--- a/dtache.el
+++ b/dtache.el
@@ -77,7 +77,7 @@
   :type 'string
   :group 'dtache)
 
-(defcustom dtache-show-output-on-attach t
+(defcustom dtache-show-output-on-attach nil
   "If set to t show the session output when attaching to it."
   :type 'bool
   :group 'dtache)

[elpa] externals/dtache 4e7387bbe0 04/19: Add dtache-vterm-mode

[ELPA Syncer]

branch: externals/dtache
commit 4e7387bbe006c27f23072830d9573299a90491cd
Author: Niklas Eklund 
Commit: Niklas Eklund 

Add dtache-vterm-mode
---
 dtache-init.el  |  8 
 dtache-vterm.el | 19 ++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/dtache-init.el b/dtache-init.el
index f563873330..22c3d842d4 100644
--- a/dtache-init.el
+++ b/dtache-init.el
@@ -34,11 +34,13 @@
 (declare-function dtache-org-babel-sh "dtache-org")
 (declare-function dtache-shell-override-history "dtache-shell")
 (declare-function dtache-shell-save-history-on-kill "dtache-shell")
+(declare-function dtache-vterm-mode "dtache-vterm")
 
 (declare-function org-babel-sh-evaluate "ob-shell")
 (declare-function dired-rsync--do-run "dired-rsync")
 (declare-function dired-rsync "dired-rsync")
 (declare-function projectile "projectile")
+(declare-function vterm "vterm")
 
  Variables
 
@@ -98,6 +100,12 @@ Optionally provide a list of PACKAGES to enable integration 
for."
 (advice-add 'projectile-run-compilation
 :override #'dtache-extra-projectile-run-compilation)))
 
+(defun dtache-init-vterm ()
+  "Initialize integration with `vterm'."
+  (when (functionp #'vterm)
+(add-hook 'vterm-mode-hook #'dtache-vterm-mode)))
+
+
 (provide 'dtache-init)
 
 ;;; dtache-init.el ends here
diff --git a/dtache-vterm.el b/dtache-vterm.el
index 110bd5325f..fc1e27db93 100644
--- a/dtache-vterm.el
+++ b/dtache-vterm.el
@@ -35,7 +35,7 @@
 
 (defvar vterm--process)
 
- Functions
+ Commands
 
 ;;;###autoload
 (defun dtache-vterm-send-input (&optional detach)
@@ -79,6 +79,23 @@ Optionally DETACH from it."
   (interactive)
   (process-send-string vterm--process dtache--dtach-detach-character))
 
+ Minor mode
+
+(defvar dtache-vterm-mode-map
+  (let ((map (make-sparse-keymap)))
+(define-key map (kbd "") #'dtache-vterm-send-input)
+(define-key map (kbd "") #'dtache-vterm-attach)
+(define-key map (kbd dtache-detach-key) #'dtache-vterm-detach)
+map)
+  "Keymap for `dtache-vterm-mode'.")
+
+;;;###autoload
+(define-minor-mode dtache-vterm-mode
+  "Integrate `dtache' in `vterm'."
+  :lighter " dtache-vterm"
+  :keymap (let ((map (make-sparse-keymap)))
+map))
+
 (provide 'dtache-vterm)
 
 ;;; dtache-vterm.el ends here

[elpa] externals/dtache updated (08310ca70b -> 02651e47d3)

[ELPA Syncer]

elpasync pushed a change to branch externals/dtache.

  from  08310ca70b Update CHANGELOG
   new  6c51554e69 Improve package configuration
   new  5a5b3f5db3 Fix names
   new  dc740b1b43 Address require in vterm
   new  4e7387bbe0 Add dtache-vterm-mode
   new  b45d3a6a74 Add vterm to dtache-init
   new  e3193146b4 Improve initialization of packages
   new  7f63c79a06 Update dtache-command-format
   new  3103ee6118 Update indentation
   new  b5abeb8368 Add hidden source to dtache-consult
   new  e034da8f30 Remove redundant dtache-setup
   new  34f5111023 Rename dtache-setup
   new  24ceed0282 Improve dtache-init
   new  28430fbff4 Add setting for active session
   new  34f39efa36 Add string when attaching
   new  6fa1fafb96 Add integration with embark
   new  8d2ea557c0 Conditionally enable log mode when diffing
   new  65fd89d6d7 Disable show output on attach by default
   new  e864ccd547 Improve attaching to a detached compilation
   new  02651e47d3 Update CHANGELOG


Summary of changes:
 CHANGELOG.org   |   1 +
 dtache-compile.el   |  11 +++-
 dtache-consult.el   |   1 +
 dtache-dired.el |  45 ++
 dtache-eshell.el|  31 +-
 dtache-extra.el |  53 +
 dtache-init.el  | 168 
 dtache-org.el   |   1 +
 dtache-shell.el |   3 +
 dtache-vterm.el | 101 +++
 dtache.el   |  61 +--
 test/dtache-test.el |   2 +-
 12 files changed, 430 insertions(+), 48 deletions(-)
 create mode 100644 dtache-dired.el
 create mode 100644 dtache-extra.el
 create mode 100644 dtache-init.el
 create mode 100644 dtache-vterm.el

[elpa] externals/dtache e034da8f30 10/19: Remove redundant dtache-setup

[ELPA Syncer]

branch: externals/dtache
commit e034da8f30af0eaf6c60a60bcd9e02043e06c8b3
Author: Niklas Eklund 
Commit: Niklas Eklund 

Remove redundant dtache-setup
---
 dtache-eshell.el | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dtache-eshell.el b/dtache-eshell.el
index 9cb5e5cc26..1f29d48c08 100644
--- a/dtache-eshell.el
+++ b/dtache-eshell.el
@@ -134,7 +134,6 @@ If prefix-argument directly DETACH from the session."
   (make-local-variable 'eshell-preoutput-filter-functions)
   (if dtache-eshell-mode
   (progn
-(dtache-setup)
 (add-hook 'eshell-preoutput-filter-functions 
#'dtache--dtache-env-message-filter)
 (add-hook 'eshell-preoutput-filter-functions 
#'dtache--dtach-eof-message-filter))
 (remove-hook 'eshell-preoutput-filter-functions 
#'dtache--dtache-env-message-filter)

[elpa] externals/dtache 6fa1fafb96 15/19: Add integration with embark

[ELPA Syncer]

branch: externals/dtache
commit 6fa1fafb9650844e592963d99e451c67b74498df
Author: Niklas Eklund 
Commit: Niklas Eklund 

Add integration with embark
---
 dtache-init.el | 41 -
 dtache.el  | 15 ---
 2 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/dtache-init.el b/dtache-init.el
index 7dbe1bf4a0..a303ef5696 100644
--- a/dtache-init.el
+++ b/dtache-init.el
@@ -27,6 +27,18 @@
 
 (require 'subr-x)
 
+(declare-function dtache-attach-session "dtache")
+(declare-function dtache-compile-session "dtache")
+(declare-function dtache-delete-session "dtache")
+(declare-function dtache-insert-session-command "dtache")
+(declare-function dtache-kill-session "dtache")
+(declare-function dtache-rerun-session "dtache")
+(declare-function dtache-tail-session "dtache")
+(declare-function dtache-view-session "dtache")
+(declare-function dtache-copy-session-command "dtache")
+(declare-function dtache-copy-session "dtache")
+(declare-function dtache-diff-session "dtache")
+
 (declare-function dtache-shell-mode "dtache")
 (declare-function dtache-compile-start "dtache-compile")
 (declare-function dtache-dired-do-shell-command "dtache-dired")
@@ -44,6 +56,9 @@
 (declare-function projectile "projectile")
 (declare-function vterm "vterm")
 
+(defvar embark-general-map)
+(defvar embark-keymap-alist)
+
  Variables
 
 (defcustom dtache-init-block-list nil
@@ -52,14 +67,32 @@
   :type 'list)
 
 (defcustom dtache-init-allow-list
-  '(compile dired dired-rsync eshell org projectile shell vterm)
+  '(compile dired dired-rsync embark eshell org projectile shell vterm)
   "A list of allowed packages."
   :group 'dtache
   :type 'list)
 
+(defvar dtache-action-map
+  (let ((map (make-sparse-keymap)))
+(define-key map "a" #'dtache-attach-session)
+(define-key map "c" #'dtache-compile-session)
+(define-key map "d" #'dtache-delete-session)
+(define-key map "i" #'dtache-insert-session-command)
+(define-key map "k" #'dtache-kill-session)
+(define-key map "r" #'dtache-rerun-session)
+(define-key map "t" #'dtache-tail-session)
+(define-key map "v" #'dtache-view-session)
+(define-key map "w" #'dtache-copy-session-command)
+(define-key map "W" #'dtache-copy-session)
+(define-key map "=" #'dtache-diff-session)
+map))
+
+ Support functions
+
 (defvar dtache-init--package-integration '((compile . dtache-init-compile)
(dired . dtache-init-dired)
(dired-rsync . 
dtache-init-dired-rsync)
+   (embark . dtache-init-embark)
(eshell . dtache-init-eshell)
(org . dtache-init-org)
(projectile . 
dtache-init-projectile)
@@ -124,6 +157,12 @@
   (when (functionp #'vterm)
 (add-hook 'vterm-mode-hook #'dtache-vterm-mode)))
 
+(defun dtache-init-embark ()
+  "Initialize integration with `embark'."
+  (with-eval-after-load 'embark
+(defvar embark-dtache-map (make-composed-keymap dtache-action-map 
embark-general-map))
+(add-to-list 'embark-keymap-alist '(dtache . embark-dtache-map
+
 (provide 'dtache-init)
 
 ;;; dtache-init.el ends here
diff --git a/dtache.el b/dtache.el
index 2c925f35f0..1e460c4a3d 100644
--- a/dtache.el
+++ b/dtache.el
@@ -198,21 +198,6 @@ Valid values are: create, new and attach")
   "The version of `dtache-session'.
 This version is encoded as [package-version].[revision].")
 
-(defvar dtache-action-map
-  (let ((map (make-sparse-keymap)))
-(define-key map "a" #'dtache-attach-session)
-(define-key map "c" #'dtache-compile-session)
-(define-key map "d" #'dtache-delete-session)
-(define-key map "i" #'dtache-insert-session-command)
-(define-key map "k" #'dtache-kill-session)
-(define-key map "r" #'dtache-rerun-session)
-(define-key map "t" #'dtache-tail-session)
-(define-key map "v" #'dtache-view-session)
-(define-key map "w" #'dtache-copy-session-command)
-(define-key map "W" #'dtache-copy-session)
-(define-key map "=" #'dtache-diff-session)
-map))
-
 ; Faces
 
 (defgroup dtache-faces nil

[elpa] externals/dtache 8d2ea557c0 16/19: Conditionally enable log mode when diffing

[ELPA Syncer]

branch: externals/dtache
commit 8d2ea557c00df7336442f194200bd841e5882882
Author: Niklas Eklund 
Commit: Niklas Eklund 

Conditionally enable log mode when diffing
---
 dtache.el | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/dtache.el b/dtache.el
index 1e460c4a3d..0e791863c8 100644
--- a/dtache.el
+++ b/dtache.el
@@ -506,11 +506,17 @@ Optionally DELETE the session if prefix-argument is 
provided."
   (with-current-buffer (get-buffer-create buffer1)
 (erase-buffer)
 (insert (dtache--session-header session1))
-(insert (dtache--session-output session1)))
+(insert (dtache--session-output session1))
+(when (eq 'terminal-data (dtache--session-env-mode session1))
+  ;; Enable `dtache-log-mode' to parse ansi-escape sequences
+  (dtache-log-mode)))
   (with-current-buffer (get-buffer-create buffer2)
 (erase-buffer)
 (insert (dtache--session-header session2))
-(insert (dtache--session-output session2)))
+(insert (dtache--session-output session2))
+(when (eq 'terminal-data (dtache--session-env-mode session2))
+  ;; Enable `dtache-log-mode' to parse ansi-escape sequences
+  (dtache-log-mode)))
   (ediff-buffers buffer1 buffer2
 
 ;;;###autoload

[elpa] externals/dtache 02651e47d3 19/19: Update CHANGELOG

[ELPA Syncer]

branch: externals/dtache
commit 02651e47d3142deb675dceb42b76822d72584070
Author: Niklas Eklund 
Commit: Niklas Eklund 

Update CHANGELOG
---
 CHANGELOG.org | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.org b/CHANGELOG.org
index bb72a9274a..fe88e29a57 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -3,6 +3,7 @@
 #+language: en
 
 *   Development
+- Introduce =dtache-init.el= and move integration of other packages there. The 
integration now becomes even simpler for users of =dtache=.
 - Rewrite =dtache= to enable the package to lazy load and not force users to 
load it when starting Emacs.
 - Make completion of sessions adapt to the current dtache sessions. All of the 
sessions will be used to determine an an appropriate width for the command 
width as well as each individual annotation. Format has updated in 
=dtache-annotation-format= and a =dtache-command-format= has been added, this 
supersedes the =dtache-max-command-lenght=.
 - Improvements to =dtache-env=. The package will now control which mode 
=dtache-env= should be run in. The mode is either =plain-text= or 
=terminal-data=. The latter is enabled by default and allows =dtache= to 
capture control sequences for e.g. colored output. This update will require 
users to update their =dtache-env= scripts.

[elpa] externals/dtache 6c51554e69 01/19: Improve package configuration

[ELPA Syncer]

branch: externals/dtache
commit 6c51554e6929086af7f9b9007b2bbbe1e9f3a256
Author: Niklas Eklund 
Commit: Niklas Eklund 

Improve package configuration
---
 dtache-compile.el |   1 +
 dtache-dired.el   |  45 
 dtache-eshell.el  |  29 ---
 dtache-extra.el   |  53 
 dtache-init.el| 103 ++
 dtache-org.el |   1 +
 dtache-shell.el   |   2 ++
 dtache-vterm.el   |  97 ++
 dtache.el |   1 +
 9 files changed, 317 insertions(+), 15 deletions(-)

diff --git a/dtache-compile.el b/dtache-compile.el
index 6ed9f3060e..3d3bc2be5f 100644
--- a/dtache-compile.el
+++ b/dtache-compile.el
@@ -90,6 +90,7 @@ Optionally EDIT-COMMAND."
 (dtache-compile-attach session)
   (dtache-compile-session session
 
+;;;###autoload
 (defun dtache-compile-start (_)
   "Run in `compilation-start-hook' if `dtache-enabled'."
   (when dtache-enabled
diff --git a/dtache-dired.el b/dtache-dired.el
new file mode 100644
index 00..098692d918
--- /dev/null
+++ b/dtache-dired.el
@@ -0,0 +1,45 @@
+;;; dtache-dired.el --- Dtache integration for dired -*- lexical-binding: t -*-
+
+;; Copyright (C) 2022  Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see .
+
+;;; Commentary:
+
+;; This package integrates `dtache' with `dired'.
+
+;;; Code:
+
+ Requirements
+
+(require 'dired)
+(require 'dtache)
+
+ Functions
+
+;;;###autoload
+(defun dtache-dired-do-shell-command (dired-do-shell-command &rest args)
+  "Ensure `dtache' is used before running DIRED-DO-SHELL-COMMAND with ARGS."
+  (cl-letf* ((dtache-session-origin 'dired)
+ ((symbol-function #'dired-run-shell-command)
+  (lambda (command)
+(dtache-start-session command)
+nil)))
+(apply dired-do-shell-command args)))
+
+(provide 'dtache-dired)
+
+;;; dtache-dired.el ends here
diff --git a/dtache-eshell.el b/dtache-eshell.el
index f6756ee3b1..9cb5e5cc26 100644
--- a/dtache-eshell.el
+++ b/dtache-eshell.el
@@ -71,6 +71,7 @@ If prefix-argument directly DETACH from the session."
  (dtache-session-mode (if detach 'create 'create-and-attach))
  (dtache-enabled t)
  (dtache--current-session nil))
+(advice-add #'eshell-external-command :around 
#'dtache-eshell-external-command)
 (call-interactively #'eshell-send-input)))
 
 ;;;###autoload
@@ -99,20 +100,20 @@ If prefix-argument directly DETACH from the session."
 
  Support functions
 
-(defun dtache-eshell--external-command (orig-fun &rest args)
+;;;###autoload
+(defun dtache-eshell-external-command (orig-fun &rest args)
   "Advice `eshell-external-command' to optionally use `dtache'."
-  (if dtache-enabled
-  (let* ((dtache-session-action dtache-eshell-session-action)
- (command (string-trim-right
-   (mapconcat #'identity
-  (flatten-list args)
-  " ")))
- (session (dtache-create-session command))
- (command (dtache-dtach-command session)))
-(setq dtache--buffer-session session)
-(setq dtache-enabled nil)
-(apply orig-fun `(,(seq-first command) ,(seq-rest command
-(apply orig-fun args)))
+  (let* ((dtache-session-action dtache-eshell-session-action)
+ (command (string-trim-right
+   (mapconcat #'identity
+  (flatten-list args)
+  " ")))
+ (session (dtache-create-session command))
+ (command (dtache-dtach-command session)))
+(advice-remove #'eshell-external-command #'dtache-eshell-external-command)
+(setq dtache--buffer-session session)
+(setq dtache-enabled nil)
+(apply orig-fun `(,(seq-first command) ,(seq-rest command)
 
  Minor mode
 
@@ -139,8 +140,6 @@ If prefix-argument directly DETACH from the session."
 (remove-hook 'eshell-preoutput-filter-functions 
#'dtache--dtache-env-message-filter)
 (remove-hook 'eshell-preoutput-filter-functions 
#'dtache--dtach-eof-message-filter)))
 
-(advice-add #'eshell-external-command :around 
#'dtache-eshell--external-command)
-
 (provide 'dtache-eshell)
 
 ;;; dtache-eshell.el ends here

[elpa] externals/dtache b45d3a6a74 05/19: Add vterm to dtache-init

[ELPA Syncer]

branch: externals/dtache
commit b45d3a6a74cb6ab18cb5d0d55edc19903762ef61
Author: Niklas Eklund 
Commit: Niklas Eklund 

Add vterm to dtache-init
---
 dtache-init.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dtache-init.el b/dtache-init.el
index 22c3d842d4..36c08ec189 100644
--- a/dtache-init.el
+++ b/dtache-init.el
@@ -50,7 +50,8 @@
  (eshell . dtache-init-eshell)
  (org . dtache-init-org)
  (projectile . dtache-init-projectile)
- (shell . dtache-init-shell))
+ (shell . dtache-init-shell)
+ (vterm . dtache-init-vterm))
   "Alist which contain names of packages and their initialization function.")
 
 (defun dtache-init (&optional packages)

[elpa] externals/dtache e864ccd547 18/19: Improve attaching to a detached compilation

[ELPA Syncer]

branch: externals/dtache
commit e864ccd547169ff43a32e98f9003eb0759dd799d
Author: Niklas Eklund 
Commit: Niklas Eklund 

Improve attaching to a detached compilation
---
 dtache-compile.el | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/dtache-compile.el b/dtache-compile.el
index 3d3bc2be5f..a1c7c64a5e 100644
--- a/dtache-compile.el
+++ b/dtache-compile.el
@@ -80,7 +80,15 @@ Optionally EDIT-COMMAND."
 (let* ((dtache-enabled t)
(dtache-session-mode 'attach)
(dtache--current-session session))
-  (compilation-start (dtache--session-command session)
+  (compilation-start (dtache--session-command session))
+  (when dtache-show-output-on-attach
+;; HACK: When attaching to a detached process and
+;; `dtache-show-output-on-attach' is non-nil we need to switch
+;; to the compile buffer and go to the end. Otherwise it won't
+;; properly update when new output is coming
+(other-window 1)
+(end-of-buffer)
+(other-window 1)
 
 ;;;###autoload
 (defun dtache-compile-open (session)

[elpa] externals/embark cb5d69987b: Have target finder also apply to agenda buffers

[ELPA Syncer]

branch: externals/embark
commit cb5d69987b03029a4727998f098305cd2e212d3f
Author: Omar Antolín 
Commit: Omar Antolín 

Have target finder also apply to agenda buffers

We definitely want at least to find links in agenda headings, put
possible other elements are useful too, specially in agenda views that
show a couple of lines of context.
---
 embark-org.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/embark-org.el b/embark-org.el
index 01ad292956..cdef13cfa8 100644
--- a/embark-org.el
+++ b/embark-org.el
@@ -103,7 +103,7 @@
 
 (defun embark-org-target-element-context ()
   "Target the smallest Org element or object around point."
-  (when-let (((derived-mode-p 'org-mode))
+  (when-let (((derived-mode-p 'org-mode 'org-agenda-mode))
  (element (org-element-context))
  ((memq (car element) embark-org--types))
  (begin (org-element-property :begin element))

[elpa] externals/embark-consult updated (5bb0e3aa40 -> cb5d69987b)

[ELPA Syncer]

elpasync pushed a change to branch externals/embark-consult.

  from  5bb0e3aa40 Merge pull request #507 from tarsiiformes/silencio
  adds  cb5d69987b Have target finder also apply to agenda buffers

No new revisions were added by this update.

Summary of changes:
 embark-org.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[nongnu] elpa/kotlin-mode 4566a988b0 1/2: Properly indent 2-line for and while loops without brackets

[ELPA Syncer]

branch: elpa/kotlin-mode
commit 4566a988b05b991067b01e6e056308770829dd6a
Author: Tanner Davies 
Commit: Tanner Davies 

Properly indent 2-line for and while loops without brackets
---
 kotlin-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotlin-mode.el b/kotlin-mode.el
index 184538fc22..c5845bbfd7 100644
--- a/kotlin-mode.el
+++ b/kotlin-mode.el
@@ -368,7 +368,7 @@
 (defun kotlin-mode--line-continuation()
   "Return whether this line continues a statement in the previous line"
   (or
-   (and (kotlin-mode--prev-line-begins "\\(if\\|else\\)[ \t]*")
+   (and (kotlin-mode--prev-line-begins "\\(if\\|else\\|for\\|while\\)[ \t]*")
 (not (kotlin-mode--prev-line-ends "{.*")))
(or
 (kotlin-mode--line-begins 
"\\([.=:]\\|->\\|\\(\\(private\\|public\\|protected\\|internal\\)[ 
\t]*\\)?[sg]et\\b\\)")

[nongnu] elpa/kotlin-mode 60ebf567ec 2/2: Merge pull request #66 from ted-tanner/master

[ELPA Syncer]

branch: elpa/kotlin-mode
commit 60ebf567ec1bcd56a40594d04ac2b866aa6935a2
Merge: f8b7b3648e 4566a988b0
Author: Gregg Hernandez 
Commit: GitHub 

Merge pull request #66 from ted-tanner/master

Properly indent 2-line for and while loops without brackets
---
 kotlin-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kotlin-mode.el b/kotlin-mode.el
index 184538fc22..c5845bbfd7 100644
--- a/kotlin-mode.el
+++ b/kotlin-mode.el
@@ -368,7 +368,7 @@
 (defun kotlin-mode--line-continuation()
   "Return whether this line continues a statement in the previous line"
   (or
-   (and (kotlin-mode--prev-line-begins "\\(if\\|else\\)[ \t]*")
+   (and (kotlin-mode--prev-line-begins "\\(if\\|else\\|for\\|while\\)[ \t]*")
 (not (kotlin-mode--prev-line-ends "{.*")))
(or
 (kotlin-mode--line-begins 
"\\([.=:]\\|->\\|\\(\\(private\\|public\\|protected\\|internal\\)[ 
\t]*\\)?[sg]et\\b\\)")

[nongnu] elpa/zig-mode 905917322b: Add `comment-start-skip`

[ELPA Syncer]

branch: elpa/zig-mode
commit 905917322b8b5f191593c66b5f26dd347fe1290d
Author: Erik Arvstedt 
Commit: Joachim Schmidt 

Add `comment-start-skip`

This fixes many builtin comment-related functions (`newcomment.el`) that
depend on this variable.

This also fixes test `test-font-lock-comments` on Emacs 28:
In Emacs 28, `comment-start-skip` is assigned a default value based on
`comment-start`, which results in comment delimiters (//) being
fontified with `font-lock-comment-delimiter-face`.
---
 tests.el| 6 --
 zig-mode.el | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests.el b/tests.el
index e0ef563593..60a4caf3ea 100644
--- a/tests.el
+++ b/tests.el
@@ -61,9 +61,11 @@ const string =
 // This is a normal comment\n
 /// This is a doc comment\n
  This is a normal comment again\n"
-   '(("// This is a normal comment\n" font-lock-comment-face)
+   '(("// " font-lock-comment-delimiter-face)
+ ("This is a normal comment\n" font-lock-comment-face)
  ("/// This is a doc comment\n" font-lock-doc-face)
- (" This is a normal comment again\n" font-lock-comment-face
+ (" " font-lock-comment-delimiter-face)
+ ("This is a normal comment again\n" font-lock-comment-face
 
 (ert-deftest test-font-lock-decl-const ()
   (zig-test-font-lock
diff --git a/zig-mode.el b/zig-mode.el
index 4064605557..3baee90932 100644
--- a/zig-mode.el
+++ b/zig-mode.el
@@ -529,6 +529,7 @@ This is written mainly to be used as 
`end-of-defun-function' for Zig."
 \\{zig-mode-map}"
   :group 'zig-mode
   (setq-local comment-start "// ")
+  (setq-local comment-start-skip "//+ *")
   (setq-local comment-end "")
   (setq-local electric-indent-chars
   (append zig-electric-indent-chars

[elpa] externals/which-key 1ab1d0cc88: Add group to minor-mode definition

[ELPA Syncer]

branch: externals/which-key
commit 1ab1d0cc88843c9a614ed3226c5a1070e32e4823
Author: Justin Burkett 
Commit: Justin Burkett 

Add group to minor-mode definition

Fixes #339
---
 which-key.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/which-key.el b/which-key.el
index c9d60b88ca..19d1f9fb3d 100644
--- a/which-key.el
+++ b/which-key.el
@@ -782,6 +782,7 @@ disable support."
 (define-minor-mode which-key-mode
   "Toggle which-key-mode."
   :global t
+  :group 'which-key
   :lighter which-key-lighter
   :keymap (let ((map (make-sparse-keymap)))
 (mapc

[nongnu] elpa/visual-fill-column 106189b000: Restore compatibility with Emacs < 27.1.

[ELPA Syncer]

branch: elpa/visual-fill-column
commit 106189b000ca092886dd9f1c1503613a751dbd3f
Author: Joost Kremers 
Commit: Joost Kremers 

Restore compatibility with Emacs < 27.1.

See Codeberg issue #6. It turns out that before Emacs 27.1, the functions in
`window-size-change-functions` took the frame as parameter and no local 
part of
the hook was recognised. From what I understand, in Emacs 27.1, the hook is
still required, but starting Emacs 28.1, it is not.
---
 visual-fill-column.el | 16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/visual-fill-column.el b/visual-fill-column.el
index 44b9d9f276..03269e5290 100644
--- a/visual-fill-column.el
+++ b/visual-fill-column.el
@@ -175,7 +175,9 @@ that actually visit a file."
 (setq-default split-window-preferred-function 
#'visual-fill-column-split-window-sensibly))
 
   (cond
-   ((version<= emacs-version "27.1")
+   ((version< emacs-version "27.1")
+(add-hook 'window-size-change-functions #'visual-fill-colum--adjust-frame))
+   ((version= emacs-version "27.1")
 (add-hook 'window-size-change-functions 
#'visual-fill-column--adjust-window 'append 'local)
 (setq visual-fill-column--use-split-window-parameter t))
 
@@ -191,7 +193,9 @@ that actually visit a file."
 
   (let ((window (get-buffer-window (current-buffer
 (cond
- ((version<= emacs-version "27.1")
+ ((version< emacs-version "27.1")
+  (remove-hook 'window-size-change-functions 
#'visual-fill-column--adjust-frame))
+ ((version= emacs-version "27.1")
   (remove-hook 'window-size-change-functions 
#'visual-fill-column--adjust-window 'local))
 
  ((version< "27.1" emacs-version)
@@ -264,6 +268,14 @@ selected window has `visual-fill-column-mode' enabled."
   (set-window-parameter window 'min-margins '(0 . 0)))
   (visual-fill-column--set-margins window
 
+(defun visual-fill-column--adjust-frame (frame)
+  "Adjust the windows on FRAME.
+This function is added to `window-size-change-functions' in older
+Emacsen (before 27.1), in which the functions in this hook are
+passed the frame as argument."
+  (dolist (window (window-list frame))
+(visual-fill-column--adjust-window window)))
+
 (defun visual-fill-column-adjust (&optional _inc)
   "Adjust the window margins and fringes.
 This function is for use as advice to `text-scale-adjust'.  It

[elpa] externals/javaimp f9f58c5f3b: Add javaimp-jump-to-enclosing-scope

[Filipp Gunbin]

branch: externals/javaimp
commit f9f58c5f3be4c93228f774b9e5ca7dd90e192b4e
Author: Filipp Gunbin 
Commit: Filipp Gunbin 

Add javaimp-jump-to-enclosing-scope
---
 javaimp-parse.el | 34 --
 javaimp.el   | 26 --
 2 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/javaimp-parse.el b/javaimp-parse.el
index bf2a453f1a..1c1bdab517 100644
--- a/javaimp-parse.el
+++ b/javaimp-parse.el
@@ -36,7 +36,7 @@
 
 
 (defconst javaimp-scope-all-types
- '(anon-class
+  '(anon-class
 array-init
 class
 enum
@@ -702,14 +702,12 @@ either of symbols `normal' or 'static'."
   class-alist)))
 
 (defun javaimp-parse-get-all-scopes (&optional beg end pred no-filter)
-  "Return all scopes in the current buffer between positions BEG
-and END, both exclusive, optionally filtering them with PRED.
-PRED should not move point.  Note that parents may be outside of
-region given by BEG and END.  BEG is the LIMIT argument to
-`previous-single-property-change', and so may be nil.  END
-defaults to end of accessible portion of the buffer.
-
-The returned objects are copies, and so may be freely modified.
+  "Return copies of all scopes in the current buffer between
+positions BEG and END, both exclusive, optionally filtering them
+with PRED.  PRED should not move point.  Note that parents may be
+outside of region given by BEG and END.  BEG is the LIMIT
+argument to `previous-single-property-change', and so may be nil.
+END defaults to end of accessible portion of the buffer.
 
 Scope parents are filtered according to
 `javaimp-parse--scope-type-defun-p', but if NO-FILTER is non-nil
@@ -733,21 +731,21 @@ then no filtering is done."
 (push scope res)))
 res))
 
-(defun javaimp-parse-get-enclosing-scope (&optional pred)
-  "Return innermost enclosing scope at point.  If PRED is non-nil
-then the scope must satisfy it, otherwise the next outer scope is
-tried.
-
-The returned objects are copies, and so may be freely modified.
+(defun javaimp-parse-get-enclosing-scope (&optional pred no-filter)
+  "Return copy of innermost enclosing scope at point.  If PRED is
+non-nil then the scope must satisfy it, otherwise the next outer
+scope is tried.
 
 Scope parents are filtered according to
-`javaimp-parse--scope-type-defun-p'."
+`javaimp-parse--scope-type-defun-p', but if NO-FILTER is non-nil
+then no filtering is done."
   (save-excursion
 (javaimp-parse--all-scopes))
   (when-let ((scope (javaimp-parse--enclosing-scope pred)))
 (setq scope (javaimp-scope-copy scope))
-(javaimp-scope-filter-parents
- #'javaimp-parse--scope-type-defun-p scope)
+(unless no-filter
+  (javaimp-scope-filter-parents
+   #'javaimp-parse--scope-type-defun-p scope))
 scope))
 
 (defun javaimp-parse-get-defun-decl-start (&optional bound)
diff --git a/javaimp.el b/javaimp.el
index 2480744bd4..2522751575 100644
--- a/javaimp.el
+++ b/javaimp.el
@@ -1071,8 +1071,10 @@ buffer."
   (< target-idx 0)
   (>= target-idx (length siblings)))
   (if parent-start
-  ;; Move up to parent, trying to also skip its decl
-  ;; prefix
+  ;; It's not very clear what to do when we need to move
+  ;; out of current scope.  Currently we just move up to
+  ;; parent, trying to also skip its decl prefix.  This
+  ;; gives acceptable results.
   (goto-char (or (javaimp--beg-of-defun-decl parent-start)
  parent-start))
 (goto-char (if (> arg 0)
@@ -1182,6 +1184,25 @@ PREV-INDEX gives the index of the method itself."
   -1))
  siblings)
 
+(defun javaimp-jump-to-enclosing-scope ()
+  "Jump to enclosing scope at point."
+  (interactive)
+  (if-let ((scope (save-excursion
+(save-restriction
+  (widen)
+  (javaimp-parse-get-enclosing-scope #'always t)
+  (progn
+(goto-char (or (and (javaimp-scope-type scope)
+(not (memq (javaimp-scope-type scope)
+   '(array-init simple-statement 
statement)))
+(javaimp--beg-of-defun-decl
+ (javaimp-scope-start scope)))
+   (javaimp-scope-start scope)))
+(message "%s %s at position %d"
+ (javaimp-scope-type scope) (javaimp-scope-name scope)
+ (javaimp-scope-start scope)))
+(user-error "There is no enclosing scope at point")))
+
 
 (defun javaimp-add-log-current-defun ()
   "Function to be used as `add-log-current-defun-function'."
@@ -1208,6 +1229,7 @@ PREV-INDEX gives the index of the method itself."
 ;; Main
 
 (defvar-keymap javaimp-basic-map
+  "e" #'javaimp-jump-to-enclosing-scope
   "i" #'javaimp-add-import
   "o" #'javaimp-organize-imports
   "s" #'javaimp-show-scopes)

[elpa] externals/org 0d39ea6ef3: org-src: Add RET to go from overlay to edit buffer

[ELPA Syncer]

branch: externals/org
commit 0d39ea6ef3ee55424a322c38eb6857299dca11f2
Author: Marco Wahl 
Commit: Marco Wahl 

org-src: Add RET to go from overlay to edit buffer

* lisp/org-src.el (org-edit-src-goto): org-edit-src-goto factors out
the functionality from org-edit-src-continue.  The latter needs an event.

The return key is bound to org-edit-src-goto for the overlay.
---
 etc/ORG-NEWS| 2 ++
 lisp/org-src.el | 7 +++
 2 files changed, 9 insertions(+)

diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 5828165340..ea78234e0d 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -291,6 +291,8 @@ purpose of the variable.  The replacement variable
 accepts =listings= and =verbatim= in place of =t= and =nil= (which
 still work, but are no longer listed as valid options).
 
+*** New function ~org-edit-src-goto~ 
+
 * Version 9.5
 
 ** Important announcements and breaking changes
diff --git a/lisp/org-src.el b/lisp/org-src.el
index cc49181618..d0a7aedd81 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -413,6 +413,7 @@ END."
 (overlay-put overlay 'keymap
 (let ((map (make-sparse-keymap)))
   (define-key map [mouse-1] 'org-edit-src-continue)
+   (define-key map [return] #'org-edit-src-goto)
   map))
 (let ((read-only
   (list
@@ -1273,6 +1274,12 @@ Throw an error if there is no such buffer.
 EVENT is passed to `mouse-set-point'."
   (interactive "e")
   (mouse-set-point event)
+  (org-edit-src-goto))
+
+(defun org-edit-src-goto ()
+  "Unconditionally return to buffer editing area under point.
+Throw an error if there is no such buffer."
+  (interactive)
   (let ((buf (get-char-property (point) 'edit-buffer)))
 (if buf (org-src-switch-to-buffer buf 'continue)
   (user-error "No sub-editing buffer for area at point"

[nongnu] elpa/git-commit updated (5a7519fd3d -> e920cdb326)

[ELPA Syncer]

elpasync pushed a change to branch elpa/git-commit.

  from  5a7519fd3d magit-ediff-dwim-resolve-function: New option
   new  8ced37e405 manual: Fix typo
   new  e920cdb326 magit-ediff-buffers: Fix docstring typos


Summary of changes:
 docs/magit.org  | 2 +-
 docs/magit.texi | 2 +-
 lisp/magit-ediff.el | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

[nongnu] elpa/git-commit e920cdb326 2/2: magit-ediff-buffers: Fix docstring typos

[ELPA Syncer]

branch: elpa/git-commit
commit e920cdb326d2c2da5a32809085aa6b9369b51b1a
Author: Kyle Meyer 
Commit: Kyle Meyer 

magit-ediff-buffers: Fix docstring typos
---
 lisp/magit-ediff.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/magit-ediff.el b/lisp/magit-ediff.el
index ac9129d4b4..ae2f053123 100644
--- a/lisp/magit-ediff.el
+++ b/lisp/magit-ediff.el
@@ -136,8 +136,8 @@ recommend you do not further complicate that by enabling 
this.")
   "Run Ediff on two or three buffers.
 This is a wrapper around `ediff-buffers-internal'.
 
-A, B and C have the form (GET-BUFFER CREATE-BUFFER).  It
-GET-BUFFER returns a non-nil, then that buffer is used and
+A, B and C have the form (GET-BUFFER CREATE-BUFFER).  If
+GET-BUFFER returns a non-nil value, then that buffer is used and
 it is not killed when exiting Ediff.  Otherwise CREATE-BUFFER
 must return a buffer and that is killed when exiting Ediff.
 

[nongnu] elpa/git-commit 8ced37e405 1/2: manual: Fix typo

[ELPA Syncer]

branch: elpa/git-commit
commit 8ced37e4051e00cbc5b9bd4a426f8acdf6786e7e
Author: Kyle Meyer 
Commit: Kyle Meyer 

manual: Fix typo
---
 docs/magit.org  | 2 +-
 docs/magit.texi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/magit.org b/docs/magit.org
index 062ebe82c8..64f0fd58c9 100644
--- a/docs/magit.org
+++ b/docs/magit.org
@@ -3509,7 +3509,7 @@ information on how to use Ediff itself, see info:ediff.
   The A, B and Ancestor buffers are constructed from the conflict
   markers in the worktree file.  Because you and/or Git may have
   already resolved some conflicts, that means that these buffers
-  to not contain the actual versions from the respective blobs.
+  may not contain the actual versions from the respective blobs.
 
 - Key: E m (magit-ediff-resolve-all) ::
 
diff --git a/docs/magit.texi b/docs/magit.texi
index f383df6553..0e9fb315fe 100644
--- a/docs/magit.texi
+++ b/docs/magit.texi
@@ -4379,7 +4379,7 @@ buffer.
 The A, B and Ancestor buffers are constructed from the conflict
 markers in the worktree file.  Because you and/or Git may have
 already resolved some conflicts, that means that these buffers
-to not contain the actual versions from the respective blobs.
+may not contain the actual versions from the respective blobs.
 
 @item @kbd{E m} (@code{magit-ediff-resolve-all})
 @kindex E m

[nongnu] elpa/magit updated (5a7519fd3d -> e920cdb326)

[ELPA Syncer]

elpasync pushed a change to branch elpa/magit.

  from  5a7519fd3d magit-ediff-dwim-resolve-function: New option
  adds  8ced37e405 manual: Fix typo
  adds  e920cdb326 magit-ediff-buffers: Fix docstring typos

No new revisions were added by this update.

Summary of changes:
 docs/magit.org  | 2 +-
 docs/magit.texi | 2 +-
 lisp/magit-ediff.el | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

[nongnu] elpa/magit-section updated (5a7519fd3d -> e920cdb326)

[ELPA Syncer]

elpasync pushed a change to branch elpa/magit-section.

  from  5a7519fd3d magit-ediff-dwim-resolve-function: New option
  adds  8ced37e405 manual: Fix typo
  adds  e920cdb326 magit-ediff-buffers: Fix docstring typos

No new revisions were added by this update.

Summary of changes:
 docs/magit.org  | 2 +-
 docs/magit.texi | 2 +-
 lisp/magit-ediff.el | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)