[elpa] externals/mct 7a750bf420 2/4: Minor update to doc string

[ELPA Syncer]

branch: externals/mct
commit 7a750bf4204c1e2ac1bedb74868e9288f3484679
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Minor update to doc string
---
 mct.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mct.el b/mct.el
index 4ffd493296..0790152aa5 100644
--- a/mct.el
+++ b/mct.el
@@ -115,8 +115,9 @@ number of candidates that are being computed."
 
 (defcustom mct-live-update-delay 0.3
   "Delay in seconds before updating the Completions' buffer.
+Set this to 0 to disable the delay.
 
-Set this to 0 to disable the delay."
+This applies in all cases covered by `mct-live-completion'."
   :type 'number
   :group 'mct)
 

[elpa] externals/mct 57150cbd19 4/4: Add documentation about our key remap practice

[ELPA Syncer]

branch: externals/mct
commit 57150cbd194135df58dbbfc1508227b5ae090f92
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Add documentation about our key remap practice

This extends commit 9fa8daa which re-introduced the remap setup.
---
 README.org | 63 ++
 1 file changed, 63 insertions(+)

diff --git a/README.org b/README.org
index bdc8096516..20ae56b3e1 100644
--- a/README.org
+++ b/README.org
@@ -675,6 +675,69 @@ If you want to edit any key bindings, do it in these 
keymaps, not in
 those they extend and override (the names of the original ones are the
 same as above, minus the =mct-= prefix).
 
+** The use of remap for key bindings
+:PROPERTIES:
+:CUSTOM_ID: h:de19a74f-e305-4311-a9fe-2905bc5e06a0
+:END:
+#+cindex: Remap key bindings
+
+MCT tries not to hardcode key bindings in order to respect user
+configurations.  To this end, Emacs provides the ~remap~ mechanism which
+effectively intercepts the key binding of the original command and
+applies it to the one specified.  Think of it like redirecting from the
+old to the new one.
+
+The code looks like this:
+
+#+begin_src emacs-lisp
+(defvar mct-minibuffer-local-completion-map
+  (let ((map (make-sparse-keymap)))
+(define-key map (kbd "C-j") #'exit-minibuffer)
+(define-key map [remap goto-line] #'mct-choose-completion-number)
+(define-key map [remap next-line] #'mct-switch-to-completions-top)
+(define-key map [remap next-line-or-history-element] 
#'mct-switch-to-completions-top)
+(define-key map [remap previous-line] #'mct-switch-to-completions-bottom)
+(define-key map [remap previous-line-or-history-element] 
#'mct-switch-to-completions-bottom)
+(define-key map (kbd "M-e") #'mct-edit-completion)
+(define-key map (kbd "C-") #'mct-complete-and-exit)
+(define-key map (kbd "C-l") #'mct-list-completions-toggle)
+map)
+  "Derivative of `minibuffer-local-completion-map'.")
+#+end_src
+
+The ~remap~ might cause unwanted behaviour in cases where a user
+maintaints their own remappings which conflict with those of the
+package.  Consider, for example, this scenario:
+
+#+begin_src emacs-lisp
+(require 'mct)
+
+;; Here goes the MCT setup
+
+;; More code...
+
+;; The user remaps `goto-line' to `my-goto-line-replacement' in the
+;; `global-map'.
+(define-key global-map [remap goto-line] #'my-goto-line-replacement)
+#+end_src
+
+If a user loads MCT first and later in their configuration defines a
+remap for ~goto-line~, then that will take precedence over what MCT wants
+to do.  The solution is for the user to update their code to specify an
+explicit key binding:
+
+#+begin_src emacs-lisp
+(require 'mct)
+
+;; Here goes the MCT setup
+
+;; More code...
+
+;; The user specifies an explicit key binding for
+;; `my-goto-line-replacement' in the `global-map'.
+(define-key global-map (kbd "M-g M-g") #'my-goto-line-replacement)
+#+end_src
+
 * User-level tweaks or custom code
 :PROPERTIES:
 :CUSTOM_ID: h:2630a7a3-1b11-4e9d-8282-0ea3bf9e2a5b

[elpa] externals/mct updated (7364dc45af -> 57150cbd19)

[ELPA Syncer]

elpasync pushed a change to branch externals/mct.

  from  7364dc45af Remove all key remappings
   new  9fa8daa231 Revert "Remove all key remappings"
   new  7a750bf420 Minor update to doc string
   new  21aad0b43d Add missing metadata for a couple of keymaps
   new  57150cbd19 Add documentation about our key remap practice


Summary of changes:
 README.org | 65 ++
 mct.el | 44 +-
 2 files changed, 87 insertions(+), 22 deletions(-)

[elpa] externals/mct 21aad0b43d 3/4: Add missing metadata for a couple of keymaps

[ELPA Syncer]

branch: externals/mct
commit 21aad0b43dbf02f6628cbe0342be25a8a5b71727
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Add missing metadata for a couple of keymaps
---
 README.org | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.org b/README.org
index fa0a514bb4..bdc8096516 100644
--- a/README.org
+++ b/README.org
@@ -657,6 +657,8 @@ Other useful extras from the Emacs source code (read their 
doc strings):
 #+vindex: mct-completion-list-mode-map
 #+vindex: mct-minibuffer-local-completion-map
 #+vindex: mct-minibuffer-local-filename-completion-map
+#+vindex: mct-region-buffer-map
+#+vindex: mct-region-completion-list-map
 
 MCT defines its own keymaps, which extend those that are active in the
 minibuffer and the =*Completions*= buffer, respectively:

[elpa] externals/mct 9fa8daa231 1/4: Revert "Remove all key remappings"

[ELPA Syncer]

branch: externals/mct
commit 9fa8daa231c5faabddef60fa41b4c1e04c412c01
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Revert "Remove all key remappings"

This reverts commit 7364dc45af82b63221e66688bfadecb4becae320.

* * *

The remap mechanism is better in principle, because it does not hardcode
values and so users get their own key bindings automatically.  It is
best to document the presence of the remappings and explain how things
work.
---
 mct.el | 41 -
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/mct.el b/mct.el
index 7e30157d48..4ffd493296 100644
--- a/mct.el
+++ b/mct.el
@@ -1029,33 +1029,33 @@ region.")
 
 (defvar mct-minibuffer-completion-list-map
   (let ((map (make-sparse-keymap)))
-(define-key map (kbd "C-g") #'mct-keyboard-quit-dwim)
-(define-key map (kbd "M-g g") #'mct-choose-completion-number)
-(define-key map (kbd "M-g M-g") #'mct-choose-completion-number)
-(define-key map (kbd "C-n") #'mct-next-completion-or-mini)
+(define-key map [remap keyboard-quit] #'mct-keyboard-quit-dwim)
+(define-key map [remap goto-line] #'mct-choose-completion-number)
+(define-key map [remap next-line] #'mct-next-completion-or-mini)
 (define-key map (kbd "n") #'mct-next-completion-or-mini)
-(define-key map (kbd "C-p") #'mct-previous-completion-or-mini)
+(define-key map [remap previous-line] #'mct-previous-completion-or-mini)
 (define-key map (kbd "p") #'mct-previous-completion-or-mini)
-(define-key map (kbd "M-}") #'mct-next-completion-group)
+(define-key map [remap backward-paragraph] #'mct-previous-completion-group)
+(define-key map [remap forward-paragraph] #'mct-next-completion-group)
+(define-key map (kbd "M-p") #'mct-previous-completion-group)
 (define-key map (kbd "M-n") #'mct-next-completion-group)
-(define-key map (kbd "M-{") #'mct-previous-completion-group)
-(define-key map (kbd "M-p") #'mct-previous-completion-group)
 (define-key map (kbd "e") #'mct-focus-minibuffer)
 (define-key map (kbd "M-e") #'mct-edit-completion)
 (define-key map (kbd "TAB") #'mct-choose-completion-no-exit)
 (define-key map (kbd "RET") #'mct-choose-completion-exit)
 (define-key map (kbd "M-RET") #'mct-choose-completion-dwim)
-(define-key map (kbd "M-<") #'mct-beginning-of-buffer)
+(define-key map [remap beginning-of-buffer] #'mct-beginning-of-buffer)
 map)
   "Derivative of `completion-list-mode-map'.")
 
 (defvar mct-minibuffer-local-completion-map
   (let ((map (make-sparse-keymap)))
 (define-key map (kbd "C-j") #'exit-minibuffer)
-(define-key map (kbd "M-g g") #'mct-choose-completion-number)
-(define-key map (kbd "M-g M-g") #'mct-choose-completion-number)
-(define-key map (kbd "C-n") #'mct-switch-to-completions-top)
-(define-key map (kbd "C-p") #'mct-switch-to-completions-bottom)
+(define-key map [remap goto-line] #'mct-choose-completion-number)
+(define-key map [remap next-line] #'mct-switch-to-completions-top)
+(define-key map [remap next-line-or-history-element] 
#'mct-switch-to-completions-top)
+(define-key map [remap previous-line] #'mct-switch-to-completions-bottom)
+(define-key map [remap previous-line-or-history-element] 
#'mct-switch-to-completions-bottom)
 (define-key map (kbd "M-e") #'mct-edit-completion)
 (define-key map (kbd "C-") #'mct-complete-and-exit)
 (define-key map (kbd "C-l") #'mct-list-completions-toggle)
@@ -1151,8 +1151,8 @@ Meant to be added to `after-change-functions'."
 
 (defvar mct-region-buffer-map
   (let ((map (make-sparse-keymap)))
-(define-key map (kbd "C-n") #'mct-switch-to-completions-top)
-(define-key map (kbd "C-p") #'mct-switch-to-completions-bottom)
+(define-key map [remap next-line] #'mct-switch-to-completions-top)
+(define-key map [remap previous-line] #'mct-switch-to-completions-bottom)
 ;; TODO: Either keep the TAB=completion-at-point binding or add our own
 ;; command which is compatible with orderless completion.
 (define-key map (kbd "TAB") #'ignore)
@@ -1212,18 +1212,17 @@ minibuffer)."
 
 (defvar mct-region-completion-list-map
   (let ((map (make-sparse-keymap)))
-(define-key map (kbd "C-g") #'mct-next-completion-or-quit)
-(define-key map (kbd "C-n") #'mct-next-completion-or-quit)
+(define-key map [remap next-line] #'mct-next-completion-or-quit)
+(define-key map [remap previous-line] #'mct-previous-completion-or-quit)
 (define-key map (kbd "n") #'mct-next-completion-or-quit)
-(define-key map (kbd "C-p") #'mct-previous-completion-or-quit)
 (define-key map (kbd "p") #'mct-previous-completion-or-quit)
-(define-key map (kbd "M-}") #'mct-next-completion-group)
+(define-key map [remap backward-paragraph] #'mct-previous-completion-group)
+(define-key map [remap forward-paragraph] #'mct-next-completion-group)
 (define-key map (kbd "M-n") #'mct-next-com

[elpa] externals/mct b3cdfa4852 1/2: Document workaround for global-hl-line-mode

[ELPA Syncer]

branch: externals/mct
commit b3cdfa4852aae39530cfd94b7d4a34b8bde8f42f
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Document workaround for global-hl-line-mode

Thanks to Tomasz Hołubowicz for the feedback in issue 1 over at the
GitHub mirror: .
---
 README.org | 27 ++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/README.org b/README.org
index 20ae56b3e1..095a72f411 100644
--- a/README.org
+++ b/README.org
@@ -649,6 +649,30 @@ Other useful extras from the Emacs source code (read their 
doc strings):
   '((file (styles . (basic partial-completion orderless)
 #+end_src
 
+* Known issues and workarounds
+:PROPERTIES:
+:CUSTOM_ID: h:acfb63f4-c2ae-46ff-a840-9c9a6350e567
+:END:
+
+This section documents known issues and how to address them.
+
+** Avoid global-hl-line-mode in the Completions
+:PROPERTIES:
+:CUSTOM_ID: h:ee6aa793-3129-4cf0-8138-1224b6052546
+:END:
+
+MCT uses its own overlay to highlight the candidate at point.  To ensure
+that it does not interfere with the optional stripes (provided by the
+user option ~mct-apply-completion-stripes~) the highlight's priority is
+set to a custom value.  This, in turn, means that when the user enables
+~global-hl-line-mode~, its highlighted line will take precedence over the
+MCT highlight.  The solution to this conflict is to disable the hl-line
+locally for the =*Completions*= buffer like this:
+
+#+begin_src emacs-lisp
+(add-hook 'completion-list-mode-hook (lambda () (setq-local 
global-hl-line-mode nil)))
+#+end_src
+
 * Keymaps
 :PROPERTIES:
 :CUSTOM_ID: h:b3178edd-f340-444c-8426-fe84f23ac9ea
@@ -1014,7 +1038,8 @@ MCT is meant to be a collective effort.  Every bit of 
help matters.
 
 + Ideas and user feedback :: Andrew Tropin, Benjamin (@zealotrush), Case
   Duckworth, Jonathan Irving, José Antonio Ortega Ruiz, Kostadin Ninev,
-  Manuel Uberti, Philip Kaludercic, Theodor Thornhill, Z.Du.
+  Manuel Uberti, Philip Kaludercic, Theodor Thornhill, Tomasz
+  Hołubowicz, Z.Du.
 
 + Inspiration for certain features :: =icomplete.el= (built-in---multiple
   authors), Daniel Mendler (=vertico=), Omar Antolín Camarena (=embark=,

[elpa] externals/mct 664e682381 2/2: Fix typo in previous commit

[ELPA Syncer]

branch: externals/mct
commit 664e68238171371bbfe67121b85b0d56fd4af48a
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Fix typo in previous commit
---
 README.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.org b/README.org
index 095a72f411..5bb799dd5f 100644
--- a/README.org
+++ b/README.org
@@ -665,8 +665,8 @@ MCT uses its own overlay to highlight the candidate at 
point.  To ensure
 that it does not interfere with the optional stripes (provided by the
 user option ~mct-apply-completion-stripes~) the highlight's priority is
 set to a custom value.  This, in turn, means that when the user enables
-~global-hl-line-mode~, its highlighted line will take precedence over the
-MCT highlight.  The solution to this conflict is to disable the hl-line
+~global-hl-line-mode~, its highlighted line takes precedence over the MCT
+highlight.  The solution to this conflict is to disable the hl-line
 locally for the =*Completions*= buffer like this:
 
 #+begin_src emacs-lisp

[elpa] externals/mct updated (57150cbd19 -> 664e682381)

[ELPA Syncer]

elpasync pushed a change to branch externals/mct.

  from  57150cbd19 Add documentation about our key remap practice
   new  b3cdfa4852 Document workaround for global-hl-line-mode
   new  664e682381 Fix typo in previous commit


Summary of changes:
 README.org | 27 ++-
 1 file changed, 26 insertions(+), 1 deletion(-)

[elpa] externals/mct c86bb91f99 1/2: Deprecate mct-region-completions-format

[ELPA Syncer]

branch: externals/mct
commit c86bb91f997f2b8f6ea145fd4d9e608517bf84c9
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Deprecate mct-region-completions-format

It sets a bad precedent to have user options for the minibuffer and
region modes.  The functionality of the two is not exactly the same.  We
will then have to maintain all sorts of exceptions and checks, making
things more complex/fragile.
---
 README.org |  9 -
 mct.el | 22 --
 2 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/README.org b/README.org
index 5bb799dd5f..ac54ddb1a2 100644
--- a/README.org
+++ b/README.org
@@ -457,15 +457,6 @@ out of the =*Completions*=.
 To cancel in-buffer completion, type =C-g= either before switching to the
 Completions' buffer or while inside of it.
 
-#+vindex: mct-region-completions-format
-The only customization option for ~mct-region-mode~ pertains to the
-presentation of the =*Completions*=: ~mct-region-completions-format~.  By
-default, it uses the same style as ~mct-completions-format~, though it can
-be configured to, for example, display candidates in a grid with either
-of the =horizontal= or =vertical= values (on Emacs 27, candidates are always
-displayed in a grid, as the =one-column= layout was introduced in Emacs
-28).
-
 * Installation
 :PROPERTIES:
 :CUSTOM_ID: h:1b501ed4-f16c-4118-9a4a-7a5e29143077
diff --git a/mct.el b/mct.el
index 0790152aa5..1784504fb3 100644
--- a/mct.el
+++ b/mct.el
@@ -174,17 +174,7 @@ See `completions-format' for possible values."
   :type '(choice (const horizontal) (const vertical) (const one-column))
   :group 'mct)
 
-(defcustom mct-region-completions-format mct-completions-format
-  "The Completions' appearance used by `mct-region-mode'.
-See `completions-format' for possible values.
-
-This is like `mct-completions-format' when performing in-buffer
-completion."
-  :type '(choice (variable :tag "Inherit value of `mct-completions-format'" 
mct-completions-format)
- (const horizontal)
- (const vertical)
- (const one-column))
-  :group 'mct)
+(make-obsolete 'mct-region-completions-format 'mct-completions-format "0.5.0")
 
  Completion metadata
 
@@ -348,7 +338,7 @@ Apply APP by first let binding the `completions-format' to
 Apply APP by first let binding the `completions-format' to
 `mct-completions-format'."
   (if (mct--region-p)
-  (let ((completions-format mct-region-completions-format))
+  (let ((completions-format mct-completions-format))
 (apply app)
 (mct--fit-completions-window))
 (apply app)))
@@ -435,12 +425,8 @@ Apply APP by first setting up the minibuffer to work with 
Mct."
 ;; We need this to make things work on Emacs 27.
 (defun mct--one-column-p ()
   "Test if we have a one-column view available."
-  (when (>= emacs-major-version 28)
-(cond
- ((mct--region-p)
-  (eq mct-region-completions-format 'one-column))
- ((mct--minibuffer-p)
-  (eq mct-completions-format 'one-column)
+  (and (eq mct-completions-format 'one-column)
+   (> emacs-major-version 28)))
 
 ; Focus minibuffer and/or show completions
 

[elpa] externals/mct updated (664e682381 -> d69b7ffcb4)

[ELPA Syncer]

elpasync pushed a change to branch externals/mct.

  from  664e682381 Fix typo in previous commit
   new  c86bb91f99 Deprecate mct-region-completions-format
   new  d69b7ffcb4 Use correct minor version in the manual


Summary of changes:
 README.org | 13 ++---
 mct.el | 22 --
 2 files changed, 6 insertions(+), 29 deletions(-)

[elpa] externals/hyperbole aa3d062d99: Change {C-c M-c} binding to kotl-mode:copy-tree-or-region-to-buffer

[ELPA Syncer]

branch: externals/hyperbole
commit aa3d062d9922c1188e1460c95567df73f3a5fbb8
Author: Robert Weiner 
Commit: Robert Weiner 

Change {C-c M-c} binding to kotl-mode:copy-tree-or-region-to-buffer
---
 ChangeLog  |  11 +++
 HY-NEWS|   9 ++-
 kotl/EXAMPLE.kotl  | 218 +++--
 kotl/kmenu.el  |   4 +-
 kotl/kotl-mode.el  |  80 
 man/hyperbole.texi |  10 ++-
 6 files changed, 168 insertions(+), 164 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1bd6817590..ae1ebd2b37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2022-01-25  Bob Weiner  
 
+
+* kotl/kotl-mode.el (kotl-mode:copy-region-to-buffer): Fix interactive args 
listed in wrong
+order.
+* kotl/kotl-mode.el (kotl-mode:copy-region-to-buffer): Replace 
'kotl-mode:insert-region'.
+   (kotl-mode:copy-tree-to-buffer): Replace 
'kotl-mode:insert-tree'.
+(kotl-mode:copy-tree-or-region-to-buffer): New binding for 
{C-c M-c}.
+
+* man/hyperbole.texi (Koutliner Keys):
+  kotl/kmenu.el (kotl-menu-common-body):
+  kotl/kotl-mode.el (kotl-mode:copy-tree-to-buffer): Replace 
'kotl-mode:copy-to-buffer'.
+
 * hpath.el (seq): Add (require 'seq) since seq-find is used herein.
 
 * hbut.el (defib): Add back edebug spec for defib that must have been 
accidentally
diff --git a/HY-NEWS b/HY-NEWS
index 8b28c826a5..b0396d4244 100644
--- a/HY-NEWS
+++ b/HY-NEWS
@@ -157,9 +157,12 @@
   to {C-c C-@} to prevent conflict with the global hycontrol-window-grid
   command bound to {C-c @}.
 
-- The new commands, `kotl-mode:insert-region' and `kotl-mode:insert-tree'
-  insert parts of Koutlines directly into other buffers without having
-  to copy to a mail/message buffer first.
+- New Copy Command: The new command, 
`kotl-mode:copy-tree-or-region-to-buffer',
+  bound to {C-c M-c} copies a Koutline tree or the active region
+  to a specified buffer.  Prompts dictate whether invisible text
+  is included or not.  This allows copying parts of Koutlines
+  directly into other buffers without having to copy to a
+  mail/message buffer first.
 
 - New Tree Demotion/Promotion Keys: Tree promotion and demotion keys now
   match the defaults in Org mode and Outline mode, plus some easier to
diff --git a/kotl/EXAMPLE.kotl b/kotl/EXAMPLE.kotl
index 4862d759ba..cd53f9fcfb 100644
--- a/kotl/EXAMPLE.kotl
+++ b/kotl/EXAMPLE.kotl
@@ -94,15 +94,13 @@
 {C-c $}   - Move to the last cell in the tree rooted at point.
 
   3b8. Tree Movement and Copying: Entire outline trees can be moved or
-   copied with single commands.  Simply invoke the desired command
-   and then double click with the Action Key on the desired root cell
-   for each argument for which you are prompted.
+   copied within an outline with single commands.  Simply invoke
+   the desired command and then double click/press with the Action
+   Key on the desired root cell for each argument for which you are
+   prompted.

Copying and moving only work within a single outline right now, so
-   don't use them to move trees across different outline files.  You
-   can, however, copy an outline tree to a non-outline buffer with:
-{C-c M-c} - Copy a koutline tree to a non-koutline buffer.
-{C-c C-@} - Copy a koutline tree to an outgoing mail message.
+   don't try to move or copy trees to another Koutline file.

 {C-c c}   - Copy  to follow as sibling of .
 {C-u C-c c}   - Copy  to follow as first child of .
@@ -123,13 +121,21 @@
of the root cell of the tree to move and then double click within
the body of the root cell of the tree you want it to follow.
 
-  3b9. Cell Transposition:  The move and copy commands rearrange entire
+  3b9. Tree Text or Region Copying to a Non-Koutline Buffer: 
+{C-c M-c} - Copy  text or active region to a non-Koutline 
buffer.
+{C-c C-@} - Copy  text to an outgoing mail message.
+   
+   Each above command prompts for whether or not to include
+   hidden/invisible text when copying.  If yes, all invisible text
+   is expanded before copying.
+
+ 3b10. Cell Transposition:  The move and copy commands rearrange entire
trees.  The following two commands exchange the locations of two
cells.
 
-3b9a. {C-c e} prompts for two cell addresses and exchanges the cells.
+   3b10a. {C-c e} prompts for two cell addresses and exchanges the cells.
 
-3b9b. {C-c t} does not prompt.  It exchanges the current and
+   3b10b. {C-c t} does not prompt.  It exchanges the current and
   preceding cells.  If there is no preceding cell it exchanges
   the current and next cell.
   
@@ 

[elpa] externals/mct d69b7ffcb4 2/2: Use correct minor version in the manual

[ELPA Syncer]

branch: externals/mct
commit d69b7ffcb46c4286ff06c87efc1367df7a9c6ae9
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Use correct minor version in the manual
---
 README.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.org b/README.org
index ac54ddb1a2..4dc8d24a7f 100644
--- a/README.org
+++ b/README.org
@@ -5,8 +5,8 @@
 #+options: ':t toc:nil author:t email:t num:t
 #+startup: content
 
-#+macro: stable-version 0.4.0
-#+macro: release-date 2022-01-19
+#+macro: stable-version 0.4.2
+#+macro: release-date 2022-01-21
 #+macro: development-version 0.5.0-dev
 #+macro: file @@texinfo:@file{@@$1@@texinfo:}@@
 #+macro: space @@texinfo:@: @@

[elpa] externals/phps-mode 61e73b1ce0 1/8: Added indent todo items

[Christian Johansson]

branch: externals/phps-mode
commit 61e73b1ce0e10da355e2a570af453b72deaf1784
Author: Christian Johansson 
Commit: Christian Johansson 

Added indent todo items
---
 TODO.md | 13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/TODO.md b/TODO.md
index 5eeef4db3b..492c21b31a 100644
--- a/TODO.md
+++ b/TODO.md
@@ -5,7 +5,18 @@
 * Lines after comment looking like an assignment like:
 
 $var = 23; // 23 = Company
-echo 'was here';
+echo 'was here';
+
+or
+
+$var = 23; /* 23 = Company */
+echo 'was here';
+
+* Multi-lined chained object
+
+$var = Object->myMethod()
+->myMethod2();
+echo 'here';
 
 ## Code intelligence
 

[elpa] externals/phps-mode 83b0220d5b 5/8: Added new failing indent tests

[Christian Johansson]

branch: externals/phps-mode
commit 83b0220d5b73560e75c88231b4b4c8d8944f9244
Author: Christian Johansson 
Commit: Christian Johansson 

Added new failing indent tests
---
 test/phps-mode-test-indent.el | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/test/phps-mode-test-indent.el b/test/phps-mode-test-indent.el
index 01e88bfd33..ef7d6110d6 100644
--- a/test/phps-mode-test-indent.el
+++ b/test/phps-mode-test-indent.el
@@ -660,6 +660,21 @@
" $fields) {\n$html .= '' . $key . 
'';\nforeach ($fields as $key => $value) {\n$html 
.= '' . $value . '';\n}\n$html .= '';\n  
  }\n$html .= '';\n}\n"
"Two nested foreach loops containing string concatenation assignments")
 
+  ;; TODO Make this pass
+  (phps-mode-test-indent--should-equal
+   "myMethod()\n->myMethod2();\necho 'here';"
+   "Line after assignment were an chaining of object methods started")
+
+  ;; TODO Make this pass
+  (phps-mode-test-indent--should-equal
+   "

[elpa] externals/phps-mode 463ceedbbb 6/8: Passing new indent test for line after commented out assignment

[Christian Johansson]

branch: externals/phps-mode
commit 463ceedbbb0155a71b500f747920d6b8a94e01a3
Author: Christian Johansson 
Commit: Christian Johansson 

Passing new indent test for line after commented out assignment
---
 phps-mode-indent.el   | 13 +
 test/phps-mode-test-indent.el | 12 +---
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/phps-mode-indent.el b/phps-mode-indent.el
index a00d7b65d9..0977a1a38f 100644
--- a/phps-mode-indent.el
+++ b/phps-mode-indent.el
@@ -531,6 +531,19 @@
 (unless (or
  line-is-empty-p
  line-is-comment-p)
+
+  ;; Does line contain comment?
+  (when (string-match-p
+ "\\(//[^'\"]+$\\|#[^'\"]+$\\|/\\*.+\\*/\\)"
+ line-string)
+;; Delete comment region
+(setq
+ line-string
+ (replace-regexp-in-string
+  "\\(//[^'\"]+$\\|#[^'\"]+$\\|/\\*.+\\*/\\)"
+  ""
+  line-string)))
+
   (cond
((= searching-previous-lines 2)
 (setq
diff --git a/test/phps-mode-test-indent.el b/test/phps-mode-test-indent.el
index ef7d6110d6..4152c9d414 100644
--- a/test/phps-mode-test-indent.el
+++ b/test/phps-mode-test-indent.el
@@ -660,21 +660,19 @@
" $fields) {\n$html .= '' . $key . 
'';\nforeach ($fields as $key => $value) {\n$html 
.= '' . $value . '';\n}\n$html .= '';\n  
  }\n$html .= '';\n}\n"
"Two nested foreach loops containing string concatenation assignments")
 
-  ;; TODO Make this pass
-  (phps-mode-test-indent--should-equal
-   "myMethod()\n->myMethod2();\necho 'here';"
-   "Line after assignment were an chaining of object methods started")
-
-  ;; TODO Make this pass
   (phps-mode-test-indent--should-equal
"myMethod()\n->myMethod2();\necho 'here';"
+   "Line after assignment were an chaining of object methods started")
+
   )
 
 (defun phps-mode-test-indent--get-lines-indent-psr-2 ()

[elpa] externals/phps-mode 73c4106bbf 8/8: Updated readme and version

[Christian Johansson]

branch: externals/phps-mode
commit 73c4106bbff2782699c358f0c5badf6993e48e85
Author: Christian Johansson 
Commit: Christian Johansson 

Updated readme and version
---
 README.md| 1 -
 phps-mode.el | 9 -
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 4c93672be3..14a55afc4d 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,6 @@ This mode does not require PHP installed on your computer 
because it has a built
 * Mode-line asynchronous status
 * Bookkeeping in lexical-analysis, showing defined and undefined variables via 
syntax coloring (requires a theme that has distinct colors for 
'font-lock-warning-face and 'font-lock-variable-name-face)
 * Canonical LR(1) Parser automatically generated from official PHP 8.0 LALR(1) 
YACC grammar
-* 
 
 ## Issues and roadmap
 
diff --git a/phps-mode.el b/phps-mode.el
index 52a0c8442f..35e0b2cf6d 100644
--- a/phps-mode.el
+++ b/phps-mode.el
@@ -5,8 +5,8 @@
 ;; Author: Christian Johansson 
 ;; Maintainer: Christian Johansson 
 ;; Created: 3 Mar 2018
-;; Modified: 26 Jan 2022
-;; Version: 0.4.14
+;; Modified: 27 Jan 2022
+;; Version: 0.4.15
 ;; Keywords: tools, convenience
 ;; URL: https://github.com/cjohansson/emacs-phps-mode
 
@@ -30,10 +30,9 @@
 
 ;;; Commentary:
 
-;; A major-mode that uses original PHP lex-analyzer and parser for syntax 
coloring, imenu and indentation making it easier to spot errors in syntax.
+;; A major-mode that uses original PHP lex-analyzer and parser for syntax 
coloring, bookkeeping, imenu and indentation making it easier to spot errors in 
syntax.
 ;;
-;; Also includes full support for PSR-1 and PSR-2 indentation and imenu.
-;; Improved syntax table in comparison with old PHP major-mode.
+;; Also includes full support for PSR-1 and PSR-2 indentation and indentaton 
for HTML/XML contents.
 ;;
 ;; For flycheck support run `(phps-mode-flycheck-setup)'.
 ;;

[elpa] externals/phps-mode 1eb1866f96 3/8: Removed obsolete docs

[Christian Johansson]

branch: externals/phps-mode
commit 1eb1866f96484cf32cf7def1c2cda9b7fd9c6c44
Author: Christian Johansson 
Commit: Christian Johansson 

Removed obsolete docs
---
 docs/development.md |  71 -
 docs/heuristics.md  |  22 ---
 docs/imenu.md   |  24 ---
 docs/indentation.md | 176 
 4 files changed, 293 deletions(-)

diff --git a/docs/development.md b/docs/development.md
deleted file mode 100644
index ea2df5e686..00
--- a/docs/development.md
+++ /dev/null
@@ -1,71 +0,0 @@
-# Development
-
-Make pull requests to `develop` branch or branches forked from develop branch. 
Tested changes that are considered improvements are merged to master. Make sure 
to sign the FSF-papers as well.
-
-## Tests
-
-If you have emacs at a customized location prefix the commands with your path, 
i.e.
-
-`export emacs="~/Documents/emacs/src/emacs" && make tests`
-
-Run all tests with `make tests`.
-
-### Functions
-
-Indentations, incremental processes, Imenu-support.
-
-``` bash
-make test-functions
-```
-
-### Integration
-
-This should test all other parts in collaboration.
-
-``` bash
-make test-integration
-```
-
-### Lexer
-
-Lexer token generation.
-
-``` bash
-make test-lexer
-```
-
-### Parser
-
-Semantic grammar. Not ready yet.
-
-``` bash
-make test-parser
-```
-
-### Syntax-table
-
-Basic point and region behaviour.
-
-``` bash
-make test-syntax-table
-```
-
-## Byte-compilation
-
-Plug-in should support byte-compilation and it is recommended.
-
-### Compile
-
-``` bash
-make compile
-```
-
-### Clean
-
-``` bash
-make clean
-```
-
-
-
-[Back to start](../../../)
diff --git a/docs/heuristics.md b/docs/heuristics.md
deleted file mode 100644
index 7a75eccd0a..00
--- a/docs/heuristics.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Heuristics
-
-These should solve the problem of freezing editor for too long when making 
small changes to large files. Otherwise a full incremental re-parse would be 
triggered more often than necessary.
-
-## Indenting
-
-When indenting a line, calculate difference in white-space and change indexes 
of buffer after point correspondingly.
-
-## Incremental
-
-When user has done other changes, determine unchanged previous position R, 
determine changed maximum position X, determine new buffer length L. Do 
incremental lex from R to X.
-
-### State preserving changes
-
-If new states at X equals old states at X just move all indexes with delta X, 
otherwise do incremental lex of rest of buffer.
-
-### State disrupting changes
-
-Otherwise continue with incremental lex of rest of buffer.
-
-
-[Back to start](../../../)
diff --git a/docs/imenu.md b/docs/imenu.md
deleted file mode 100644
index 1603078cf3..00
--- a/docs/imenu.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# Imenu algorithm
-
-## Description
-
-This file explains with psuedo-code how the imenu generation algorithm works.
-
-## Psuedo-code
-
-```
-for token in tokens:
-
-if token is "{":
-nesting-level + 1;
-endif;
-if token is "}":
-nesting-level - 1;
-endif;
-
-
-
-endfor;
-```
-
-[Back to start](../../../)
diff --git a/docs/indentation.md b/docs/indentation.md
deleted file mode 100644
index 012fcdd525..00
--- a/docs/indentation.md
+++ /dev/null
@@ -1,176 +0,0 @@
-# Indentation algorithm
-
-Document describing indentation algorithm.
-
-## Terminology
-
-* `nesting`: sum of all kinds of open brackets
-* `nesting-stack`: contains nesting-levels before indentation was increased
-* `nesting-start`: nesting-level at the beginning of the last line
-* `nesting-end`: nesting-level at the end of the last line
-* `nesting-stack-start`: nesting-start at top of stack
-* `nesting-stack-end`: nesting-end at top of stack
-
-## Algorithm
-
-Here follows pseudo-code for a algorithm that calculates indentation for each 
line in buffer. Tokens are from the official re2c PHP lexer.
-
-```php
-foreach token in buffer:
-
-if token = T_START_HEREDOC:
-in-heredoc = true;
-in-heredoc-started-this-line = true;
-elseif token == T_END_HEREDOC:
-in-heredoc = false;
-in-heredoc-ended-this-line = true;
-endif;
-
-calculate nesting-end;
-
-if nesting-stack AND nesting-end <= nesting-stack-start: // #decrease
-pop stack;
-
-if first-token-on-line-is-nesting-decrease:
-indent--;
-else:
-if !temp-post-indent:
-temp-post-indent = indent;
-endif;
-
-temp-post-indent--;
-endif;
-
-endif;
-
-if we reached end of a line:
-
-if this-token or last token is a dot:
-concatentation-level = 1;
-else:
-concatentation-level = 0;
-endif;
-
-indent-start = indent;
-
-if new-token-line-start is more than one line after 
last-token-line-start AND token is not T_CLOSE_TAG:
-

[elpa] externals/phps-mode c884caf642 2/8: Merge branch 'master' of git.cvj.se:/home/git/emacs-phps-mode

[Christian Johansson]

branch: externals/phps-mode
commit c884caf642efe8552942291a78b453774d6ab974
Merge: 61e73b1ce0 5ae4886f14
Author: Christian Johansson 
Commit: Christian Johansson 

Merge branch 'master' of git.cvj.se:/home/git/emacs-phps-mode
---
 README.md  |  9 -
 phps-mode-lexer.el | 21 -
 phps-mode.el   |  4 ++--
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 48fbf1e335..58f94d6283 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# PHPs - Semantic Major-Mode for PHP in Emacs
+# PHPs - Emacs major mode for PHP with code intelligence
 
 [![License GPL 
3](https://img.shields.io/badge/license-GPL_3-green.svg)](https://www.gnu.org/licenses/gpl-3.0.txt)
 [![Build 
Status](https://api.travis-ci.com/cjohansson/emacs-phps-mode.svg?branch=master)](https://app.travis-ci.com/github/cjohansson/emacs-phps-mode)
@@ -11,7 +11,7 @@ This mode does not require PHP installed on your computer 
because it has a built
 
 * GPLv3 license
 * Flycheck support with `(phps-mode-flycheck-setup)`
-* Semantic lexer based on official PHP 8.0 re2c lexer
+* Lexer based on official PHP 8.0 re2c lexer
 * Syntax coloring based on lexer tokens, makes it easier to spot invalid code
 * PSR-1, PSR-2 and PSR-12 indentation based on lexer tokens
 * PSR-1, PSR-2 and PSR-12 supported white-space
@@ -31,10 +31,9 @@ This mode does not require PHP installed on your computer 
because it has a built
 * Bookkeeping in lexical-analysis, showing defined and undefined variables via 
syntax coloring (requires a theme that has distinct colors for 
'font-lock-warning-face and 'font-lock-variable-name-face)
 * Canonical LR(1) Parser automatically generated from official PHP 8.0 LALR(1) 
YACC grammar
 
-## Roadmap
+## Issues and roadmap
 
-* 1. Improved token-blind indentation (alternative and inline control 
structures)
-* 2. Bookkeeping and imenu-generation via syntax directed translations via the 
parser
+See [Development](docs/TODO.md)
 
 ## Keymap
 
diff --git a/phps-mode-lexer.el b/phps-mode-lexer.el
index 60bcc24adb..e3a2193d98 100644
--- a/phps-mode-lexer.el
+++ b/phps-mode-lexer.el
@@ -204,15 +204,17 @@
 
 (defun phps-mode-lexer--move-forward (position)
   "Move forward to POSITION."
-  (setq-local
-   phps-mode-lex-analyzer--lexer-index
-   position))
+  (when (boundp 'phps-mode-lex-analyzer--lexer-index)
+(setq-local
+ phps-mode-lex-analyzer--lexer-index
+ position)))
 
 (defun phps-mode-lexer--yyless (points)
   "Move lexer back POINTS."
-  (setq-local
-   phps-mode-lex-analyzer--lexer-index
-   (- phps-mode-lex-analyzer--lexer-index points))
+  (when (boundp 'phps-mode-lex-analyzer--lexer-index)
+(setq-local
+ phps-mode-lex-analyzer--lexer-index
+ (- phps-mode-lex-analyzer--lexer-index points)))
   (forward-char (- points)))
 
 (defun phps-mode-lexer--inline-char-handler ()
@@ -339,9 +341,10 @@
 (setq start (match-beginning 0)))
   (unless end
 (setq end (match-end 0)))
-  (setq-local
-   phps-mode-lex-analyzer--lexer-index
-   end))
+  (when (boundp 'phps-mode-lex-analyzer--lexer-index)
+(setq-local
+ phps-mode-lex-analyzer--lexer-index
+ end)))
 
 (defmacro phps-mode-lexer--match-macro (states conditions &rest body)
   "Place in STATES a check for CONDITIONS to execute BODY."
diff --git a/phps-mode.el b/phps-mode.el
index a5e71ae583..52a0c8442f 100644
--- a/phps-mode.el
+++ b/phps-mode.el
@@ -5,8 +5,8 @@
 ;; Author: Christian Johansson 
 ;; Maintainer: Christian Johansson 
 ;; Created: 3 Mar 2018
-;; Modified: 7 Nov 2021
-;; Version: 0.4.13
+;; Modified: 26 Jan 2022
+;; Version: 0.4.14
 ;; Keywords: tools, convenience
 ;; URL: https://github.com/cjohansson/emacs-phps-mode
 

[elpa] externals/phps-mode f2520450c8 7/8: Indentation improved for multi-line chained object method calls

[Christian Johansson]

branch: externals/phps-mode
commit f2520450c825dabe03a402d9403ad8f72202fe4d
Author: Christian Johansson 
Commit: Christian Johansson 

Indentation improved for multi-line chained object method calls
---
 TODO.md   | 16 
 phps-mode-indent.el   |  6 --
 phps-mode-macros.el   |  6 +++---
 test/phps-mode-test-indent.el |  1 -
 4 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/TODO.md b/TODO.md
index 492c21b31a..673893788f 100644
--- a/TODO.md
+++ b/TODO.md
@@ -2,22 +2,6 @@
 
 ## Indentation
 
-* Lines after comment looking like an assignment like:
-
-$var = 23; // 23 = Company
-echo 'was here';
-
-or
-
-$var = 23; /* 23 = Company */
-echo 'was here';
-
-* Multi-lined chained object
-
-$var = Object->myMethod()
-->myMethod2();
-echo 'here';
-
 ## Code intelligence
 
 * Bookkeeping of chained object operators like WC()->cart->subtotal
diff --git a/phps-mode-indent.el b/phps-mode-indent.el
index 0977a1a38f..f7becc516d 100644
--- a/phps-mode-indent.el
+++ b/phps-mode-indent.el
@@ -885,7 +885,6 @@
   new-indentation
   tab-width)))
 
-   ;; TODO Add :: as well
;; LINE CONTINUING CHAINING OBJECT OPERATORS
;; $myObject->myFunction()
;; ->myFunction2()
@@ -905,7 +904,6 @@
  'line-continuing-object-operators)
 (let ((not-found t)
   (started-chaining-on-this-line t)
-  (is-assignment)
   (is-string-concatenation)
   (is-bracket-less-command)
   (is-same-line-p t))
@@ -961,9 +959,6 @@
((string=
  "="
  match)
-(setq
- is-assignment
- t)
 (setq
  not-found
  nil))
@@ -981,7 +976,6 @@
)))
 
   (when (and
- (not is-assignment)
  (not is-string-concatenation)
  (not started-chaining-on-this-line)
  (not is-bracket-less-command))
diff --git a/phps-mode-macros.el b/phps-mode-macros.el
index c3cffb5e82..bad8a8a2ca 100644
--- a/phps-mode-macros.el
+++ b/phps-mode-macros.el
@@ -12,10 +12,10 @@
   nil
   "Debug messages during macro expansion time, default nil.")
 
-(defmacro phps-mode-debug-message (&rest message)
-  "Display debug MESSAGE when debug flag is on."
+(defmacro phps-mode-debug-message (&rest code)
+  "Run CODE only when debug flag is on."
   `(when ,phps-mode-macrotime-debug
-,@message))
+,@code))
 
 (provide 'phps-mode-macros)
 ;;; phps-mode-macros.el ends here
diff --git a/test/phps-mode-test-indent.el b/test/phps-mode-test-indent.el
index 4152c9d414..3a1c40b5b7 100644
--- a/test/phps-mode-test-indent.el
+++ b/test/phps-mode-test-indent.el
@@ -668,7 +668,6 @@
"myMethod()\n->myMethod2();\necho 'here';"
"Line after assignment were an chaining of object methods started")

[elpa] externals/phps-mode updated (5ae4886f14 -> 73c4106bbf)

[Christian Johansson]

cjohansson pushed a change to branch externals/phps-mode.

  from  5ae4886f14 Updated docs and version
   new  61e73b1ce0 Added indent todo items
   new  c884caf642 Merge branch 'master' of 
git.cvj.se:/home/git/emacs-phps-mode
   new  1eb1866f96 Removed obsolete docs
   new  6b33c7f4d9 Removed obsolete information in README
   new  83b0220d5b Added new failing indent tests
   new  463ceedbbb Passing new indent test for line after commented out 
assignment
   new  f2520450c8 Indentation improved for multi-line chained object 
method calls
   new  73c4106bbf Updated readme and version


Summary of changes:
 README.md |  15 +---
 TODO.md   |   5 --
 docs/development.md   |  71 -
 docs/heuristics.md|  22 --
 docs/imenu.md |  24 --
 docs/indentation.md   | 176 --
 phps-mode-indent.el   |  19 +++--
 phps-mode-macros.el   |   6 +-
 phps-mode.el  |   9 +--
 test/phps-mode-test-indent.el |  12 +++
 10 files changed, 36 insertions(+), 323 deletions(-)
 delete mode 100644 docs/development.md
 delete mode 100644 docs/heuristics.md
 delete mode 100644 docs/imenu.md
 delete mode 100644 docs/indentation.md

[elpa] externals/phps-mode 6b33c7f4d9 4/8: Removed obsolete information in README

[Christian Johansson]

branch: externals/phps-mode
commit 6b33c7f4d9d31d6a6c8ead26cc1bd339bbb7d76e
Author: Christian Johansson 
Commit: Christian Johansson 

Removed obsolete information in README
---
 README.md | 16 +---
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 58f94d6283..4c93672be3 100644
--- a/README.md
+++ b/README.md
@@ -13,11 +13,12 @@ This mode does not require PHP installed on your computer 
because it has a built
 * Flycheck support with `(phps-mode-flycheck-setup)`
 * Lexer based on official PHP 8.0 re2c lexer
 * Syntax coloring based on lexer tokens, makes it easier to spot invalid code
-* PSR-1, PSR-2 and PSR-12 indentation based on lexer tokens
+* PSR-1, PSR-2 and PSR-12 indentation
 * PSR-1, PSR-2 and PSR-12 supported white-space
+* Support for indentation of HTML and XML
 * Integration with `(electric-pair)`
 * Incremental lexer and syntax coloring after buffer changes
-* Incremental indentation and imenu generation after buffer changes
+* Incremental parser, imenu and bookkeeping generation after buffer changes
 * Supports `(comment-region)` and `(uncomment-region)`
 * Support indentation for inline-html areas
 * Imenu support
@@ -25,15 +26,15 @@ This mode does not require PHP installed on your computer 
because it has a built
 * Tested using unit tests and integration tests
 * Continuous integration tests using Travis
 * Included in GNU ELPA package archive
-* A interactive function that can be used interactively to format buffers 
`(phps-mode-format-buffer)`
 * Support for asynchronous lexer via processes (`async.el`) or threads
 * Mode-line asynchronous status
 * Bookkeeping in lexical-analysis, showing defined and undefined variables via 
syntax coloring (requires a theme that has distinct colors for 
'font-lock-warning-face and 'font-lock-variable-name-face)
 * Canonical LR(1) Parser automatically generated from official PHP 8.0 LALR(1) 
YACC grammar
+* 
 
 ## Issues and roadmap
 
-See [Development](docs/TODO.md)
+See [TODO.md](docs/TODO.md)
 
 ## Keymap
 
@@ -115,10 +116,3 @@ Enable with:
 (phps-mode-flycheck-setup)
 (setq phps-mode-async-process nil)
 ```
-
-## Read more
-
-* [Development](docs/development.md)
-* [Heuristics](docs/heuristics.md)
-* [Indentation algorithm](docs/indentation.md)
-* [Imenu algorithm](docs/imenu.md)

[nongnu] elpa/geiser c811ed77d4: Version bump

[ELPA Syncer]

branch: elpa/geiser
commit c811ed77d45a61ea3888de9858e89e1cb883de35
Author: jao 
Commit: jao 

Version bump
---
 elisp/geiser.el | 4 ++--
 news.org| 8 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/elisp/geiser.el b/elisp/geiser.el
index 1882b5caf2..c0b1499037 100644
--- a/elisp/geiser.el
+++ b/elisp/geiser.el
@@ -1,6 +1,6 @@
 ;;; geiser.el --- GNU Emacs and Scheme talk to each other -*- lexical-binding: 
t; -*-
 
-;; Copyright (C) 2009, 2010, 2011, 2012, 2013, 2015, 2018, 2021 Jose Antonio 
Ortega Ruiz
+;; Copyright (C) 2009, 2010, 2011, 2012, 2013, 2015, 2018, 2021, 2022 Jose 
Antonio Ortega Ruiz
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the Modified BSD License. You should
@@ -13,7 +13,7 @@
 ;; Homepage: https://gitlab.com/emacs-geiser/
 ;; Package-Requires: ((emacs "25.1") (transient "0.3"))
 ;; SPDX-License-Identifier: BSD-3-Clause
-;; Version: 0.22
+;; Version: 0.22.1
 
 ;;; Commentary:
 
diff --git a/news.org b/news.org
index decd20741d..cd35c647d5 100644
--- a/news.org
+++ b/news.org
@@ -1,11 +1,17 @@
-* Version 0.22.1
+* Version 0.22.1 (January, 2022)
+
   - Fix for C-u C-x C-e (in-buffer printing of evaluated expression)
   - Fix for project functions other than project-current
+
 * Version 0.22 (December, 2021)
+
   - New functions geiser-wait-eval and geiser-eval-region/wait for
 synchronous clients like ob-scheme.
+
 * Version 0.21 (December, 2021)
+
   - Asynchronous, interruptible evaluation and compilation
+
 * Version 0.20 (December, 2021)
 
   - Improved support for debugging sessions (for implementations

[nongnu] elpa/geiser updated (c811ed77d4 -> d89fb1f66e)

[ELPA Syncer]

elpasync pushed a change to branch elpa/geiser.

  from  c811ed77d4 Version bump
   new  e79a99d116 .gitignore for autoloads and pkg file (Stefan Monnier)
   new  8e582fa644 geiser-custom: indent as declaration, lexical binding 
(Stefan Monnier)
   new  d89fb1f66e geiser-impl: linting and lexical binding (Stefan Monnier)


Summary of changes:
 .gitignore |  3 +++
 elisp/geiser-custom.el | 16 ++--
 elisp/geiser-impl.el   | 37 ++---
 3 files changed, 27 insertions(+), 29 deletions(-)

[nongnu] elpa/geiser d89fb1f66e 3/3: geiser-impl: linting and lexical binding (Stefan Monnier)

[ELPA Syncer]

branch: elpa/geiser
commit d89fb1f66e125973c1596ad5cb00a46ea7ce9c52
Author: jao 
Commit: jao 

geiser-impl: linting and lexical binding (Stefan Monnier)
---
 elisp/geiser-impl.el | 37 ++---
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/elisp/geiser-impl.el b/elisp/geiser-impl.el
index c1dc065422..a867da97e8 100644
--- a/elisp/geiser-impl.el
+++ b/elisp/geiser-impl.el
@@ -1,4 +1,4 @@
-;;; geiser-impl.el -- generic support for scheme implementations
+;;; geiser-impl.el -- generic support for scheme implementations  -*- 
lexical-binding: t; -*-
 
 ;; Copyright (C) 2009, 2010, 2012, 2013, 2015, 2016, 2019, 2021 Jose Antonio 
Ortega Ruiz
 
@@ -26,13 +26,11 @@
 
 (geiser-custom--defcustom geiser-default-implementation nil
   "Symbol naming the default Scheme implementation."
-  :type 'symbol
-  :group 'geiser-implementation)
+  :type 'symbol)
 
 (geiser-custom--defcustom geiser-active-implementations ()
   "List of active installed Scheme implementations."
-  :type '(repeat symbol)
-  :group 'geiser-implementation)
+  :type '(repeat symbol))
 
 (geiser-custom--defcustom geiser-implementations-alist nil
   "A map from regular expressions or directories to implementations.
@@ -43,8 +41,7 @@ in order to determine its scheme flavour."
   (const regexp) regexp)
(group :tag "Directory"
   (const dir) directory))
-   symbol))
-  :group 'geiser-implementation)
+   symbol)))
 
 
 ;;; Implementation registry:
@@ -81,7 +78,7 @@ in order to determine its scheme flavour."
 (cadr (assq method (geiser-impl--methods impl)
 
 (defun geiser-impl--default-method (method)
-  (cadr (assoc method (mapcar 'cdr geiser-impl--local-methods
+  (cadr (assoc method (mapcar #'cdr geiser-impl--local-methods
 
 (defun geiser-impl--call-method (method impl &rest args)
   (let ((fun (or (geiser-impl--method method impl)
@@ -99,7 +96,7 @@ in order to determine its scheme flavour."
 (put method 'function-documentation doc)))
 
 (defun geiser-implementation-help ()
-  "Shows a buffer with help on defining new supported Schemes."
+  "Show a buffer with help on defining new supported Schemes."
   (interactive)
   (help-setup-xref (list #'geiser-implementation-help) t)
   (save-excursion
@@ -160,11 +157,13 @@ in order to determine its scheme flavour."
   (when (and (listp m)
  (= 2 (length m))
  (symbolp (car m)))
-(if (functionp (cadr m)) m
-  `(,(car m) (lambda (&rest args) ,(cadr m))
+(let ((v (cadr m)))
+  (if (functionp v) m
+`(,(car m)
+  ,(lambda (&rest _) v))
 
 (defun geiser-impl--define (file name parent methods)
-  (let* ((methods (mapcar 'geiser-impl--normalize-method methods))
+  (let* ((methods (mapcar #'geiser-impl--normalize-method methods))
  (methods (delq nil methods))
  (inherited-methods (and parent (geiser-impl--methods parent)))
  (methods (append methods
@@ -174,7 +173,7 @@ in order to determine its scheme flavour."
 (geiser-impl--register file name methods)))
 
 (defmacro define-geiser-implementation (name &rest methods)
-  "Defines a new supported Scheme implementation.
+  "Define a new supported Scheme implementation.
 NAME can be either an unquoted symbol naming the implementation,
 or a two-element list (NAME PARENT), with PARENT naming another
 registered implementation from which to borrow methods not
@@ -240,16 +239,15 @@ switcher (switch-to-NAME), and provides geiser-NAME."
 
 (defun geiser-implementation-extension (impl ext)
   "Add to `geiser-implementations-alist' an entry for extension EXT."
-  (geiser-impl--add-to-alist 'regexp (format "\\.%s$" ext) impl t))
+  (geiser-impl--add-to-alist 'regexp (format "\\.%s\\'" ext) impl t))
 
 
 ;;; Trying to guess the scheme implementation:
 
 (defvar-local geiser-scheme-implementation nil
-  "Set this buffer local variable to specify the Scheme
-implementation to be used by Geiser.")
+  "The Scheme implementation to be used by Geiser.")
 
-(put 'geiser-scheme-implementation 'safe-local-variable 'symbolp)
+(put 'geiser-scheme-implementation 'safe-local-variable #'symbolp)
 
 (defun geiser-impl--match-impl (desc bn)
   (let ((rx (if (eq (car desc) 'regexp)
@@ -261,7 +259,7 @@ implementation to be used by Geiser.")
 
 (defun geiser-impl--read-impl (&optional prompt impls non-req)
   (let* ((impls (or impls geiser-active-implementations))
- (impls (mapcar 'symbol-name impls))
+ (impls (mapcar #'symbol-name impls))
  (prompt (or prompt "Scheme implementation: ")))
 (intern (completing-read prompt impls nil (not non-req) nil
  geiser-impl--impl-prompt-history
@@ -319,6 +317,7 @@ buffer contains Scheme code of the given implementation.")
  (geiser-impl--registered-value impl (nth 1 m) (nth 2 m)))
 
 (def

[nongnu] elpa/geiser e79a99d116 1/3: .gitignore for autoloads and pkg file (Stefan Monnier)

[ELPA Syncer]

branch: elpa/geiser
commit e79a99d116ab150b1054504731424176fa97bfcc
Author: jao 
Commit: jao 

.gitignore for autoloads and pkg file (Stefan Monnier)
---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 27904a1d91..b501c68e21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,6 @@ Makefile.in
 /scheme/mit/geiser/geiser-w32.fre
 /scheme/mit/geiser/geiser-w32.pkd
 /doc/html
+/geiser-autoloads.el
+/elisp/geiser-autoloads.el
+/geiser-pkg.el

[nongnu] elpa/geiser 8e582fa644 2/3: geiser-custom: indent as declaration, lexical binding (Stefan Monnier)

[ELPA Syncer]

branch: elpa/geiser
commit 8e582fa644b3ad0391a0c493ad6e2faaf677347a
Author: jao 
Commit: jao 

geiser-custom: indent as declaration, lexical binding (Stefan Monnier)
---
 elisp/geiser-custom.el | 16 ++--
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/elisp/geiser-custom.el b/elisp/geiser-custom.el
index 8095863251..2b8a202198 100644
--- a/elisp/geiser-custom.el
+++ b/elisp/geiser-custom.el
@@ -1,4 +1,4 @@
-;;; geiser-custom.el -- customization utilities
+;;; geiser-custom.el -- customization utilities  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2009, 2010, 2012 Jose Antonio Ortega Ruiz
 
@@ -31,22 +31,21 @@
   :group 'faces)
 
 (defmacro geiser-custom--defface (face def group doc)
-  (declare (doc-string 4))
+  (declare (doc-string 4) (indent 1))
   (let ((face (intern (format "geiser-font-lock-%s" face
 `(defface ,face (face-default-spec ,def)
,(format "Face for %s." doc)
:group ',group
:group 'geiser-faces)))
-
-(put 'geiser-custom--defface 'lisp-indent-function 1)
-
-
 
 ;;; Reload support:
 
 (defvar geiser-custom--memoized-vars nil)
 
 (defun geiser-custom--memoize (name)
+  ;; FIXME: Why not build this list with mapatoms, filtering on a "\\`'geiser-"
+  ;; prefix and checking that it's a `defcustom', so we don't need
+  ;; `geiser-custom--defcustom'?
   (add-to-list 'geiser-custom--memoized-vars name))
 
 (defmacro geiser-custom--defcustom (name &rest body)
@@ -56,7 +55,7 @@ of the listed variables.  It is not used for anything else."
   ;; FIXME Remembering the value like this is not actually
   ;; necessary.  Evaluting `defcustom' always preserves the
   ;; existing value, if any.
-  (declare (doc-string 3) (debug (name body)))
+  (declare (doc-string 3) (debug (name body)) (indent 2))
   `(progn
  (geiser-custom--memoize ',name)
  (defcustom ,name ,@body)))
@@ -67,9 +66,6 @@ of the listed variables.  It is not used for anything else."
   (when (boundp name)
 (push (cons name (symbol-value name)) result)
 
-
-(put 'geiser-custom--defcustom 'lisp-indent-function 2)
-
 
 (defconst geiser-custom-font-lock-keywords
   (eval-when-compile

[elpa] externals/mct 90ee22928e 2/2: Merge branch 'make-keyboard-quit-completion-region' into 'main'

[ELPA Syncer]

branch: externals/mct
commit 90ee22928e79dd446edc8b61c4b9ff17833ba18e
Merge: d69b7ffcb4 7059d07480
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Merge branch 'make-keyboard-quit-completion-region' into 'main'

Make mct-keyboard-quit-dwim work with mct-region-mode

See merge request protesilaos/mct!5
---
 mct.el | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mct.el b/mct.el
index 1784504fb3..586cf44f5f 100644
--- a/mct.el
+++ b/mct.el
@@ -900,9 +900,11 @@ If the region is active, deactivate it.  A second 
invocation of
 this command is then required to abort the session."
   (interactive nil mct-minibuffer-mode)
   (when (derived-mode-p 'completion-list-mode)
-(if (use-region-p)
-(keyboard-quit)
-  (abort-recursive-edit
+(cond
+ ((null (active-minibuffer-window))
+  (minibuffer-hide-completions))
+ ((use-region-p) (keyboard-quit))
+ (t (abort-recursive-edit)
 
  Global minor mode setup
 

[elpa] externals/mct 7059d07480 1/2: Make mct-keyboard-quit-dwim work with mct-region-mode

[ELPA Syncer]

branch: externals/mct
commit 7059d07480d8f051c8d5ebf03db1587ebfef47f2
Author: James N. V. Cash 
Commit: James N. V. Cash 

Make mct-keyboard-quit-dwim work with mct-region-mode

Otherwise, if the point is in the completions buffer from
completion-at-point, C-g doesn't quit, instead just saying "no
recursive edit in progress"
---
 mct.el | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mct.el b/mct.el
index 1784504fb3..586cf44f5f 100644
--- a/mct.el
+++ b/mct.el
@@ -900,9 +900,11 @@ If the region is active, deactivate it.  A second 
invocation of
 this command is then required to abort the session."
   (interactive nil mct-minibuffer-mode)
   (when (derived-mode-p 'completion-list-mode)
-(if (use-region-p)
-(keyboard-quit)
-  (abort-recursive-edit
+(cond
+ ((null (active-minibuffer-window))
+  (minibuffer-hide-completions))
+ ((use-region-p) (keyboard-quit))
+ (t (abort-recursive-edit)
 
  Global minor mode setup
 

[elpa] externals/mct 872732ac63 1/4: Fix cycling when candidates have spaces/newlines

[ELPA Syncer]

branch: externals/mct
commit 872732ac636fe23ea30567b53c9b18f30543ff58
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Fix cycling when candidates have spaces/newlines

Thanks to Tomasz Hołubowicz for reporting the bug in issue 2 over at the
GitHub mirror: .
---
 mct.el | 26 +++---
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/mct.el b/mct.el
index 586cf44f5f..6e1698a203 100644
--- a/mct.el
+++ b/mct.el
@@ -524,6 +524,12 @@ by `mct-completion-windows-regexp'."
 (or (get-text-property point 'completion--string)
 (get-text-property point 'mouse-face
 
+(defun mct--arg-completion-point-p (arg)
+  "Return non-nil if ARGth next completion exists."
+  (save-excursion
+(mct--next-completion arg)
+(mct--completions-completion-p)))
+
 (defun mct--first-completion-point ()
   "Return the `point' of the first completion."
   (save-excursion
@@ -596,6 +602,16 @@ a `one-column' value."
(truncate (/ (window-body-height) 4.0
t))
 
+(defun mct--empty-line-p (arg)
+  "Return non-nil if ARGth line is empty."
+  (unless (mct--arg-completion-point-p arg)
+(save-excursion
+  (goto-char (point-at-bol))
+  (and (not (bobp))
+  (or (beginning-of-line (1+ arg)) t)
+  (save-match-data
+(looking-at "[\s\t]*$"))
+
 (defun mct--bottom-of-completions-p (arg)
   "Test if point is at the notional bottom of the Completions.
 ARG is a numeric argument for `next-completion', as described in
@@ -603,13 +619,9 @@ ARG is a numeric argument for `next-completion', as 
described in
   (or (eobp)
   (mct--completions-line-boundary (mct--last-completion-point))
   (= (save-excursion (next-completion arg) (point)) (point-max))
-  ;; The empty final line case...
-  (save-excursion
-(goto-char (point-at-bol))
-(and (not (bobp))
-(or (beginning-of-line (1+ arg)) t)
-(save-match-data
-  (looking-at "[\s\t]*$"))
+  ;; The empty final line case which should avoid candidates with
+  ;; spaces or line breaks...
+  (mct--empty-line-p arg
 
 (defun mct--next-completion (arg)
   "Routine to move to the next ARGth completion candidate."

[elpa] main updated (3106ebd0bc -> 5bea40cd16)

[Stefan Kangas]

skangas pushed a change to branch main.

  from  3106ebd0bc * elpa-packages (ace-window): Auto-sync
   new  f0503bab8b * elpa-packages (eglot): Remove travis.yml from 
:ignored-files.
   new  5bea40cd16 * elpa-packages (diminish): New package


Summary of changes:
 elpa-packages | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

[elpa] main f0503bab8b 1/2: * elpa-packages (eglot): Remove travis.yml from :ignored-files.

[Stefan Kangas]

branch: main
commit f0503bab8bd10ba6114ebd0ea40b9504f9e3
Author: Stefan Kangas 
Commit: Stefan Kangas 

* elpa-packages (eglot): Remove travis.yml from :ignored-files.
---
 elpa-packages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/elpa-packages b/elpa-packages
index 60e732159b..68376d813e 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -173,7 +173,7 @@
   :branch "UTF-8" :auto-sync t)
  ("eglot"   :url "https://github.com/joaotavora/eglot.git";
   :news "NEWS.md"
-  :ignored-files (".github" ".travis.yml" "LICENSE" "gif-examples")
+  :ignored-files (".github" "LICENSE" "gif-examples")
   :auto-sync t)
  ("el-search"  :url nil)
  ("eldoc"  :core "lisp/emacs-lisp/eldoc.el")

[elpa] externals/mct updated (90ee22928e -> 40cf0994bd)

[ELPA Syncer]

elpasync pushed a change to branch externals/mct.

  from  90ee22928e Merge branch 'make-keyboard-quit-completion-region' into 
'main'
   new  872732ac63 Fix cycling when candidates have spaces/newlines
   new  e639a9fa60 Remove trailing delimiter (from commit 872732a)
   new  cf6f9acef4 Fix typo in comment
   new  40cf0994bd Rename internal function for clarity


Summary of changes:
 mct.el | 42 +++---
 1 file changed, 27 insertions(+), 15 deletions(-)

[elpa] externals/mct cf6f9acef4 3/4: Fix typo in comment

[ELPA Syncer]

branch: externals/mct
commit cf6f9acef44221330f2c6419817486ff5a243704
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Fix typo in comment
---
 mct.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mct.el b/mct.el
index 522e8d1725..cdde0b2c67 100644
--- a/mct.el
+++ b/mct.el
@@ -519,7 +519,7 @@ by `mct-completion-windows-regexp'."
 (defun mct--completions-completion-p ()
   "Return non-nil if there is a completion at point."
   (let ((point (point)))
-;; The `or' is for Emacs 27 where there were no completion--string
+;; The `or' is for Emacs 27 where there are no completion--string
 ;; properties.
 (or (get-text-property point 'completion--string)
 (get-text-property point 'mouse-face

[elpa] externals/mct 40cf0994bd 4/4: Rename internal function for clarity

[ELPA Syncer]

branch: externals/mct
commit 40cf0994bdfbb0f2b0ac12ab0f0137c293723d6e
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Rename internal function for clarity
---
 mct.el | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/mct.el b/mct.el
index cdde0b2c67..1f6c4fd778 100644
--- a/mct.el
+++ b/mct.el
@@ -516,7 +516,7 @@ by `mct-completion-windows-regexp'."
 
 ; Cyclic motions between minibuffer and completions' buffer
 
-(defun mct--completions-completion-p ()
+(defun mct--completion-at-point-p ()
   "Return non-nil if there is a completion at point."
   (let ((point (point)))
 ;; The `or' is for Emacs 27 where there are no completion--string
@@ -528,7 +528,7 @@ by `mct-completion-windows-regexp'."
   "Return non-nil if ARGth next completion exists."
   (save-excursion
 (mct--next-completion arg)
-(mct--completions-completion-p)))
+(mct--completion-at-point-p)))
 
 (defun mct--first-completion-point ()
   "Return the `point' of the first completion."
@@ -559,7 +559,7 @@ a `one-column' value."
   "Check if ARGth line has a completion candidate."
   (save-excursion
 (vertical-motion arg)
-(null (mct--completions-completion-p
+(null (mct--completion-at-point-p
 
 (defun mct--switch-to-completions ()
   "Subroutine for switching to the completions' buffer."
@@ -593,7 +593,7 @@ a `one-column' value."
   (goto-char (point-max))
   (next-completion -1)
   (goto-char (point-at-bol))
-  (unless (mct--completions-completion-p)
+  (unless (mct--completion-at-point-p)
 (next-completion 1))
   (mct--restore-old-point-in-grid (point))
   (recenter
@@ -640,7 +640,7 @@ ARG is a numeric argument for `next-completion', as 
described in
 (unless (eq col (save-excursion (goto-char (point-at-bol)) 
(current-column)))
   (line-move-to-column col))
 (when (or (> (current-column) col)
-  (not (mct--completions-completion-p)))
+  (not (mct--completion-at-point-p)))
   (next-completion -1)))
 (next-completion (or arg 1
 
@@ -691,7 +691,7 @@ ARG is a numeric argument for `previous-completion', as 
described in
 (unless (eq col (save-excursion (goto-char (point-at-bol)) 
(current-column)))
   (line-move-to-column col))
 (when (or (> (current-column) col)
-  (not (mct--completions-completion-p)))
+  (not (mct--completion-at-point-p)))
   (next-completion -1)))
 (previous-completion (or (abs arg) 1
 
@@ -988,7 +988,7 @@ region.")
 ;; clicking on it with the mouse.
 (defun mct--completions-completion-beg ()
   "Return point of completion candidate at START and END."
-  (if-let ((string (mct--completions-completion-p)))
+  (if-let ((string (mct--completion-at-point-p)))
   (save-excursion
 (prop-match-beginning (mct--completions-text-property-search)))
 (point)))
@@ -996,7 +996,7 @@ region.")
 ;; Same as above for the `if-let'.
 (defun mct--completions-completion-end ()
   "Return end of completion candidate."
-  (if-let ((string (mct--completions-completion-p)))
+  (if-let ((string (mct--completion-at-point-p)))
   (save-excursion
 (if (mct--one-column-p)
 (1+ (point-at-eol))

[elpa] externals/mct e639a9fa60 2/4: Remove trailing delimiter (from commit 872732a)

[ELPA Syncer]

branch: externals/mct
commit e639a9fa6093844d9a24abad355e93e23224aa91
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Remove trailing delimiter (from commit 872732a)
---
 mct.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mct.el b/mct.el
index 6e1698a203..522e8d1725 100644
--- a/mct.el
+++ b/mct.el
@@ -621,7 +621,7 @@ ARG is a numeric argument for `next-completion', as 
described in
   (= (save-excursion (next-completion arg) (point)) (point-max))
   ;; The empty final line case which should avoid candidates with
   ;; spaces or line breaks...
-  (mct--empty-line-p arg
+  (mct--empty-line-p arg)))
 
 (defun mct--next-completion (arg)
   "Routine to move to the next ARGth completion candidate."

[elpa] main 5bea40cd16 2/2: * elpa-packages (diminish): New package

[Stefan Kangas]

branch: main
commit 5bea40cd16bf56abf9b956c5b691f74f8a7cd49c
Author: Stefan Kangas 
Commit: Stefan Kangas 

* elpa-packages (diminish): New package
---
 elpa-packages | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/elpa-packages b/elpa-packages
index 68376d813e..f72b8e4648 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -151,6 +151,9 @@
  ("diff-hl"
   :url "https://github.com/dgutov/diff-hl.git";
   :auto-sync t)
+ ("diminish":url "https://github.com/myrjola/diminish.el.git";
+  :ignored-files ("LICENSE")
+  :auto-sync t)
  ("dired-du"   :url nil)
  ("dired-git-info" :url "https://github.com/clemera/dired-git-info";)
  ("disk-usage" :url "https://gitlab.com/ambrevar/emacs-disk-usage";)

[elpa] branch externals/diminish created (now fd486ef76e)

[ELPA Syncer]

elpasync pushed a change to branch externals/diminish.

at  fd486ef76e Update license to GPLv3

This branch includes the following new commits:

   new  9e648b64d9 Initial commit
   new  0352a1e9db Import diminish.el from original source
   new  84157483fb Update README.md
   new  0970f83e97 Don't error out when a lighter is not defined
   new  d8ec15be09 Merge pull request #1 from myrjola/fix-no-lighter
   new  1645182ff3 Add Martin Yrjölä as maintainer
   new  a76b409b05 Fix flycheck warning
   new  b3bab66cf0 Change URL to the official repository
   new  0211de96b7 Bump version to 0.45
   new  18d9730f48 Update GPL preamble
   new  01c225bfdd Add MELPA badge
   new  826e19186b Add MELPA-stable badge
   new  d5c61a14e1 allow to diminish to :eval expressions
   new  565a983a39 [ci skip] Fix use-package link in README
   new  8bed521dbd Replace deprecated 'cl package by 'cl-lib
   new  e534fa043a Revert "Replace deprecated 'cl package by 'cl-lib"
   new  96b47cf903 Replace cl with cl-lib (Fix #8)
   new  6ec6ebc391 add more usage
   new  ad50994e5a Add .gitignore
   new  66b3902401 Bump version to 0.46
   new  f181677c67 Minor doc fix; quote symbol
   new  fd486ef76e Update license to GPLv3

[elpa] externals/diminish 18d9730f48 10/22: Update GPL preamble

[ELPA Syncer]

branch: externals/diminish
commit 18d9730f48f1f775b38ec8390cc644bc3f3d8de5
Author: Martin Yrjölä 
Commit: Martin Yrjölä 

Update GPL preamble

Change address and remove the statements about diminish.el being part of
GNU Emacs.
---
 diminish.el | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/diminish.el b/diminish.el
index 6c1c8600b7..2954114a9d 100644
--- a/diminish.el
+++ b/diminish.el
@@ -9,8 +9,6 @@
 ;; Version: 0.45
 ;; Keywords: extensions, diminish, minor, codeprose
 
-;; 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 2, or (at your option)
@@ -21,10 +19,10 @@
 ;; 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 GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; You should have received a copy of the GNU General Public License along with
+;; this program; see the file LICENSE. If not, write to the write to the Free
+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+;; 02110-1301, USA.
 
 ;;; Commentary:
 

[elpa] externals/diminish 8bed521dbd 15/22: Replace deprecated 'cl package by 'cl-lib

[ELPA Syncer]

branch: externals/diminish
commit 8bed521dbd10c009ca76f5efbf95966fc186465f
Author: Thomas Hisch 
Commit: Martin Yrjölä 

Replace deprecated 'cl package by 'cl-lib
---
 diminish.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diminish.el b/diminish.el
index 6aa45e4c89..14805ea0f9 100644
--- a/diminish.el
+++ b/diminish.el
@@ -105,7 +105,7 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))
 
 (defvar diminish-must-not-copy-minor-mode-alist nil
   "Non-nil means loading diminish.el won't (copy-alist minor-mode-alist).

[elpa] externals/diminish 826e19186b 12/22: Add MELPA-stable badge

[ELPA Syncer]

branch: externals/diminish
commit 826e19186bef91d2241739cb8b48b8cfba14c17a
Author: Martin Yrjölä 
Commit: Martin Yrjölä 

Add MELPA-stable badge
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index f8e0c514a1..7965b36116 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
 
[![MELPA](https://melpa.org/packages/diminish-badge.svg)](https://melpa.org/#/diminish)
+[![MELPA 
Stable](http://stable.melpa.org/packages/diminish-badge.svg)](http://stable.melpa.org/#/diminish)
 
 # diminish.el
 

[elpa] externals/diminish 01c225bfdd 11/22: Add MELPA badge

[ELPA Syncer]

branch: externals/diminish
commit 01c225bfdd9136fc64c403c10e530b3223d38b1e
Author: Martin Yrjölä 
Commit: Martin Yrjölä 

Add MELPA badge
---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 4080b41bec..f8e0c514a1 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+[![MELPA](https://melpa.org/packages/diminish-badge.svg)](https://melpa.org/#/diminish)
+
 # diminish.el
 
 Introduction

[elpa] externals/diminish 66b3902401 20/22: Bump version to 0.46

[ELPA Syncer]

branch: externals/diminish
commit 66b3902401059d161424b1b8d0abc3cb0a7d6df0
Author: Stefan Kangas 
Commit: Martin Yrjölä 

Bump version to 0.46
---
 diminish.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diminish.el b/diminish.el
index bb5731d7ed..5da0d27e80 100644
--- a/diminish.el
+++ b/diminish.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Martin Yrjölä 
 ;; URL: https://github.com/myrjola/diminish.el
 ;; Created: Th 19 Feb 98
-;; Version: 0.45
+;; Version: 0.46
 ;; Package-Requires: ((emacs "24.3"))
 ;; Keywords: extensions, diminish, minor, codeprose
 

[elpa] externals/diminish b3bab66cf0 08/22: Change URL to the official repository

[ELPA Syncer]

branch: externals/diminish
commit b3bab66cf0570a6b831a6b40e8c3dc89b198fa69
Author: Martin Yrjölä 
Commit: Martin Yrjölä 

Change URL to the official repository
---
 diminish.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diminish.el b/diminish.el
index 988a621d3b..209e11c49d 100644
--- a/diminish.el
+++ b/diminish.el
@@ -4,7 +4,7 @@
 
 ;; Author: Will Mengarini 
 ;; Maintainer: Martin Yrjölä 
-;; URL: 
+;; URL: 
 ;; Created: Th 19 Feb 98
 ;; Version: 0.44, Sa 23 Jan 99
 ;; Keywords: extensions, diminish, minor, codeprose

[elpa] externals/eev e500a22059: Added `find-advicebefore-links'.

[ELPA Syncer]

branch: externals/eev
commit e500a22059b7650d8d772b3423f634acc0f14dc5
Author: Eduardo Ochs 
Commit: Eduardo Ochs 

Added `find-advicebefore-links'.
---
 ChangeLog |  4 
 VERSION   |  4 ++--
 eev-tlinks.el | 44 +++-
 3 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 59481bd49d..f39cd6e5b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2022-01-28  Eduardo Ochs  
+
+   * eev-tlinks.el (find-advicebefore-links): new function.
+
 2022-01-26  Eduardo Ochs  
 
* eev-blinks.el (ee-shortdefp-maxlen-name)
diff --git a/VERSION b/VERSION
index 2791f18376..93a676a6fa 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-Thu Jan 27 04:37:42 GMT 2022
-Thu Jan 27 01:37:42 -03 2022
+Fri Jan 28 06:56:14 GMT 2022
+Fri Jan 28 03:56:15 -03 2022
diff --git a/eev-tlinks.el b/eev-tlinks.el
index 28199fc0ea..0c7592c994 100644
--- a/eev-tlinks.el
+++ b/eev-tlinks.el
@@ -19,7 +19,7 @@
 ;;
 ;; Author: Eduardo Ochs 
 ;; Maintainer: Eduardo Ochs 
-;; Version:20220118
+;; Version:20220128
 ;; Keywords:   e-scripts
 ;;
 ;; Latest version: 
@@ -114,6 +114,7 @@
 ;;   «.ee-use-red-bullets» (to "ee-use-red-bullets")
 ;; «.find-angg-es-links»   (to "find-angg-es-links")
 ;; «.find-1stclassvideo-links» (to "find-1stclassvideo-links")
+;; «.find-advicebefore-links»  (to "find-advicebefore-links")
 
 
 (require 'eev-env)
@@ -2819,6 +2820,47 @@ and: (find-video-links-intro \\\"7. \\\" 
\\\"find-eev-video\\\")
 
 
 
+;; «find-advicebefore-links»  (to ".find-advicebefore-links")
+;; Skel: (find-find-links-links-new "advicebefore" "fun" "")
+;; Test: (find-advicebefore-links)
+;;   (find-advicebefore-links "FOO")
+;;
+;; I wrote this when I was trying to learn edebug and I was failing
+;; miserably.
+;;
+(defun find-advicebefore-links (&optional fun &rest pos-spec-list)
+"Visit a temporary buffer containing code for adding advice to FUN.
+The temporary buffer will contain code for advice-add'ing a
+logging function to FUN, for advice-remove'ing the logging
+function, and for inspecting the log. See the demo to understand
+how this works."
+  (interactive)
+  (setq fun (or fun "{fun}"))
+  (apply
+   'find-elinks-elisp
+   `((find-advicebefore-links ,fun ,@pos-spec-list)
+ ;; Convention: the first sexp always regenerates the buffer.
+ (find-efunction 'find-advicebefore-links)
+ ";;"
+ ,(ee-template0 "\
+;; See: (find-elnode \"Advice Combinators\")
+;; Demo: http://angg.twu.net/elisp/find-advicebefore-links.el.html
+;;   http://angg.twu.net/elisp/find-advicebefore-links.el
+;; (find-wget \"http://angg.twu.net/elisp/find-advicebefore-links.el\";)
+
+(setq  ee-log nil)
+(defun ee-log (f r) (setq ee-log (cons (cons f r) ee-log)))
+(defun ee-log-{fun} (&rest r) (ee-log '{fun} r))
+(advice-add   '{fun}  :before 'ee-log-{fun})
+;;
+(advice-remove '{fun} 'ee-log-{fun})
+(find-2a nil '(find-eppp ee-log))
+")
+ )
+   pos-spec-list))
+
+
+
 
 
 

[elpa] externals/diminish d5c61a14e1 13/22: allow to diminish to :eval expressions

[ELPA Syncer]

branch: externals/diminish
commit d5c61a14e1a5590a65f83c099a5bd42fcadff24d
Author: DK 
Commit: Martin Yrjölä 

allow to diminish to :eval expressions
---
 diminish.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/diminish.el b/diminish.el
index 2954114a9d..6aa45e4c89 100644
--- a/diminish.el
+++ b/diminish.el
@@ -178,7 +178,8 @@ to TO-WHAT if it's > 1 char long & doesn't already begin 
with a space."
   (let ((minor (assq mode minor-mode-alist)))
 (when minor
 (progn (callf or to-what "")
-   (when (> (length to-what) 1)
+   (when (and (stringp to-what)
+  (> (length to-what) 1))
  (or (= (string-to-char to-what) ?\ )
  (callf2 concat " " to-what)))
(or (assq mode diminished-mode-alist)

[elpa] externals/diminish f181677c67 21/22: Minor doc fix; quote symbol

[ELPA Syncer]

branch: externals/diminish
commit f181677c67c0a264f9ef5cee005ef8f7f84f9fc2
Author: Stefan Kangas 
Commit: Martin Yrjölä 

Minor doc fix; quote symbol
---
 diminish.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diminish.el b/diminish.el
index 5da0d27e80..c9f0d0797a 100644
--- a/diminish.el
+++ b/diminish.el
@@ -165,7 +165,7 @@ The mode-line displays of minor modes usually begin with a 
space, so
 the modes' names appear as separate words on the mode line.  However, if
 you're having problems with a cramped mode line, you may choose to use single
 letters for some modes, without leading spaces.  Capitalizing them works
-best; if you then diminish some mode to \"X\" but have abbrev-mode enabled as
+best; if you then diminish some mode to \"X\" but have `abbrev-mode' enabled as
 well, you'll get a display like \"AbbrevX\".  This function prepends a space
 to TO-WHAT if it's > 1 char long & doesn't already begin with a space."
   (interactive (list (read (completing-read

[elpa] externals/diminish 96b47cf903 17/22: Replace cl with cl-lib (Fix #8)

[ELPA Syncer]

branch: externals/diminish
commit 96b47cf90360e4bd19138fe82dc59bfa86c7bf7d
Author: muffinmad 
Commit: Martin Yrjölä 

Replace cl with cl-lib (Fix #8)

1. Reuquire Emacs 24.3. According to package-lint:
```
You should depend on (emacs "24.3") or the cl-lib package if you need 
`cl-lib'.
```

2. `callf` and `callf2` replaced by `cl-callf` and `cl-callf2` accordingly.

3. Fixed package URL. package-lint again:
```
Package URLs should be a single HTTPS or HTTP URL.
```
---
 diminish.el | 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/diminish.el b/diminish.el
index 6aa45e4c89..bb5731d7ed 100644
--- a/diminish.el
+++ b/diminish.el
@@ -4,9 +4,10 @@
 
 ;; Author: Will Mengarini 
 ;; Maintainer: Martin Yrjölä 
-;; URL: 
+;; URL: https://github.com/myrjola/diminish.el
 ;; Created: Th 19 Feb 98
 ;; Version: 0.45
+;; Package-Requires: ((emacs "24.3"))
 ;; Keywords: extensions, diminish, minor, codeprose
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -105,7 +106,7 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))
 
 (defvar diminish-must-not-copy-minor-mode-alist nil
   "Non-nil means loading diminish.el won't (copy-alist minor-mode-alist).
@@ -116,7 +117,7 @@ try to diminish abbrev-mode under GNU Emacs 19.34, you'll 
get the error
 message \"Attempt to modify read-only object\".")
 
 (or diminish-must-not-copy-minor-mode-alist
-(callf copy-alist minor-mode-alist))
+(cl-callf copy-alist minor-mode-alist))
 
 (defvar diminished-mode-alist nil
   "The original `minor-mode-alist' value of all (diminish)ed modes.")
@@ -177,11 +178,11 @@ to TO-WHAT if it's > 1 char long & doesn't already begin 
with a space."
   nil nil nil 'diminish-history-names)))
   (let ((minor (assq mode minor-mode-alist)))
 (when minor
-(progn (callf or to-what "")
+(progn (cl-callf or to-what "")
(when (and (stringp to-what)
   (> (length to-what) 1))
  (or (= (string-to-char to-what) ?\ )
- (callf2 concat " " to-what)))
+ (cl-callf2 concat " " to-what)))
(or (assq mode diminished-mode-alist)
(push (copy-sequence minor) diminished-mode-alist))
(setcdr minor (list to-what))
@@ -223,7 +224,7 @@ the arg must be quoted as a symbol, as in (diminish-undo 
'diminished-modes)."
   (let ((diminished-modes diminished-mode-alist))
 (while diminished-modes
   (diminish-undo (caar diminished-modes))
-  (callf cdr diminished-modes)))
+  (cl-callf cdr diminished-modes)))
 (let ((minor  (assq mode  minor-mode-alist))
   (diminished (assq mode diminished-mode-alist)))
   (or minor
@@ -260,14 +261,14 @@ what diminished modes would be on the mode-line if they 
were still minor."
   (when (symbolp minor-name)
 ;; This minor mode uses symbol indirection in the cdr
 (let ((symbols-seen (list minor-name)))
-  (while (and (symbolp (callf symbol-value minor-name))
+  (while (and (symbolp (cl-callf symbol-value minor-name))
   (not (memq minor-name symbols-seen)))
 (push minor-name symbols-seen
   (push minor-name message)))
-  (callf cdr minor-modes))
+  (cl-callf cdr minor-modes))
 (setq message (mapconcat 'identity (nreverse message) ""))
 (when (= (string-to-char message) ?\ )
-  (callf substring message 1))
+  (cl-callf substring message 1))
 (message "%s" message)))
 
 ;; A human mind is a Black Forest of diminished modes.  Some are dangerous;

[elpa] externals/diminish 565a983a39 14/22: [ci skip] Fix use-package link in README

[ELPA Syncer]

branch: externals/diminish
commit 565a983a39d2e2cffab5df13b34f3b6116723208
Author: Tejas Bubane 
Commit: Martin Yrjölä 

[ci skip] Fix use-package link in README
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7965b36116..96b466ef6f 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ Quick start
 ```
 
 John Wiegley's
-[use-package](https://github.com/jwiegley/use-package#diminishing-minor-modes)
+[use-package](https://github.com/jwiegley/use-package#diminishing-and-delighting-minor-modes)
 macro also has support for diminish.el.
 
 Acknowledgments

[elpa] externals/eglot 0f352213fc: * README.md: Document copyright assignment requirement.

[ELPA Syncer]

branch: externals/eglot
commit 0f352213fcfa9f9e8406771fbc8629f2885e80ee
Author: Stefan Kangas 
Commit: Stefan Kangas 

* README.md: Document copyright assignment requirement.

This text was shamelessly copied from company-mode.
---
 README.md | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/README.md b/README.md
index 182c6d92f0..fe16e7e7b5 100644
--- a/README.md
+++ b/README.md
@@ -488,6 +488,15 @@ Under the hood:
   `markdown-mode`, if you happen to have these installed.
 - Has automated tests that check against actual LSP servers."
 
+# Copyright Assignment
+
+`Eglot` is subject to the same [copyright assignment][copyright-assignment]
+policy as `GNU Emacs`.
+
+Any [legally significant][legally-significant] contributions can only
+be merged after the author has completed their paperwork.  Please ask
+for the request form, and we'll send it to you.
+
 
 [ada_language_server]: https://github.com/AdaCore/ada_language_server
 [bash-language-server]: https://github.com/mads-hartmann/bash-language-server
@@ -543,3 +552,5 @@ Under the hood:
 [yasnippet]: https://elpa.gnu.org/packages/yasnippet.html
 [markdown]: https://github.com/defunkt/markdown-mode
 [gospb]: 
https://opensource.googleblog.com/2020/10/announcing-latest-google-open-source.html
+[copyright-assignment]: https://www.fsf.org/licensing/contributor-faq
+[legally-significant]: 
https://www.gnu.org/prep/maintain/html_node/Legally-Significant.html#Legally-Significant

[elpa] externals/mct 9832ddd8e5: Simplify mct-highlight-candidate face

[ELPA Syncer]

branch: externals/mct
commit 9832ddd8e5736792bb739b5cf190ac19831c73cb
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Simplify mct-highlight-candidate face

Let themes decide how best to style it.

Thanks to Tomasz Hołubowicz for the side note about this face in issue 1
over at the GitHub mirror: .
---
 mct.el | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/mct.el b/mct.el
index 1f6c4fd778..02b0e2e7b2 100644
--- a/mct.el
+++ b/mct.el
@@ -196,12 +196,7 @@ See `completions-format' for possible values."
   'mct-hl-line 'mct-highlight-candidate "0.3.0")
 
 (defface mct-highlight-candidate
-  '((default :extend t)
-(((class color) (min-colors 88) (background light))
- :background "#b0d8ff" :foreground "#00")
-(((class color) (min-colors 88) (background dark))
- :background "#103265" :foreground "#ff")
-(t :inherit highlight))
+  '((t :inherit highlight :extend t))
   "Face for current candidate in the completions' buffer."
   :group 'mct)
 

[elpa] externals/diminish 9e648b64d9 01/22: Initial commit

[ELPA Syncer]

branch: externals/diminish
commit 9e648b64d9803d2dbabe82a21e2501d22d1db240
Author: Martin Yrjölä 
Commit: Martin Yrjölä 

Initial commit
---
 LICENSE   | 340 ++
 README.md |   2 +
 2 files changed, 342 insertions(+)

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00..8cdb8451d9
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,340 @@
+GNU GENERAL PUBLIC LICENSE
+   Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., 
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act 

[elpa] externals/diminish 84157483fb 03/22: Update README.md

[ELPA Syncer]

branch: externals/diminish
commit 84157483fb7c31a5d5359aaa51d9b7aaea9b17cc
Author: Martin Yrjölä 
Commit: Martin Yrjölä 

Update README.md
---
 README.md | 37 -
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6e980e8a19..4080b41bec 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,37 @@
 # diminish.el
-Diminished modes are minor modes with no modeline display
+
+Introduction
+
+
+> When we diminish a mode, we are saying we want it to continue doing its
+> work for us, but we no longer want to be reminded of it.  It becomes a
+> night worker, like a janitor; it becomes an invisible man; it remains a
+> component, perhaps an important one, sometimes an indispensable one, of
+> the mechanism that maintains the day-people's world, but its place in
+> their thoughts is diminished, usually to nothing.  As we grow old we
+> diminish more and more such thoughts, such people, usually to nothing.
+>  -- Will Mengarini
+
+This package implements hiding or abbreviation of the mode line displays
+(lighters) of minor-modes.
+
+Quick start
+===
+
+```emacs-lisp
+(require 'diminish)
+;; Hide jiggle-mode lighter from mode line
+(diminish 'jiggle-mode)
+;; Replace abbrev-mode lighter with "Abv"
+(diminish 'abbrev-mode "Abv")
+```
+
+John Wiegley's
+[use-package](https://github.com/jwiegley/use-package#diminishing-minor-modes)
+macro also has support for diminish.el.
+
+Acknowledgments
+===
+
+diminish.el was created by Will Mengarini on 19th of February 1998 and is now
+maintained by [Martin Yrjölä](https://github.com/myrjola).

[elpa] externals/diminish 0970f83e97 04/22: Don't error out when a lighter is not defined

[ELPA Syncer]

branch: externals/diminish
commit 0970f83e97f867a4be2c2060ad90734f594f67b4
Author: Martin Yrjölä 
Commit: Martin Yrjölä 

Don't error out when a lighter is not defined
---
 diminish.el | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/diminish.el b/diminish.el
index 6461e12649..b4295297bb 100644
--- a/diminish.el
+++ b/diminish.el
@@ -177,14 +177,14 @@ to TO-WHAT if it's > 1 char long & doesn't already begin 
with a space."
   "To what mode-line display: "
   nil nil nil 'diminish-history-names)))
   (let ((minor (assq mode minor-mode-alist)))
-(or minor (error "%S is not currently registered as a minor mode" mode))
-(callf or to-what "")
-(when (> (length to-what) 1)
-  (or (= (string-to-char to-what) ?\ )
-  (callf2 concat " " to-what)))
-(or (assq mode diminished-mode-alist)
-(push (copy-sequence minor) diminished-mode-alist))
-(setcdr minor (list to-what
+(when minor
+(progn (callf or to-what "")
+   (when (> (length to-what) 1)
+ (or (= (string-to-char to-what) ?\ )
+ (callf2 concat " " to-what)))
+   (or (assq mode diminished-mode-alist)
+   (push (copy-sequence minor) diminished-mode-alist))
+   (setcdr minor (list to-what))
 
 ;; But an image comes to me, vivid in its unreality, of a loon alone on his
 ;; forest lake, shrieking his soul out into a canopy of stars.  Alone this

[elpa] externals/diminish 1645182ff3 06/22: Add Martin Yrjölä as maintainer

[ELPA Syncer]

branch: externals/diminish
commit 1645182ff3e7b5de663b48b92b19342e0a2d1e37
Author: Martin Yrjölä 
Commit: Martin Yrjölä 

Add Martin Yrjölä as maintainer
---
 diminish.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/diminish.el b/diminish.el
index b4295297bb..d8ea3b6f0d 100644
--- a/diminish.el
+++ b/diminish.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1998 Free Software Foundation, Inc.
 
 ;; Author: Will Mengarini 
+;; Maintainer: Martin Yrjölä 
 ;; URL: 
 ;; Created: Th 19 Feb 98
 ;; Version: 0.44, Sa 23 Jan 99

[elpa] externals/diminish ad50994e5a 19/22: Add .gitignore

[ELPA Syncer]

branch: externals/diminish
commit ad50994e5ad69bde95f7e7cc8d99dc7ab962257f
Author: Stefan Kangas 
Commit: Martin Yrjölä 

Add .gitignore
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00..c531d9867f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.elc

[elpa] externals/diminish 6ec6ebc391 18/22: add more usage

[ELPA Syncer]

branch: externals/diminish
commit 6ec6ebc391371418efc6c98d70b013f34af5a2ee
Author: conao3 
Commit: Martin Yrjölä 

add more usage
---
 README.md | 18 ++
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 96b466ef6f..23d78ef847 100644
--- a/README.md
+++ b/README.md
@@ -23,12 +23,22 @@ Quick start
 
 ```emacs-lisp
 (require 'diminish)
-;; Hide jiggle-mode lighter from mode line
-(diminish 'jiggle-mode)
-;; Replace abbrev-mode lighter with "Abv"
-(diminish 'abbrev-mode "Abv")
+
+(diminish 'rainbow-mode)   ; Hide lighter 
from mode-line
+(diminish 'rainbow-mode " Rbow")   ; Replace 
rainbow-mode lighter with " Rbow"
+(diminish 'rainbow-mode 'rainbow-mode-lighter) ; Use 
raingow-mode-lighter variable value
+(diminish 'rainbow-mode '(" " "R-" "bow")) ; Replace 
rainbow-mode lighter with " R-bow"
+(diminish 'rainbow-mode '((" " "R") "/" "bow")); Replace 
rainbow-mode lighter with " R/bow"
+(diminish 'rainbow-mode '(:eval (format " Rbow/%s" (+ 2 3  ; Replace 
rainbow-mode lighter with " Rbow/5"
+(diminish 'rainbow-mode; Replace 
rainbow-mode lighter with greened " Rbow"
+  '(:propertize " Rbow" face '(:foreground "green")))
+(diminish 'rainbow-mode; If 
rainbow-mode-mode-linep is non-nil " Rbow/t"
+  '(rainbow-mode-mode-linep " Rbow/t" " Rbow/nil"))
+(diminish 'rainbow-mode '(3 " Rbow" "/" "s"))  ; Replace 
rainbow-mode lighter with " Rb"
 ```
 
+Ref: [Emacs manual - The Data Structure of the Mode 
Line](https://www.gnu.org/software/emacs/manual/html_node/elisp/Mode-Line-Data.html).
+
 John Wiegley's
 
[use-package](https://github.com/jwiegley/use-package#diminishing-and-delighting-minor-modes)
 macro also has support for diminish.el.

[elpa] externals/diminish 0211de96b7 09/22: Bump version to 0.45

[ELPA Syncer]

branch: externals/diminish
commit 0211de96b7cfba9c9dc8d2d392dbd4ccdb22bc65
Author: Martin Yrjölä 
Commit: Martin Yrjölä 

Bump version to 0.45
---
 diminish.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diminish.el b/diminish.el
index 209e11c49d..6c1c8600b7 100644
--- a/diminish.el
+++ b/diminish.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Martin Yrjölä 
 ;; URL: 
 ;; Created: Th 19 Feb 98
-;; Version: 0.44, Sa 23 Jan 99
+;; Version: 0.45
 ;; Keywords: extensions, diminish, minor, codeprose
 
 ;; This file is part of GNU Emacs.

[elpa] externals/diminish fd486ef76e 22/22: Update license to GPLv3

[ELPA Syncer]

branch: externals/diminish
commit fd486ef76e4c1d8211ae337a43b8bba106d4bca7
Author: Stefan Kangas 
Commit: Martin Yrjölä 

Update license to GPLv3
---
 LICENSE | 904 +---
 diminish.el |  10 +-
 2 files changed, 623 insertions(+), 291 deletions(-)

diff --git a/LICENSE b/LICENSE
index 8cdb8451d9..f288702d2f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,281 +1,622 @@
 GNU GENERAL PUBLIC LICENSE
-   Version 2, June 1991
+   Version 3, 29 June 2007
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc., 
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Copyright (C) 2007 Free Software Foundation, Inc. 
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
 Preamble
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
 
   For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' pr

[elpa] externals/diminish 0352a1e9db 02/22: Import diminish.el from original source

[ELPA Syncer]

branch: externals/diminish
commit 0352a1e9dbb79ad6327c0b7cc129441ac797fa87
Author: Will Mengarini 
Commit: Martin Yrjölä 

Import diminish.el from original source

http://www.eskimo.com/~seldon/diminish.el

Signed-off-by: Martin Yrjölä 
---
 diminish.el | 293 
 1 file changed, 293 insertions(+)

diff --git a/diminish.el b/diminish.el
new file mode 100644
index 00..6461e12649
--- /dev/null
+++ b/diminish.el
@@ -0,0 +1,293 @@
+;;; diminish.el --- Diminished modes are minor modes with no modeline display
+
+;; Copyright (C) 1998 Free Software Foundation, Inc.
+
+;; Author: Will Mengarini 
+;; URL: 
+;; Created: Th 19 Feb 98
+;; Version: 0.44, Sa 23 Jan 99
+;; Keywords: extensions, diminish, minor, codeprose
+
+;; 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 2, 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 GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; Minor modes each put a word on the mode line to signify that they're
+;; active.  This can cause other displays, such as % of file that point is
+;; at, to run off the right side of the screen.  For some minor modes, such
+;; as mouse-avoidance-mode, the display is a waste of space, since users
+;; typically set the mode in their .emacs & never change it.  For other
+;; modes, such as my jiggle-mode, it's a waste because there's already a
+;; visual indication of whether the mode is in effect.
+
+;; A diminished mode is a minor mode that has had its mode line
+;; display diminished, usually to nothing, although diminishing to a
+;; shorter word or a single letter is also supported.  This package
+;; implements diminished modes.
+
+;; You can use this package either interactively or from your .emacs file.
+;; In either case, first you'll need to copy this file to a directory that
+;; appears in your load-path.  `load-path' is the name of a variable that
+;; contains a list of directories Emacs searches for files to load.
+;; To prepend another directory to load-path, put a line like
+;; (add-to-list 'load-path "c:/My_Directory") in your .emacs file.
+
+;; To create diminished modes interactively, type
+;;   M-x load-library
+;; to get a prompt like
+;;   Load library:
+;; and respond `diminish' (unquoted).  Then type
+;;   M-x diminish
+;; to get a prompt like
+;;   Diminish what minor mode:
+;; and respond with the name of some minor mode, like mouse-avoidance-mode.
+;; You'll then get this prompt:
+;;   To what mode-line display:
+;; Respond by just hitting  if you want the name of the mode
+;; completely removed from the mode line.  If you prefer, you can abbreviate
+;; the name.  If your abbreviation is 2 characters or more, such as "Av",
+;; it'll be displayed as a separate word on the mode line, just like minor
+;; modes' names.  If it's a single character, such as "V", it'll be scrunched
+;; up against the previous word, so for example if the undiminished mode line
+;; display had been "Abbrev Fill Avoid", it would become "Abbrev FillV".
+;; Multiple single-letter diminished modes will all be scrunched together.
+;; The display of undiminished modes will not be affected.
+
+;; To find out what the mode line would look like if all diminished modes
+;; were still minor, type M-x diminished-modes.  This displays in the echo
+;; area the complete list of minor or diminished modes now active, but
+;; displays them all as minor.  They remain diminished on the mode line.
+
+;; To convert a diminished mode back to a minor mode, type M-x diminish-undo
+;; to get a prompt like
+;;   Restore what diminished mode:
+;; Respond with the name of some diminished mode.  To convert all
+;; diminished modes back to minor modes, respond to that prompt
+;; with `diminished-modes' (unquoted, & note the hyphen).
+
+;; When you're responding to the prompts for mode names, you can use
+;; completion to avoid extra typing; for example, m o u SPC SPC SPC
+;; is usually enough to specify mouse-avoidance-mode.  Mode names
+;; typically end in "-mode", but for historical reasons
+;; auto-fill-mode is named by "auto-fill-function".
+
+;; To create diminished modes noninteractively in your .emacs file, put
+;; code like
+;;   (require 'diminish)
+;;   (diminish 'abbrev-mode "Abv")
+;;   (diminish 'jiggle-mode)
+;;   (diminish 'mouse-

[elpa] externals/diminish d8ec15be09 05/22: Merge pull request #1 from myrjola/fix-no-lighter

[ELPA Syncer]

branch: externals/diminish
commit d8ec15be09afe64bc04fbadf177e6f2e3fe7dc9b
Merge: 84157483fb 0970f83e97
Author: Martin Yrjölä 
Commit: Martin Yrjölä 

Merge pull request #1 from myrjola/fix-no-lighter

Don't error out when a lighter is not defined
---
 diminish.el | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/diminish.el b/diminish.el
index 6461e12649..b4295297bb 100644
--- a/diminish.el
+++ b/diminish.el
@@ -177,14 +177,14 @@ to TO-WHAT if it's > 1 char long & doesn't already begin 
with a space."
   "To what mode-line display: "
   nil nil nil 'diminish-history-names)))
   (let ((minor (assq mode minor-mode-alist)))
-(or minor (error "%S is not currently registered as a minor mode" mode))
-(callf or to-what "")
-(when (> (length to-what) 1)
-  (or (= (string-to-char to-what) ?\ )
-  (callf2 concat " " to-what)))
-(or (assq mode diminished-mode-alist)
-(push (copy-sequence minor) diminished-mode-alist))
-(setcdr minor (list to-what
+(when minor
+(progn (callf or to-what "")
+   (when (> (length to-what) 1)
+ (or (= (string-to-char to-what) ?\ )
+ (callf2 concat " " to-what)))
+   (or (assq mode diminished-mode-alist)
+   (push (copy-sequence minor) diminished-mode-alist))
+   (setcdr minor (list to-what))
 
 ;; But an image comes to me, vivid in its unreality, of a loon alone on his
 ;; forest lake, shrieking his soul out into a canopy of stars.  Alone this

[elpa] externals/diminish a76b409b05 07/22: Fix flycheck warning

[ELPA Syncer]

branch: externals/diminish
commit a76b409b05f383476de3abc922b908e1360015e7
Author: Martin Yrjölä 
Commit: Martin Yrjölä 

Fix flycheck warning
---
 diminish.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/diminish.el b/diminish.el
index d8ea3b6f0d..988a621d3b 100644
--- a/diminish.el
+++ b/diminish.el
@@ -209,7 +209,7 @@ to TO-WHAT if it's > 1 char long & doesn't already begin 
with a space."
 Do nothing if the arg is a minor mode that hasn't been diminished.
 
 Interactively, enter (with completion) the name of any diminished mode (a
-mode that was formerly a minor mode on which you invoked M-x diminish).
+mode that was formerly a minor mode on which you invoked \\[diminish]).
 To restore all diminished modes to minor status, answer `diminished-modes'.
 The response to the prompt shouldn't be quoted.  However, in Lisp code,
 the arg must be quoted as a symbol, as in (diminish-undo 'diminished-modes)."
@@ -291,4 +291,4 @@ what diminished modes would be on the mode-line if they 
were still minor."
 
 (provide 'diminish)
 
-;;; diminish.el ends here
\ No newline at end of file
+;;; diminish.el ends here

[elpa] externals/diminish e534fa043a 16/22: Revert "Replace deprecated 'cl package by 'cl-lib"

[ELPA Syncer]

branch: externals/diminish
commit e534fa043a2dece20dc621b2245a158575ce3afd
Author: Martin Yrjölä 
Commit: Martin Yrjölä 

Revert "Replace deprecated 'cl package by 'cl-lib"

This reverts commit 8bed521dbd10c009ca76f5efbf95966fc186465f.
---
 diminish.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diminish.el b/diminish.el
index 14805ea0f9..6aa45e4c89 100644
--- a/diminish.el
+++ b/diminish.el
@@ -105,7 +105,7 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl-lib))
+(eval-when-compile (require 'cl))
 
 (defvar diminish-must-not-copy-minor-mode-alist nil
   "Non-nil means loading diminish.el won't (copy-alist minor-mode-alist).