[elpa] externals/fontaine e7e8939f7b 3/4: Include the newly supported -width in all relevant samples

[ELPA Syncer]

branch: externals/fontaine
commit e7e8939f7be52377a654b28986d948dfc63356ca
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Include the newly supported -width in all relevant samples
---
 README.org  | 12 
 fontaine.el | 12 
 2 files changed, 24 insertions(+)

diff --git a/README.org b/README.org
index 286cea522b..8dbd76953b 100644
--- a/README.org
+++ b/README.org
@@ -90,61 +90,73 @@ property list. It looks like this (check the default value 
of
  :default-family "Monospace"
  :default-weight regular
  :default-slant normal
+ :default-width normal
  :default-height 100
 
  :fixed-pitch-family nil
  :fixed-pitch-weight nil
  :fixed-pitch-slant nil
+ :fixed-pitch-width nil
  :fixed-pitch-height 1.0
 
  :fixed-pitch-serif-family nil
  :fixed-pitch-serif-weight nil
  :fixed-pitch-serif-slant nil
+ :fixed-pitch-serif-width nil
  :fixed-pitch-serif-height 1.0
 
  :variable-pitch-family "Sans"
  :variable-pitch-weight nil
  :variable-pitch-slant nil
+ :variable-pitch-width nil
  :variable-pitch-height 1.0
 
  :mode-line-active-family nil
  :mode-line-active-weight nil
  :mode-line-active-slant nil
+ :mode-line-active-width nil
  :mode-line-active-height 1.0
 
  :mode-line-inactive-family nil
  :mode-line-inactive-weight nil
  :mode-line-inactive-slant nil
+ :mode-line-inactive-width nil
  :mode-line-inactive-height 1.0
 
  :header-line-family nil
  :header-line-weight nil
  :header-line-slant nil
+ :header-line-width nil
  :header-line-height 1.0
 
  :line-number-family nil
  :line-number-weight nil
  :line-number-slant nil
+ :line-number-width nil
  :line-number-height 1.0
 
  :tab-bar-family nil
  :tab-bar-weight nil
  :tab-bar-slant nil
+ :tab-bar-width nil
  :tab-bar-height 1.0
 
  :tab-line-family nil
  :tab-line-weight nil
  :tab-line-slant nil
+ :tab-line-width nil
  :tab-line-height 1.0
 
  :bold-family nil
  :bold-slant nil
  :bold-weight bold
+ :bold-width nil
  :bold-height 1.0
 
  :italic-family nil
  :italic-weight nil
  :italic-slant italic
+ :italic-width nil
  :italic-height 1.0
 
  :line-spacing nil)
diff --git a/fontaine.el b/fontaine.el
index 81ad188041..5d9d9b6011 100644
--- a/fontaine.el
+++ b/fontaine.el
@@ -137,61 +137,73 @@
  :default-family "Monospace"
  :default-weight regular
  :default-slant normal
+ :default-width normal
  :default-height 100
 
  :fixed-pitch-family nil
  :fixed-pitch-weight nil
  :fixed-pitch-slant nil
+ :fixed-pitch-width nil
  :fixed-pitch-height 1.0
 
  :fixed-pitch-serif-family nil
  :fixed-pitch-serif-weight nil
  :fixed-pitch-serif-slant nil
+ :fixed-pitch-serif-width nil
  :fixed-pitch-serif-height 1.0
 
  :variable-pitch-family "Sans"
  :variable-pitch-weight nil
  :variable-pitch-slant nil
+ :variable-pitch-width nil
  :variable-pitch-height 1.0
 
  :mode-line-active-family nil
  :mode-line-active-weight nil
  :mode-line-active-slant nil
+ :mode-line-active-width nil
  :mode-line-active-height 1.0
 
  :mode-line-inactive-family nil
  :mode-line-inactive-weight nil
  :mode-line-inactive-slant nil
+ :mode-line-inactive-width nil
  :mode-line-inactive-height 1.0
 
  :header-line-family nil
  :header-line-weight nil
  :header-line-slant nil
+ :header-line-width nil
  :header-line-height 1.0
 
  :line-number-family nil
  :line-number-weight nil
  :line-number-slant nil
+ :line-number-width nil
  :line-number-height 1.0
 
  :tab-bar-family nil
  :tab-bar-weight nil
  :tab-bar-slant nil
+ :tab-bar-width nil
  :tab-bar-height 1.0
 
  :tab-line-family nil
  :tab-line-weight nil
  :tab-line-slant nil
+ :tab-line-width nil
  :tab-line-height 1.0
 
  :bold-family nil
  :bold-slant nil
  :bold-weight bold
+ :bold-width nil
  :bold-height 1.0
 
  :italic-family nil
  :italic-weight nil
  :italic-slant italic
+ :italic-width nil
  :italic-height 1.0
 
  :line-spacing nil))

[elpa] externals/fontaine 0cd092bce2 2/4: Add some metadata to the CHANGELOG

[ELPA Syncer]

branch: externals/fontaine
commit 0cd092bce29bcbeeaf391bf7ff9e849afc8374fe
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Add some metadata to the CHANGELOG
---
 CHANGELOG.org | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.org b/CHANGELOG.org
index 87b764d8e4..4ed7d4dc63 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -2,6 +2,7 @@
 #+AUTHOR: Protesilaos Stavrou
 #+EMAIL: i...@protesilaos.com
 #+OPTIONS: ':nil toc:nil num:nil author:nil email:nil
+#+STARTUP: content
 
 This document contains the release notes for each tagged commit on the
 project's main git repository: .
@@ -9,6 +10,8 @@ project's main git repository: 
.
 The newest release is at the top.  For further details, please consult
 the manual: .
 
+#+toc: headlines 1 insert TOC here, with one headline level
+
 * Version 2.0.0 on 2024-04-16
 :PROPERTIES:
 :CUSTOM_ID: h:1aad7179-f7cd-4817-ad23-0f9256b6df5d

[elpa] externals/fontaine 90d564265c 4/4: Make the default value at the preset prompt only use existing presets

[ELPA Syncer]

branch: externals/fontaine
commit 90d564265c20b8548e76e7126c8943a5c0a10426
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Make the default value at the preset prompt only use existing presets
---
 fontaine.el | 36 ++--
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/fontaine.el b/fontaine.el
index 5d9d9b6011..358e712646 100644
--- a/fontaine.el
+++ b/fontaine.el
@@ -424,11 +424,28 @@ If FRAME is nil, apply the effect to all frames."
  first))
  fontaine-presets)))
 
+(defvar fontaine-current-preset nil
+  "Current font set in `fontaine-presets'.
+This is the preset last used by `fontaine-set-preset'.  Also see
+the command `fontaine-apply-current-preset'.")
+
+(defun fontaine--get-first-non-current-preset (history)
+  "Return the first element of HISTORY which is not `fontaine-current-preset'.
+Only consider elements that are still part of the `fontaine-presets',
+per `fontaine--get-preset-symbols'."
+  (catch 'first
+(dolist (element history)
+  (when (stringp element)
+(setq element (intern element)))
+  (when (and (not (eq element fontaine-current-preset))
+ (member element (fontaine--get-preset-symbols)))
+(throw 'first element)
+
 (defun fontaine--set-fonts-prompt (&optional prompt)
   "Prompt for font set (used by `fontaine-set-fonts').
 If optional PROMPT string, use it for the prompt, else use one that asks
 for a preset among `fontaine-presets'."
-  (let* ((def (nth 1 fontaine--font-display-hist))
+  (let* ((def (symbol-name (fontaine--get-first-non-current-preset 
fontaine--font-display-hist)))
  (prompt (if prompt
  (format-prompt prompt nil)
(format-prompt "Apply font configurations from PRESET" 
def
@@ -438,11 +455,6 @@ for a preset among `fontaine-presets'."
   (fontaine--presets-no-fallback)
   nil t nil 'fontaine--font-display-hist def
 
-(defvar fontaine-current-preset nil
-  "Current font set in `fontaine-presets'.
-This is the preset last used by `fontaine-set-preset'.  Also see
-the command `fontaine-apply-current-preset'.")
-
 ;;;###autoload
 (defun fontaine-set-preset (preset &optional frame)
   "Set font configurations specified in PRESET.
@@ -498,18 +510,6 @@ which this function ignores"
   (fontaine-set-preset current)
 (user-error "The `fontaine-current-preset' is not among 
`fontaine-presets'")))
 
-(defun fontaine--get-first-non-current-preset (history)
-  "Return the first element of HISTORY which is not `fontaine-current-preset'.
-Only consider elements that are still part of the `fontaine-presets',
-per `fontaine--get-preset-symbols'."
-  (catch 'first
-(dolist (element history)
-  (when (stringp element)
-(setq element (intern element)))
-  (when (and (not (eq element fontaine-current-preset))
- (member element (fontaine--get-preset-symbols)))
-(throw 'first element)
-
 ;;;###autoload
 (defun fontaine-toggle-preset ()
   "Toggle between the last two known Fontaine presets.

[elpa] externals/fontaine 748d4ed863 1/4: Define the fontaine-toggle-preset command

[ELPA Syncer]

branch: externals/fontaine
commit 748d4ed863b31d6a9ad9a048171ea783b8628197
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Define the fontaine-toggle-preset command
---
 README.org  |  7 +++
 fontaine.el | 47 ++-
 2 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/README.org b/README.org
index ff464a2f8e..286cea522b 100644
--- a/README.org
+++ b/README.org
@@ -203,6 +203,13 @@ the =.emacs.d= directory).  Saving is done by the function
 function ~fontaine-restore-latest-preset~ (such as by adding it to their
 init file).
 
+#+findex: fontaine-toggle-preset
+The command ~fontaine-toggle-preset~ can toggle between the last two
+valid presets, as set by ~fontaine-set-preset~. If it cannot find two
+different presets, then it prompts using minibuffer completion. As a
+final step, it calls the ~fontaine-set-preset-hook~. [ The
+~fontaine-toggle-preset~ is part of {{{development-version}}}. ]
+
 For users of the =no-littering= package, ~fontaine-latest-state-file~ is
 not stored in their =.emacs.d=, but in a standard directory instead:
 https://github.com/emacscollective/no-littering.
diff --git a/fontaine.el b/fontaine.el
index 6cf6b62392..81ad188041 100644
--- a/fontaine.el
+++ b/fontaine.el
@@ -402,12 +402,24 @@ If FRAME is nil, apply the effect to all frames."
symbol))
fontaine-presets)))
 
-(defun fontaine--set-fonts-prompt ()
-  "Prompt for font set (used by `fontaine-set-fonts')."
+(defun fontaine--get-preset-symbols ()
+  "Return list of the `car' of each element in `fontain-presets'."
+  (delq nil
+(mapcar
+ (lambda (element)
+   (when-let ((first (car element))
+  (_ (not (eq first t
+ first))
+ fontaine-presets)))
+
+(defun fontaine--set-fonts-prompt (&optional prompt)
+  "Prompt for font set (used by `fontaine-set-fonts').
+If optional PROMPT string, use it for the prompt, else use one that asks
+for a preset among `fontaine-presets'."
   (let* ((def (nth 1 fontaine--font-display-hist))
- (prompt (if def
- (format "Apply font configurations from PRESET [%s]: " 
def)
-   "Apply font configurations from PRESET: ")))
+ (prompt (if prompt
+ (format-prompt prompt nil)
+   (format-prompt "Apply font configurations from PRESET" 
def
 (intern
  (completing-read
   prompt
@@ -474,6 +486,31 @@ which this function ignores"
   (fontaine-set-preset current)
 (user-error "The `fontaine-current-preset' is not among 
`fontaine-presets'")))
 
+(defun fontaine--get-first-non-current-preset (history)
+  "Return the first element of HISTORY which is not `fontaine-current-preset'.
+Only consider elements that are still part of the `fontaine-presets',
+per `fontaine--get-preset-symbols'."
+  (catch 'first
+(dolist (element history)
+  (when (stringp element)
+(setq element (intern element)))
+  (when (and (not (eq element fontaine-current-preset))
+ (member element (fontaine--get-preset-symbols)))
+(throw 'first element)
+
+;;;###autoload
+(defun fontaine-toggle-preset ()
+  "Toggle between the last two known Fontaine presets.
+These are the presets that were set with `fontaine-set-preset'.  If
+there are no two selected presets, then prompt the user to set a preset.
+
+As a final step, call the `fontaine-set-preset-hook'."
+  (interactive)
+  (fontaine-set-preset
+   (if-let ((previous (fontaine--get-first-non-current-preset 
fontaine--font-display-hist)))
+   previous
+ (fontaine--set-fonts-prompt "No previous preset to toggle; select 
PRESET"
+
  Store and restore preset
 
 (defvar fontaine--preset-history '()

[elpa] externals/hyperbole b1641e5fe6 2/3: Merge branch 'master' into rsw

[ELPA Syncer]

branch: externals/hyperbole
commit b1641e5fe6f494a86e6f9749701d37b5f094b831
Merge: af5cdf1428 5dbd852f10
Author: Robert Weiner 
Commit: GitHub 

Merge branch 'master' into rsw

[elpa] externals/fontaine updated (5d6f06f00b -> 90d564265c)

[ELPA Syncer]

elpasync pushed a change to branch externals/fontaine.

  from  5d6f06f00b Remove incorrect description in 
fontaine-store-latest-preset doc string
   new  748d4ed863 Define the fontaine-toggle-preset command
   new  0cd092bce2 Add some metadata to the CHANGELOG
   new  e7e8939f7b Include the newly supported -width in all relevant 
samples
   new  90d564265c Make the default value at the preset prompt only use 
existing presets


Summary of changes:
 CHANGELOG.org |  3 +++
 README.org| 19 
 fontaine.el   | 71 ++-
 3 files changed, 82 insertions(+), 11 deletions(-)

[elpa] externals/hyperbole updated (5dbd852f10 -> 64294de59f)

[ELPA Syncer]

elpasync pushed a change to branch externals/hyperbole.

  from  5dbd852f10 Merge pull request #583 from rswgnu/rsw
   new  af5cdf1428 Hyperbole Manual - Add initial short HyNote chapter
   new  b1641e5fe6 Merge branch 'master' into rsw
   new  64294de59f Merge pull request #584 from rswgnu/rsw


Summary of changes:
 ChangeLog  |  22 
 hui-menu.el|  37 ---
 hui-mini.el|  78 +-
 hynote.el  |  51 +
 hyrolo.el  |  13 +--
 hyrolo.py  |   3 +-
 hywiki.el  |   2 +-
 man/dir|  14 ++-
 man/hyperbole.html | 302 ++---
 man/hyperbole.info | Bin 653988 -> 659075 bytes
 man/hyperbole.pdf  | Bin 1397687 -> 1404276 bytes
 man/hyperbole.texi | 112 
 12 files changed, 447 insertions(+), 187 deletions(-)

[elpa] externals/hyperbole af5cdf1428 1/3: Hyperbole Manual - Add initial short HyNote chapter

[ELPA Syncer]

branch: externals/hyperbole
commit af5cdf1428ef68f1643846a1fca3607f80944a85
Author: bw 
Commit: bw 

Hyperbole Manual - Add initial short HyNote chapter

Conditionalize HyWiki Consult menu items to load only when Consult
is installed.

Allow cust of HyWiki menu.

Fix 'hyrolo-org-mode' bug.

Improve width of Hyperbole Info dir entry to better match others.
---
 ChangeLog  |  22 
 hui-menu.el|  37 ---
 hui-mini.el|  78 +-
 hynote.el  |  51 +
 hyrolo.el  |  13 +--
 hyrolo.py  |   3 +-
 hywiki.el  |   2 +-
 man/dir|  14 ++-
 man/hyperbole.html | 302 ++---
 man/hyperbole.info | Bin 653988 -> 659075 bytes
 man/hyperbole.pdf  | Bin 1397687 -> 1404276 bytes
 man/hyperbole.texi | 112 
 12 files changed, 447 insertions(+), 187 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 35cae96434..9a4c5c60c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2024-09-01  Bob Weiner  
+
+* man/dir (File): Narrow width to better fit with out Info entries.
+
+* hyrolo.el (hyrolo-org-mode): Prioritize Org 9.7 folding-spec config
+over earlier versions to fix a bug that used the wrong version.
+
+* hui-menu.el (infodock-hyperbole-menu):
+  hui-mini.el (hui:menu-hywiki): Allow customizing the HyWiki menus and
+define its Consult items only when consult-grep is fboundp.
+
+* hynote.el (hynote-get-file): Add secondary markdown file suffixes.
+(hynote-file-suffix-list): Add this variable and use in above
+function.
+(hynote-file-suffix-regexp): Add this variable and use in
+`hynote-get-files'.
+(require 'hyrolo): Remove.
+
+* man/hyperbole.texi (Glossary): Add HyNote entry and HyWiki entry reference
+to its two ibtypes.
+ (HyNote): Add a short chapter on this.
+
 2024-08-30  Bob Weiner  
 
 * hibtypes.el (hyp-manual): Fix to strip spaces around section for both .html
diff --git a/hui-menu.el b/hui-menu.el
index 77a3dd2aa9..28e11a7cf4 100644
--- a/hui-menu.el
+++ b/hui-menu.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date:28-Oct-94 at 10:59:44
-;; Last-Mod: 19-Aug-24 at 23:28:31 by Bob Weiner
+;; Last-Mod:  1-Sep-24 at 14:12:37 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -301,6 +301,26 @@ Return t if cutoff, else nil."
 :style toggle :selected hkey-debug]))
   "Untitled menu of Hyperbole options.")
 
+(defconst hui-menu-hywiki
+  (delq nil
+   (list
+["Manual"  (id-info "(hyperbole)HyWiki") t]
+""
+["Activate"hywiki-word-activate t]
+["Create"  hywiki-add-page-and-display t]
+["Edit"hywiki-find-page t]
+(when (fboundp 'consult-grep) ;; allow for autoloading
+  ["Grep-Consult"hywiki-consult-grep t])
+["Help"hkey-help t]
+["Link"hywiki-add-link t]
+hui-menu-org-meta-return-options
+["HyWiki-Mode-Toggle" hywiki-mode t]
+["Publish" hywiki-publish-to-html t]
+["Tag-Find"hywiki-tags-view t]
+(when (fboundp 'consult-grep) ;; allow for autoloading
+  ["WikiWord-Consult"hywiki-word-consult-grep t])))
+  "Menu items for HyWiki editing and publishing.")
+
 (defvar infodock-hyperbole-menu nil)
 
 ;;; 
@@ -447,20 +467,7 @@ REBUILD-FLAG is non-nil, in which case the menu is 
rebuilt."
   ["Help"   gbut:help t]
   ["Link"   hui:gbut-link-directly t]
["Rename" hui:gbut-rename t])
-(list "HyWiki"
-  ["Manual"  (id-info "(hyperbole)HyWiki") t]
-  ""
-  ["Activate"hywiki-word-activate t]
-  ["Create"  hywiki-add-page-and-display t]
-  ["Edit"hywiki-find-page t]
-  ["Grep-Consult"hywiki-consult-grep t]
-  ["Help"hkey-help t]
-  ["Link"hywiki-add-link t]
-  hui-menu-org-meta-return-options
-  ["HyWiki-Mode-Toggle" hywiki-mode t]
-  ["Publish" hywiki-publish-to-html t]
-  ["Tag-Find"hywiki-tags-view t]
-  ["WikiWord-Consult"hywiki-word-consult-grep t])
+(cons "HyWiki" hui-menu-hywiki)
 '("Implicit-Button"
   ["Manual"   (id-info "(hyperbole)Implicit Buttons") t]
   ""
diff --git a/hui-mini.el b/hui-mini.el
index 280a861f18..452519ff59 100644
--- a/hui-mini.el
+++ b/hui-mini.el
@@ -3

[elpa] externals/hyperbole 64294de59f 3/3: Merge pull request #584 from rswgnu/rsw

[ELPA Syncer]

branch: externals/hyperbole
commit 64294de59fa6f3e7b8127d72081ae7ceaa8276d5
Merge: 5dbd852f10 b1641e5fe6
Author: Robert Weiner 
Commit: GitHub 

Merge pull request #584 from rswgnu/rsw

Hyperbole Manual - Add initial short HyNote chapter
---
 ChangeLog  |  22 
 hui-menu.el|  37 ---
 hui-mini.el|  78 +-
 hynote.el  |  51 +
 hyrolo.el  |  13 +--
 hyrolo.py  |   3 +-
 hywiki.el  |   2 +-
 man/dir|  14 ++-
 man/hyperbole.html | 302 ++---
 man/hyperbole.info | Bin 653988 -> 659075 bytes
 man/hyperbole.pdf  | Bin 1397687 -> 1404276 bytes
 man/hyperbole.texi | 112 
 12 files changed, 447 insertions(+), 187 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 35cae96434..9a4c5c60c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2024-09-01  Bob Weiner  
+
+* man/dir (File): Narrow width to better fit with out Info entries.
+
+* hyrolo.el (hyrolo-org-mode): Prioritize Org 9.7 folding-spec config
+over earlier versions to fix a bug that used the wrong version.
+
+* hui-menu.el (infodock-hyperbole-menu):
+  hui-mini.el (hui:menu-hywiki): Allow customizing the HyWiki menus and
+define its Consult items only when consult-grep is fboundp.
+
+* hynote.el (hynote-get-file): Add secondary markdown file suffixes.
+(hynote-file-suffix-list): Add this variable and use in above
+function.
+(hynote-file-suffix-regexp): Add this variable and use in
+`hynote-get-files'.
+(require 'hyrolo): Remove.
+
+* man/hyperbole.texi (Glossary): Add HyNote entry and HyWiki entry reference
+to its two ibtypes.
+ (HyNote): Add a short chapter on this.
+
 2024-08-30  Bob Weiner  
 
 * hibtypes.el (hyp-manual): Fix to strip spaces around section for both .html
diff --git a/hui-menu.el b/hui-menu.el
index 77a3dd2aa9..28e11a7cf4 100644
--- a/hui-menu.el
+++ b/hui-menu.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date:28-Oct-94 at 10:59:44
-;; Last-Mod: 19-Aug-24 at 23:28:31 by Bob Weiner
+;; Last-Mod:  1-Sep-24 at 14:12:37 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -301,6 +301,26 @@ Return t if cutoff, else nil."
 :style toggle :selected hkey-debug]))
   "Untitled menu of Hyperbole options.")
 
+(defconst hui-menu-hywiki
+  (delq nil
+   (list
+["Manual"  (id-info "(hyperbole)HyWiki") t]
+""
+["Activate"hywiki-word-activate t]
+["Create"  hywiki-add-page-and-display t]
+["Edit"hywiki-find-page t]
+(when (fboundp 'consult-grep) ;; allow for autoloading
+  ["Grep-Consult"hywiki-consult-grep t])
+["Help"hkey-help t]
+["Link"hywiki-add-link t]
+hui-menu-org-meta-return-options
+["HyWiki-Mode-Toggle" hywiki-mode t]
+["Publish" hywiki-publish-to-html t]
+["Tag-Find"hywiki-tags-view t]
+(when (fboundp 'consult-grep) ;; allow for autoloading
+  ["WikiWord-Consult"hywiki-word-consult-grep t])))
+  "Menu items for HyWiki editing and publishing.")
+
 (defvar infodock-hyperbole-menu nil)
 
 ;;; 
@@ -447,20 +467,7 @@ REBUILD-FLAG is non-nil, in which case the menu is 
rebuilt."
   ["Help"   gbut:help t]
   ["Link"   hui:gbut-link-directly t]
["Rename" hui:gbut-rename t])
-(list "HyWiki"
-  ["Manual"  (id-info "(hyperbole)HyWiki") t]
-  ""
-  ["Activate"hywiki-word-activate t]
-  ["Create"  hywiki-add-page-and-display t]
-  ["Edit"hywiki-find-page t]
-  ["Grep-Consult"hywiki-consult-grep t]
-  ["Help"hkey-help t]
-  ["Link"hywiki-add-link t]
-  hui-menu-org-meta-return-options
-  ["HyWiki-Mode-Toggle" hywiki-mode t]
-  ["Publish" hywiki-publish-to-html t]
-  ["Tag-Find"hywiki-tags-view t]
-  ["WikiWord-Consult"hywiki-word-consult-grep t])
+(cons "HyWiki" hui-menu-hywiki)
 '("Implicit-Button"
   ["Manual"   (id-info "(hyperbole)Implicit Buttons") t]
   ""
diff --git a/hui-mini.el b/hui-mini.el
index 280a861f18..452519ff59 100644
--- a/hui-mini.el
+++ b/hui-mini.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date:15-Oct-91 at 20:13:17
-;; Last-Mod: 19-Aug-24 at 23:29:29 by Bob Weiner
+;; Last-M

[nongnu] elpa/gptel 87dfb2d1de: gptel-openai: Fix parse error when not tracking responses

[ELPA Syncer]

branch: elpa/gptel
commit 87dfb2d1de3909e6471666d7009643d7c309a93b
Author: Karthik Chikmagalur 
Commit: Karthik Chikmagalur 

gptel-openai: Fix parse error when not tracking responses

* gptel-openai.el (gptel--parse-buffer): Fix error with prompt
creation when `gptel-track-response` is set to nil.
---
 gptel-openai.el | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gptel-openai.el b/gptel-openai.el
index 7e557f0ff3..beb252b243 100644
--- a/gptel-openai.el
+++ b/gptel-openai.el
@@ -144,8 +144,7 @@ with differing settings.")
   (push (list :role "user"
   :content
   (string-trim
-   (buffer-substring-no-properties (prop-match-beginning prop)
-   (prop-match-end prop))
+   (buffer-substring-no-properties (point-min) (point-max))
(format "[\t\r\n ]*\\(?:%s\\)?[\t\r\n ]*"
(regexp-quote (gptel-prompt-prefix-string)))
(format "[\t\r\n ]*\\(?:%s\\)?[\t\r\n ]*"

[nongnu] elpa/sweeprolog d3e1128ec3 4/6: Merge remote-tracking branch 'geoffchurch/underscores-anywhere'

[ELPA Syncer]

branch: elpa/sweeprolog
commit d3e1128ec3e3f2df4f28393f19cdfe7d35c62a27
Merge: 4ca222305f 78d17308c9
Author: Eshel Yaron 
Commit: Eshel Yaron 

Merge remote-tracking branch 'geoffchurch/underscores-anywhere'
---
 sweeprolog-tests.el | 15 +++
 sweeprolog.el   |  6 +++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/sweeprolog-tests.el b/sweeprolog-tests.el
index 7827345e32..541bdce108 100644
--- a/sweeprolog-tests.el
+++ b/sweeprolog-tests.el
@@ -281,30 +281,37 @@ foo(Foo) :- bar.
"foo(bar, (_->_;_), _):-_.")))
 
 (sweeprolog-deftest rename-variable ()
-  "Tests renaming varialbes."
+  "Tests renaming variables."
   "foo(Bar,Baz) :- spam(Baz,Bar)."
   (goto-char (point-min))
-  (sweeprolog-rename-variable "Bar" "Spam")
+  (sweeprolog-rename-variable "Bar" "_S_p_a_m_")
   (sweeprolog-rename-variable "Baz" "Bar")
-  (sweeprolog-rename-variable "Spam" "Baz")
+  (sweeprolog-rename-variable "_S_p_a_m_" "Baz")
   (should (string= (buffer-string)
"foo(Baz,Bar) :- spam(Bar,Baz).")))
 
 (sweeprolog-deftest increment-variable ()
-  "Tests renaming varialbes."
+  "Tests renaming variables."
   "
 foo(Bar0,Bar) :-
+spam(Bar_0,Bar_1),
 spam(Bar0,Bar1),
+bar(Bar_1,Bar_2),
 bar(Bar1,Bar2),
+baz(Bar_2,Bar),
 baz(Bar2, Bar).
 "
   (goto-char (1+ (point-min)))
   (sweeprolog-increment-numbered-variables 1 (point) "Bar1")
+  (sweeprolog-increment-numbered-variables 1 (point) "Bar_2")
   (should (string= (buffer-string)
"
 foo(Bar0,Bar) :-
+spam(Bar_0,Bar_1),
 spam(Bar0,Bar2),
+bar(Bar_1,Bar_3),
 bar(Bar2,Bar3),
+baz(Bar_3,Bar),
 baz(Bar3, Bar).
 ")))
 
diff --git a/sweeprolog.el b/sweeprolog.el
index 6bf58de09b..b3d6d49d8a 100644
--- a/sweeprolog.el
+++ b/sweeprolog.el
@@ -1433,7 +1433,7 @@ list even when found in the current clause."
   (goto-char beg)
   (save-match-data
 (while (re-search-forward (rx bow (or "_" upper)
-  (* alnum))
+  (* (or "_" alnum)))
   end t)
   (unless (nth 8 (syntax-ppss))
 (let ((match (match-string-no-properties 0)))
@@ -6807,13 +6807,13 @@ is the name of the variable at point, if any."
 (let ((case-fold-search nil))
   (not
(not
-(string-match (rx bos (or "_" upper) (* alnum) eos) string))
+(string-match (rx bos (or "_" upper) (* (or "_" alnum)) eos) 
string))
 
 (defun sweeprolog--decode-numbered-variable-name (string)
   "Return t if STRING is valid number variable name."
   (save-match-data
 (let ((case-fold-search nil))
-  (when (string-match (rx bos (group-n 1 (or "_" upper) (or (seq (* alnum) 
letter)
+  (when (string-match (rx bos (group-n 1 (or "_" upper) (or (seq (* (or 
"_" alnum)) letter)
 ""))
   (group-n 2 (or "0" (seq (any (?1 . ?9)) (* 
digit eos)
   string)

[nongnu] elpa/sweeprolog c230f3fd43 2/6: Bug fix: allow "_" to appear anywhere in a Prolog variable's name.

[ELPA Syncer]

branch: elpa/sweeprolog
commit c230f3fd4372b72ad5927cd2ea70eea6ba820394
Author: Geoffrey Churchill 
Commit: GitHub 

Bug fix: allow "_" to appear anywhere in a Prolog variable's name.
---
 sweeprolog.el | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sweeprolog.el b/sweeprolog.el
index 6bf58de09b..c558f27eff 100644
--- a/sweeprolog.el
+++ b/sweeprolog.el
@@ -1433,7 +1433,7 @@ list even when found in the current clause."
   (goto-char beg)
   (save-match-data
 (while (re-search-forward (rx bow (or "_" upper)
-  (* alnum))
+  (* (or "_" alnum)))
   end t)
   (unless (nth 8 (syntax-ppss))
 (let ((match (match-string-no-properties 0)))
@@ -6179,7 +6179,8 @@ prompt for CLASS as well.  A negative prefix argument
   length)
   '((?  "next" "Next match")
 (?  "back" "Last match")
-(?
  "exit" "Exit term search"
+(?
+  "exit" "Exit term search"
   (?
(setq overlays (if backward
   (cons overlay
@@ -6200,7 +6201,7 @@ prompt for CLASS as well.  A negative prefix argument
(mod (1- index) length)
  index)
  backward t))
-  (?
+  (?
(setq go nil)
t))
 (overlay-put overlay 'priority nil)
@@ -6807,13 +6808,13 @@ is the name of the variable at point, if any."
 (let ((case-fold-search nil))
   (not
(not
-(string-match (rx bos (or "_" upper) (* alnum) eos) string))
+(string-match (rx bos (or "_" upper) (* (or "_" alnum)) eos) 
string))
 
 (defun sweeprolog--decode-numbered-variable-name (string)
   "Return t if STRING is valid number variable name."
   (save-match-data
 (let ((case-fold-search nil))
-  (when (string-match (rx bos (group-n 1 (or "_" upper) (or (seq (* alnum) 
letter)
+  (when (string-match (rx bos (group-n 1 (or "_" upper) (or (seq (* (or 
"_" alnum)) letter)
 ""))
   (group-n 2 (or "0" (seq (any (?1 . ?9)) (* 
digit eos)
   string)

[nongnu] elpa/sweeprolog 270fad253f 5/6: ; (sweeprolog--decode-numbered-variable-name): Fix regexp.

[ELPA Syncer]

branch: elpa/sweeprolog
commit 270fad253f02b18a4265152ebf3dee9bf720dbe5
Author: Eshel Yaron 
Commit: Eshel Yaron 

; (sweeprolog--decode-numbered-variable-name): Fix regexp.
---
 sweeprolog.el | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/sweeprolog.el b/sweeprolog.el
index b3d6d49d8a..79e3cc3ee4 100644
--- a/sweeprolog.el
+++ b/sweeprolog.el
@@ -6810,11 +6810,15 @@ is the name of the variable at point, if any."
 (string-match (rx bos (or "_" upper) (* (or "_" alnum)) eos) 
string))
 
 (defun sweeprolog--decode-numbered-variable-name (string)
-  "Return t if STRING is valid number variable name."
+  "Decode numbered variable name STRING.
+
+Return cons cell (VAR . NUM), where VAR is the variable name sans
+numbered variable index, and NUM is the index."
   (save-match-data
 (let ((case-fold-search nil))
-  (when (string-match (rx bos (group-n 1 (or "_" upper) (or (seq (* (or 
"_" alnum)) letter)
-""))
+  (when (string-match (rx bos (group-n 1
+(or "_" upper)
+(or (seq (* (or "_" alnum)) (or letter 
"_")) ""))
   (group-n 2 (or "0" (seq (any (?1 . ?9)) (* 
digit eos)
   string)
 (cons (match-string 1 string)

[nongnu] elpa/sweeprolog 78d17308c9 3/6: Update tests.

[ELPA Syncer]

branch: elpa/sweeprolog
commit 78d17308c92736a6450a8be211ac1f334160181d
Author: Geoffrey Churchill 
Commit: GitHub 

Update tests.
---
 sweeprolog-tests.el | 15 +++
 sweeprolog.el   | 11 +--
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/sweeprolog-tests.el b/sweeprolog-tests.el
index 7827345e32..541bdce108 100644
--- a/sweeprolog-tests.el
+++ b/sweeprolog-tests.el
@@ -281,30 +281,37 @@ foo(Foo) :- bar.
"foo(bar, (_->_;_), _):-_.")))
 
 (sweeprolog-deftest rename-variable ()
-  "Tests renaming varialbes."
+  "Tests renaming variables."
   "foo(Bar,Baz) :- spam(Baz,Bar)."
   (goto-char (point-min))
-  (sweeprolog-rename-variable "Bar" "Spam")
+  (sweeprolog-rename-variable "Bar" "_S_p_a_m_")
   (sweeprolog-rename-variable "Baz" "Bar")
-  (sweeprolog-rename-variable "Spam" "Baz")
+  (sweeprolog-rename-variable "_S_p_a_m_" "Baz")
   (should (string= (buffer-string)
"foo(Baz,Bar) :- spam(Bar,Baz).")))
 
 (sweeprolog-deftest increment-variable ()
-  "Tests renaming varialbes."
+  "Tests renaming variables."
   "
 foo(Bar0,Bar) :-
+spam(Bar_0,Bar_1),
 spam(Bar0,Bar1),
+bar(Bar_1,Bar_2),
 bar(Bar1,Bar2),
+baz(Bar_2,Bar),
 baz(Bar2, Bar).
 "
   (goto-char (1+ (point-min)))
   (sweeprolog-increment-numbered-variables 1 (point) "Bar1")
+  (sweeprolog-increment-numbered-variables 1 (point) "Bar_2")
   (should (string= (buffer-string)
"
 foo(Bar0,Bar) :-
+spam(Bar_0,Bar_1),
 spam(Bar0,Bar2),
+bar(Bar_1,Bar_3),
 bar(Bar2,Bar3),
+baz(Bar_3,Bar),
 baz(Bar3, Bar).
 ")))
 
diff --git a/sweeprolog.el b/sweeprolog.el
index c558f27eff..c841ac77a2 100644
--- a/sweeprolog.el
+++ b/sweeprolog.el
@@ -6177,11 +6177,10 @@ prompt for CLASS as well.  A negative prefix argument
   (format "Match %d/%d"
   (1+ index)
   length)
-  '((?  "next" "Next match")
-(?  "back" "Last match")
-(?
-  "exit" "Exit term search"
-  (?
+  '((?   "next" "Next match")
+(?   "back" "Last match")
+(?   "exit" "Exit term search"
+  (?
(setq overlays (if backward
   (cons overlay
 (reverse (cdr overlays)))
@@ -6191,7 +6190,7 @@ prompt for CLASS as well.  A negative prefix argument
index
  (mod (1+ index) length))
  backward nil))
-  (?
+  (?
(setq overlays (if backward
   (append (cdr overlays)
   (list overlay))

[nongnu] elpa/sweeprolog updated (d8ea9790b4 -> 142fba8cc7)

[ELPA Syncer]

elpasync pushed a change to branch elpa/sweeprolog.

  from  d8ea9790b4 Announce recent changes in NEWS.org and bump version to 
0.27.5
   new  4ca222305f ; * sweep.texi (Top): Fix typos in menu.
   new  c230f3fd43 Bug fix: allow "_" to appear anywhere in a Prolog 
variable's name.
   new  78d17308c9 Update tests.
   new  d3e1128ec3 Merge remote-tracking branch 
'geoffchurch/underscores-anywhere'
   new  270fad253f ; (sweeprolog--decode-numbered-variable-name): Fix 
regexp.
   new  142fba8cc7 ; Minor docstring fixes


Summary of changes:
 sweep.texi  |  4 ++--
 sweeprolog-tests.el | 15 +++
 sweeprolog.el   | 20 +++-
 3 files changed, 24 insertions(+), 15 deletions(-)

[nongnu] elpa/sweeprolog 4ca222305f 1/6: ; * sweep.texi (Top): Fix typos in menu.

[ELPA Syncer]

branch: elpa/sweeprolog
commit 4ca222305f565748c0f97b5ff8c4dd14baaccac8
Author: Eshel Yaron 
Commit: Eshel Yaron 

; * sweep.texi (Top): Fix typos in menu.
---
 sweep.texi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sweep.texi b/sweep.texi
index 406209a792..134ba9515b 100644
--- a/sweep.texi
+++ b/sweep.texi
@@ -50,8 +50,8 @@ SWI-Prolog development environment.
 
 @menu
 * Overview:: High level look at Sweep
-* Installation:: Intructions for installing sweep
-* Getting Started::  First steps with sweep
+* Installation:: Instructions for installing Sweep
+* Getting Started::  First steps with Sweep
 * Discovering Sweep::Tips for finding out about Sweep features
 * Initialization::   Functions for starting and stopping the 
embedded Prolog runtime
 * Querying Prolog::  Functions for invoking Prolog predicates and 
consuming their results

[nongnu] elpa/sweeprolog 142fba8cc7 6/6: ; Minor docstring fixes

[ELPA Syncer]

branch: elpa/sweeprolog
commit 142fba8cc7800859646a247ef5c58b7d9be0133f
Author: Eshel Yaron 
Commit: Eshel Yaron 

; Minor docstring fixes
---
 sweeprolog-tests.el | 2 +-
 sweeprolog.el   | 8 +++-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/sweeprolog-tests.el b/sweeprolog-tests.el
index 541bdce108..801e418a67 100644
--- a/sweeprolog-tests.el
+++ b/sweeprolog-tests.el
@@ -291,7 +291,7 @@ foo(Foo) :- bar.
"foo(Baz,Bar) :- spam(Bar,Baz).")))
 
 (sweeprolog-deftest increment-variable ()
-  "Tests renaming variables."
+  "Test incrementing index of numbered variables."
   "
 foo(Bar0,Bar) :-
 spam(Bar_0,Bar_1),
diff --git a/sweeprolog.el b/sweeprolog.el
index 79e3cc3ee4..73f555fc33 100644
--- a/sweeprolog.el
+++ b/sweeprolog.el
@@ -6802,12 +6802,10 @@ is the name of the variable at point, if any."
 (defvar-local sweeprolog-read-new-variable--warned nil)
 
 (defun sweeprolog--variable-name-p (string)
-  "Return t if STRING is valid Prolog variable name."
+  "Return non-nil if STRING is valid Prolog variable name."
   (save-match-data
 (let ((case-fold-search nil))
-  (not
-   (not
-(string-match (rx bos (or "_" upper) (* (or "_" alnum)) eos) 
string))
+  (string-match (rx bos (or "_" upper) (* (or "_" alnum)) eos) string
 
 (defun sweeprolog--decode-numbered-variable-name (string)
   "Decode numbered variable name STRING.
@@ -6963,7 +6961,7 @@ Interactively, OLD, NEW and POINT are nil, and VERBOSE is 
t."
   "Transient keymap activated after 
`sweeprolog-increment-numbered-variables'.")
 
 (defun sweeprolog-increment-numbered-variables (increment point &optional from)
-  "Increment numbered variables from at POINT starting with FROM.
+  "Increment numbered variables at POINT starting with FROM.
 
 FROM is either nil or a numbered varialbe (a string) that occurs
 in clause at POINT.  If it is nil, prompt for a numbered variable

[elpa] externals/fontaine 18e39174cc: Update to fontaine version 2.1.0

[ELPA Syncer]

branch: externals/fontaine
commit 18e39174cc453fd47b2b27d0f6b7a431c7be73cb
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Update to fontaine version 2.1.0
---
 CHANGELOG.org | 89 +++
 README.org| 12 +++-
 fontaine.el   |  2 +-
 3 files changed, 94 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.org b/CHANGELOG.org
index 4ed7d4dc63..30a6506ef9 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -12,6 +12,95 @@ the manual: .
 
 #+toc: headlines 1 insert TOC here, with one headline level
 
+* Version 2.1.0 on 2024-09-02
+:PROPERTIES:
+:CUSTOM_ID: h:684117cb-76c6-4a74-97ef-a37852bd3612
+:END:
+
+Fontaine is in a stable state and I find it very useful every day.
+This release includes some small quality-of-life improvements.
+
+** Use the ~fontaine-toggle-preset~ command
+:PROPERTIES:
+:CUSTOM_ID: h:ffcb3442-3f5e-4bfb-bbf6-8de6c54f1c1e
+:END:
+
+It will switch between the last preset and the one you are currently
+using. If it cannot find an older preset, it will prompt for one using
+minibuffer completion.
+
+Presets are set with the ~fontaine-set-preset~ command, either
+interactively or from Lisp (e.g. in the =init.el= file).
+
+Internally, ~fontaine-toggle-preset~ takes care to only switch between
+existing presets, so old preset names (such as from the time of some
+experiment) will be skipped if they are not part of the current value
+of ~fontaine-presets~.
+
+** All entries in the ~fontaine-presets~ accept and optional width attribute
+:PROPERTIES:
+:CUSTOM_ID: h:bf1c4be7-9366-4ce2-a166-ae43e0bce833
+:END:
+
+This is for users who need to set an explicit width value to the
+underlying face they are targeting. This, of course, depends on the
+capabilities of the font family that is used. Those that do not
+support varying widths will have no effect.
+
+The width attribute for all existing entries is composed by the name
+of the face plus the =-width= suffix, such as =:fixed-pitch-width=.
+Check the Fontaine manual for a complete example.
+
+Thanks to Adam Porter for making the suggestion to cover the width
+attribute in issue 6: .
+
+The ~fontaine-presets~ can look very long if all values are set, as we
+cover all typography-related faces and all their attributes. But do
+not let this intimidate you. Your configuration can be short and still
+highly usable. For example:
+
+#+begin_src emacs-lisp
+(setq fontaine-presets
+  '((coding ; get the fallback values and override the `:default-height'
+ :default-height 120)
+(reading  ; change more stuff from the fallback values
+ :default-height 140
+ :default-family "Fira Sans"
+ :fixed-pitch-family "Fira Mono"
+ :variable-pitch-family "Merriweather")
+(presentation
+ :inherit reading ; copy the attributes of `reading', then override 
the `:default-height'
+ :default-height 220)
+(t ; everything falls back to this
+ :default-family "Iosevka Comfy"
+ :default-height 100
+ :fixed-pitch-family "Iosevka Comfy Motion"
+ :variable-pitch-family "Iosevka Comfy Duo")))
+#+end_src
+
+With these, you can switch between =coding=, =reading=, and
+=presentation= to match your evolving workflow requirements.
+
+These allow you to switch between not only different font families,
+but also font combinations to match a certain style, with higher or
+lower heights, and so on.
+
+** The ~fontaine-set-preset~ prompt only uses relevant default presets
+:PROPERTIES:
+:CUSTOM_ID: h:4216d32e-22a9-4d17-8b05-5191a93a5ec8
+:END:
+
+When you invoke the command ~fontaine-set-preset~ it tries to find a
+previous preset to set it as the default minibuffer value. This means
+that if you press =RET= without selecting anything, the default will
+be used (check with your minibuffer package in case this does not
+happen, or contact me if you need help).
+
+Before, the default value was the last selected preset. This could be
+out-of-date though if the ~fontaine-presets~ were rewritten in the
+meantime. Now we take care to only produce a default value that is
+among those specified in the ~fontaine-presets~.
+
 * Version 2.0.0 on 2024-04-16
 :PROPERTIES:
 :CUSTOM_ID: h:1aad7179-f7cd-4817-ad23-0f9256b6df5d
diff --git a/README.org b/README.org
index 8dbd76953b..058614eaf2 100644
--- a/README.org
+++ b/README.org
@@ -4,9 +4,9 @@
 #+language: en
 #+options: ':t toc:nil author:t email:t num:t
 #+startup: content
-#+macro: stable-version 2.0.0
-#+macro: release-date 2024-04-16
-#+macro: development-version 2.0.0-dev
+#+macro: stable-version 2.1.0
+#+macro: release-date 2024-09-02
+#+macro: development-version 2.2.0-dev
 #+export_file_name: fontaine.texi
 #+texinfo_filename: fontaine.info
 #+texinfo_dir_category: Emacs misc features
@@ -66,9 +66,6 @@ modify this GNU manual.”
 :CUSTOM_ID: h:62d716b4-44f7-4078-85d2-29a7da8ca

[elpa] externals/debbugs 01ca46fd92: Fix some nits

[Michael Albinus via]

branch: externals/debbugs
commit 01ca46fd92849e932d689b0ad28dec5014e56409
Author: Michael Albinus 
Commit: Michael Albinus 

Fix some nits

* Makefile (TARGET): Filter-out debbugs-pkg.elc.

* debbugs-compat.el (main-thread): Define if it doesn't exist.
(url-http-create-request): Add an advice.

* debbugs-gnu.el (debbugs-gnu-use-threads): Fix docstring.
(debbugs-gnu-show-last-result): Print thread error if any.
(debbugs-gnu-show-reports): Use `debbugs-gnu-local-print-function'
as before.

* debbugs-org.el (debbugs-org-use-threads): Add variable alias.

* debbugs-ug.texi (Retrieving Bugs): Mention debbugs-org-use-threads.
---
 Makefile  |  3 ++-
 debbugs-compat.el | 13 +
 debbugs-gnu.el| 14 --
 debbugs-org.el|  6 ++
 debbugs-ug.texi   |  3 +++
 5 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 7d2975dedc..3d54c2c7b6 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,10 @@ EMACS ?= emacs
 
 SOURCE=$(wildcard *.el)
 TESTSOURCE=$(wildcard test/*.el)
-TARGET=$(patsubst %.el,%.elc,$(SOURCE))
+TARGET=$(filter-out debbugs-pkg.elc,$(patsubst %.el,%.elc,$(SOURCE)))
 TESTTARGET=$(patsubst %.el,%.elc,$(TESTSOURCE))
 
+
 .PHONY: all build check clean
 .PRECIOUS: %.elc
 
diff --git a/debbugs-compat.el b/debbugs-compat.el
index 96628a1921..49de171584 100644
--- a/debbugs-compat.el
+++ b/debbugs-compat.el
@@ -24,6 +24,10 @@
 ;;; Commentary:
 ;;; Code:
 
+;; `main-thread' has been added in Emacs 27.1.
+(unless (boundp 'main-thread)
+  (defconst main-thread nil))
+
 ;; Function `string-replace' is new in Emacs 28.1.
 (defalias 'debbugs-compat-string-replace
   (if (fboundp 'string-replace)
@@ -33,6 +37,15 @@
 (replace-regexp-in-string
  (regexp-quote from-string) to-string in-string t t)
 
+;; `soap-invoke-internal' let-binds `url-http-attempt-keepalives' to
+;; t, which is not thread-safe.  We override this setting.
+(defvar url-http-attempt-keepalives)
+(advice-add
+ 'url-http-create-request :around
+ (lambda (orig-fun)
+   (with-no-warnings (setq url-http-attempt-keepalives nil))
+   (funcall orig-fun)))
+
 (provide 'debbugs-compat)
 
 ;;; debbugs-compat.el ends here
diff --git a/debbugs-gnu.el b/debbugs-gnu.el
index c713bfa889..8f71c853ea 100644
--- a/debbugs-gnu.el
+++ b/debbugs-gnu.el
@@ -29,6 +29,10 @@
 ;; show and manipulate bug reports from Emacs, but it could be used
 ;; also for other GNU projects which use the same bug tracker.
 
+;; Retrieving bugs is performed in a separate thread.  This is
+;; controlled by user option `debbugs-gnu-use-threads'.  Set it to nil
+;; if you want to change this behavior.
+
 ;; The bug tracker is called interactively by
 ;;
 ;;   M-x debbugs-gnu
@@ -793,7 +797,7 @@ Shall be bound in `debbugs-org-*' functions.")
 
 (defcustom debbugs-gnu-use-threads (and main-thread t)
   "Whether to use threads when retrieving bugs.
-This doesn't when Emacs is compiled without threading support."
+This doesn't apply when Emacs is compiled without threading support."
   :type 'boolean
   :version "30.1")
 
@@ -921,6 +925,12 @@ This function assumes the variable `user-mail-address' is 
defined."
 (defun debbugs-gnu-show-last-result ()
   "Switch to buffer with the recent retrieved bugs"
   (interactive)
+  ;; `thread-last-error' has an argument since Emacs 27.1.  This
+  ;; doesn't matter, because in Emacs 26 we don't use threads.
+  (when-let ((err
+  (ignore-errors
+(with-no-warnings (funcall 'thread-last-error 'cleanup)
+(message "debbugs-gnu-show-last-result: %S" err))
   (when (ignore-errors (get-buffer debbugs-gnu-current-buffer))
 (pop-to-buffer-same-window debbugs-gnu-current-buffer)))
 
@@ -1140,7 +1150,7 @@ are taken from the cache instead."
   'append
 
 (tabulated-list-init-header)
-(funcall debbugs-gnu-current-print-function)
+(funcall debbugs-gnu-local-print-function)
 
 (set-buffer-modified-p nil)
 (goto-char (point-min
diff --git a/debbugs-org.el b/debbugs-org.el
index ebd3e24df8..629f7247cb 100644
--- a/debbugs-org.el
+++ b/debbugs-org.el
@@ -27,6 +27,10 @@
 ;; on the GNU bug tracker debbugs.gnu.org.  Its main purpose is to
 ;; show and manipulate bug reports as org-mode TODO items.
 
+;; Retrieving bugs is performed in a separate thread.  This is
+;; controlled by user option `debbugs-org-use-threads'.  Set it to nil
+;; if you want to change this behavior.
+
 ;; The bug tracker is called interactively by
 ;;
 ;;   M-x debbugs-org
@@ -132,6 +136,8 @@
 (defvar debbugs-gnu-local-query)
 (defvar debbugs-gnu-local-filter)
 
+(defvaralias 'debbugs-org-use-threads 'debbugs-gnu-use-threads)
+
 (defconst debbugs-org-severity-priority
   (let ((priority ?A))
 (mapcar
diff --git a/debbugs-ug.texi b/debbugs-ug.texi
index 9110efe132..ee7ede19e1 100644
--- a/debbugs-ug.texi
+++ b/debbugs-ug.texi
@@ -108,6 +108,9 @@ The user option @code{debbugs-gnu-use-thread

[nongnu] elpa/proof-general cfa44eec82 1/2: CI: add Coq 8.20+rc1

[ELPA Syncer]

branch: elpa/proof-general
commit cfa44eec82957cb084685c30d9000cbf9a092a6d
Author: Hendrik Tews 
Commit: Hendrik Tews 

CI: add Coq 8.20+rc1

This update required a number of manual fixes, because cipg is not yet
able to generate the right container tags for rc versions.
---
 .github/workflows/test.yml   | 27 +++
 ci/doc/README.md |  8 +---
 ci/doc/coq-emacs-releases.org|  1 +
 ci/doc/currently-used-coq-emacs-versions |  9 +
 ci/doc/currently-used-coq-nix-versions   |  1 +
 ci/tools/cipg.ml |  4 ++--
 6 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f14783b45b..3d0e4edaeb 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -140,6 +140,15 @@ jobs:
   - coq-8.19.2-emacs-29.2
   - coq-8.19.2-emacs-29.3
   - coq-8.19.2-emacs-29.4
+  - coq-8.20-rc1-emacs-26.3
+  - coq-8.20-rc1-emacs-27.1
+  - coq-8.20-rc1-emacs-27.2
+  - coq-8.20-rc1-emacs-28.1
+  - coq-8.20-rc1-emacs-28.2
+  - coq-8.20-rc1-emacs-29.1
+  - coq-8.20-rc1-emacs-29.2
+  - coq-8.20-rc1-emacs-29.3
+  - coq-8.20-rc1-emacs-29.4
   # CIPG change marker end
   # don't cancel all in-progress jobs if one matrix job fails:
   fail-fast: false
@@ -213,6 +222,15 @@ jobs:
   - coq-8.19.2-emacs-29.2
   - coq-8.19.2-emacs-29.3
   - coq-8.19.2-emacs-29.4
+  - coq-8.20-rc1-emacs-26.3
+  - coq-8.20-rc1-emacs-27.1
+  - coq-8.20-rc1-emacs-27.2
+  - coq-8.20-rc1-emacs-28.1
+  - coq-8.20-rc1-emacs-28.2
+  - coq-8.20-rc1-emacs-29.1
+  - coq-8.20-rc1-emacs-29.2
+  - coq-8.20-rc1-emacs-29.3
+  - coq-8.20-rc1-emacs-29.4
   # CIPG change marker end
   # don't cancel all in-progress jobs if one matrix job fails:
   fail-fast: false
@@ -282,6 +300,15 @@ jobs:
   - coq-8.19.2-emacs-29.2
   - coq-8.19.2-emacs-29.3
   - coq-8.19.2-emacs-29.4
+  - coq-8.20-rc1-emacs-26.3
+  - coq-8.20-rc1-emacs-27.1
+  - coq-8.20-rc1-emacs-27.2
+  - coq-8.20-rc1-emacs-28.1
+  - coq-8.20-rc1-emacs-28.2
+  - coq-8.20-rc1-emacs-29.1
+  - coq-8.20-rc1-emacs-29.2
+  - coq-8.20-rc1-emacs-29.3
+  - coq-8.20-rc1-emacs-29.4
   # CIPG change marker end
   # don't cancel all in-progress jobs if one matrix job fails:
   fail-fast: false
diff --git a/ci/doc/README.md b/ci/doc/README.md
index 4ebedd8baf..eaa6c000da 100644
--- a/ci/doc/README.md
+++ b/ci/doc/README.md
@@ -168,7 +168,7 @@ This results in
 
 
-56
+65
 
 containers.
 
@@ -189,6 +189,7 @@ containers.
 |  8.17.1 |  |  |   X  |   X  |   X  |   X  |   X  |   X  |   X  |   X 
 |   X  |
 |  8.18.0 |  |  |   X  |   X  |   X  |   X  |   X  |   X  |   X  |   X 
 |   X  |
 |  8.19.2 |  |  |   X  |   X  |   X  |   X  |   X  |   X  |   X  |   X 
 |   X  |
+|  8.20rc |  |  |   RC |   RC |   RC |   RC |   RC |   RC |   RC |   
RC |   RC |
 
 
 In the table above,
@@ -285,7 +286,7 @@ This results in
 
 
-32
+41
 
 version pairs for the Proof General interaction tests with Coq.
 
@@ -306,6 +307,7 @@ version pairs for the Proof General interaction tests with 
Coq.
 |  8.17.1 |  |  |   X  |   X  |  |  |   X  |   X  |  | 
 |   N  |
 |  8.18.0 |  |  |   X  |   X  |  |  |   X  |   X  |  | 
 |   N  |
 |  8.19.2 |  |  |   X  |   X  |   N  |   N  |   X  |   X  |   N  |   N 
 |   N  |
+|  8.20rc |  |  |   RC |   RC |   RC |   RC |   RC |   RC |   RC |   
RC |   RC |
 
 
 See [Container build strategy](#contbuild) for an explanation of the
@@ -315,7 +317,7 @@ In summary, all Proof General testing jobs run
 
 
-125
+152
 
 github checks.
 
diff --git a/ci/doc/coq-emacs-releases.org b/ci/doc/coq-emacs-releases.org
index ef67aba1d7..e313bb8b28 100644
--- a/ci/doc/coq-emacs-releases.org
+++ b/ci/doc/coq-emacs-releases.org
@@ -13,6 +13,7 @@
 
 | date|coq | emacs | distribution name | EOL  | historic |
 |-++---+---+--+--|
+| 2024/06 | 8.20rc |   |   |  |  |
 | 2024/06 | 8.19.2 |  29.4 |   |  |  |
 | 2024/03 | 8.19.1 |  29.3 |   |  |  |
 | 2024/01 | 8.19.0 |  29.2 |   |  |  |
diff --git a/ci/doc/currently-used-coq-emacs-versions 
b/ci/doc/currently-used-coq-emacs-versions
index 2ccedee92d..96a336895d 100644
--- a/ci/doc/currently-used-coq-emacs-versions
+++ b/ci/doc/currently-used-coq-emacs-versions
@@ -54,3 +54,12 @@ coq-8.19.2-emacs-29.1
 coq-8.19.2-emacs-29.2
 coq-8.19.2-emacs-29.3
 coq-8.19.2-emacs-29.4
+coq-8.20-rc1-emacs-26.3
+coq-8.20-r

[nongnu] elpa/proof-general c3e6c391e7 2/2: Merge pull request #778 from hendriktews/ci-rc

[ELPA Syncer]

branch: elpa/proof-general
commit c3e6c391e7eeb6f495327eae4fab8619fed70748
Merge: eca47ea8af cfa44eec82
Author: hendriktews 
Commit: GitHub 

Merge pull request #778 from hendriktews/ci-rc

CI: add Coq 8.20+rc1
---
 .github/workflows/test.yml   | 27 +++
 ci/doc/README.md |  8 +---
 ci/doc/coq-emacs-releases.org|  1 +
 ci/doc/currently-used-coq-emacs-versions |  9 +
 ci/doc/currently-used-coq-nix-versions   |  1 +
 ci/tools/cipg.ml |  4 ++--
 6 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f14783b45b..3d0e4edaeb 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -140,6 +140,15 @@ jobs:
   - coq-8.19.2-emacs-29.2
   - coq-8.19.2-emacs-29.3
   - coq-8.19.2-emacs-29.4
+  - coq-8.20-rc1-emacs-26.3
+  - coq-8.20-rc1-emacs-27.1
+  - coq-8.20-rc1-emacs-27.2
+  - coq-8.20-rc1-emacs-28.1
+  - coq-8.20-rc1-emacs-28.2
+  - coq-8.20-rc1-emacs-29.1
+  - coq-8.20-rc1-emacs-29.2
+  - coq-8.20-rc1-emacs-29.3
+  - coq-8.20-rc1-emacs-29.4
   # CIPG change marker end
   # don't cancel all in-progress jobs if one matrix job fails:
   fail-fast: false
@@ -213,6 +222,15 @@ jobs:
   - coq-8.19.2-emacs-29.2
   - coq-8.19.2-emacs-29.3
   - coq-8.19.2-emacs-29.4
+  - coq-8.20-rc1-emacs-26.3
+  - coq-8.20-rc1-emacs-27.1
+  - coq-8.20-rc1-emacs-27.2
+  - coq-8.20-rc1-emacs-28.1
+  - coq-8.20-rc1-emacs-28.2
+  - coq-8.20-rc1-emacs-29.1
+  - coq-8.20-rc1-emacs-29.2
+  - coq-8.20-rc1-emacs-29.3
+  - coq-8.20-rc1-emacs-29.4
   # CIPG change marker end
   # don't cancel all in-progress jobs if one matrix job fails:
   fail-fast: false
@@ -282,6 +300,15 @@ jobs:
   - coq-8.19.2-emacs-29.2
   - coq-8.19.2-emacs-29.3
   - coq-8.19.2-emacs-29.4
+  - coq-8.20-rc1-emacs-26.3
+  - coq-8.20-rc1-emacs-27.1
+  - coq-8.20-rc1-emacs-27.2
+  - coq-8.20-rc1-emacs-28.1
+  - coq-8.20-rc1-emacs-28.2
+  - coq-8.20-rc1-emacs-29.1
+  - coq-8.20-rc1-emacs-29.2
+  - coq-8.20-rc1-emacs-29.3
+  - coq-8.20-rc1-emacs-29.4
   # CIPG change marker end
   # don't cancel all in-progress jobs if one matrix job fails:
   fail-fast: false
diff --git a/ci/doc/README.md b/ci/doc/README.md
index 4ebedd8baf..eaa6c000da 100644
--- a/ci/doc/README.md
+++ b/ci/doc/README.md
@@ -168,7 +168,7 @@ This results in
 
 
-56
+65
 
 containers.
 
@@ -189,6 +189,7 @@ containers.
 |  8.17.1 |  |  |   X  |   X  |   X  |   X  |   X  |   X  |   X  |   X 
 |   X  |
 |  8.18.0 |  |  |   X  |   X  |   X  |   X  |   X  |   X  |   X  |   X 
 |   X  |
 |  8.19.2 |  |  |   X  |   X  |   X  |   X  |   X  |   X  |   X  |   X 
 |   X  |
+|  8.20rc |  |  |   RC |   RC |   RC |   RC |   RC |   RC |   RC |   
RC |   RC |
 
 
 In the table above,
@@ -285,7 +286,7 @@ This results in
 
 
-32
+41
 
 version pairs for the Proof General interaction tests with Coq.
 
@@ -306,6 +307,7 @@ version pairs for the Proof General interaction tests with 
Coq.
 |  8.17.1 |  |  |   X  |   X  |  |  |   X  |   X  |  | 
 |   N  |
 |  8.18.0 |  |  |   X  |   X  |  |  |   X  |   X  |  | 
 |   N  |
 |  8.19.2 |  |  |   X  |   X  |   N  |   N  |   X  |   X  |   N  |   N 
 |   N  |
+|  8.20rc |  |  |   RC |   RC |   RC |   RC |   RC |   RC |   RC |   
RC |   RC |
 
 
 See [Container build strategy](#contbuild) for an explanation of the
@@ -315,7 +317,7 @@ In summary, all Proof General testing jobs run
 
 
-125
+152
 
 github checks.
 
diff --git a/ci/doc/coq-emacs-releases.org b/ci/doc/coq-emacs-releases.org
index ef67aba1d7..e313bb8b28 100644
--- a/ci/doc/coq-emacs-releases.org
+++ b/ci/doc/coq-emacs-releases.org
@@ -13,6 +13,7 @@
 
 | date|coq | emacs | distribution name | EOL  | historic |
 |-++---+---+--+--|
+| 2024/06 | 8.20rc |   |   |  |  |
 | 2024/06 | 8.19.2 |  29.4 |   |  |  |
 | 2024/03 | 8.19.1 |  29.3 |   |  |  |
 | 2024/01 | 8.19.0 |  29.2 |   |  |  |
diff --git a/ci/doc/currently-used-coq-emacs-versions 
b/ci/doc/currently-used-coq-emacs-versions
index 2ccedee92d..96a336895d 100644
--- a/ci/doc/currently-used-coq-emacs-versions
+++ b/ci/doc/currently-used-coq-emacs-versions
@@ -54,3 +54,12 @@ coq-8.19.2-emacs-29.1
 coq-8.19.2-emacs-29.2
 coq-8.19.2-emacs-29.3
 coq-8.19.2-emacs-29.4
+coq-8.20-rc1-emacs-26.3
+coq-8.20-rc1-emacs-27.1
+coq-8.20-rc1-emacs-27.2
+coq-8.20-rc1-emacs-28.1
+

[nongnu] elpa/rust-mode 4686c6e5f5 2/2: Merge pull request #554 from PuercoPop/update-rustfmt-default-edition

[ELPA Syncer]

branch: elpa/rust-mode
commit 4686c6e5f5042cb2c692f022afc4d170d344deda
Merge: a529a45181 5bcc32e13f
Author: Sibi Prabakaran 
Commit: GitHub 

Merge pull request #554 from PuercoPop/update-rustfmt-default-edition

Update rustfmt's default edition: 2018 -> 2021
---
 Changelog.md| 4 
 rust-rustfmt.el | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index a1062550c2..ea4dcb12a9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,7 @@
+# Unreleased
+
+- Update rustfmt's defaults to use 2021 edition 
([#554](https://github.com/rust-lang/rust-mode/issues/509)).
+
 # v1.0.6
 
 - Add support for treesitter mode.
diff --git a/rust-rustfmt.el b/rust-rustfmt.el
index cab183c598..ba3dbe2982 100644
--- a/rust-rustfmt.el
+++ b/rust-rustfmt.el
@@ -30,7 +30,7 @@
   :type 'string
   :group 'rust-mode)
 
-(defcustom rust-rustfmt-switches '("--edition" "2018")
+(defcustom rust-rustfmt-switches '("--edition" "2021")
   "Arguments to pass when invoking the `rustfmt' executable."
   :type '(repeat string)
   :group 'rust-mode)

[nongnu] elpa/rust-mode 5bcc32e13f 1/2: Update rustfmt's default edition: 2018 -> 2021

[ELPA Syncer]

branch: elpa/rust-mode
commit 5bcc32e13fe1d5b3fd3b4a5ce0ead2c62921a1af
Author: Javier Olaechea 
Commit: Javier Olaechea 

Update rustfmt's default edition: 2018 -> 2021
---
 Changelog.md| 4 
 rust-rustfmt.el | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index a1062550c2..ea4dcb12a9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,7 @@
+# Unreleased
+
+- Update rustfmt's defaults to use 2021 edition 
([#554](https://github.com/rust-lang/rust-mode/issues/509)).
+
 # v1.0.6
 
 - Add support for treesitter mode.
diff --git a/rust-rustfmt.el b/rust-rustfmt.el
index cab183c598..ba3dbe2982 100644
--- a/rust-rustfmt.el
+++ b/rust-rustfmt.el
@@ -30,7 +30,7 @@
   :type 'string
   :group 'rust-mode)
 
-(defcustom rust-rustfmt-switches '("--edition" "2018")
+(defcustom rust-rustfmt-switches '("--edition" "2021")
   "Arguments to pass when invoking the `rustfmt' executable."
   :type '(repeat string)
   :group 'rust-mode)

[elpa] externals/phpinspect 01d42dc615 3/3: Fix compilation errors

[ELPA Syncer]

branch: externals/phpinspect
commit 01d42dc6155302f205853e99ea4aba9fc32ca3bf
Author: Hugo Thunnissen 
Commit: Hugo Thunnissen 

Fix compilation errors
---
 phpinspect-project.el | 4 ++--
 phpinspect-resolve.el | 4 ++--
 phpinspect-type.el| 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/phpinspect-project.el b/phpinspect-project.el
index eaadf64c6a..32f05609e3 100644
--- a/phpinspect-project.el
+++ b/phpinspect-project.el
@@ -117,8 +117,8 @@ serious performance hits. Enable at your own risk (:")
 (dolist (func (alist-get 'functions (cdr index)))
   (phpinspect-project-set-function project func
 
-(cl-defmethod phpinspect-project-add-index ((_project phpinspect-project) 
index)
-  (cl-assert (not index))
+(cl-defmethod phpinspect-project-add-index ((_project phpinspect-project) 
_index)
+  (cl-assert (not _index))
   (phpinspect--log "phpinspect-project-add-index: ignoring added nil index"))
 
 (cl-defmethod phpinspect-project-set-function
diff --git a/phpinspect-resolve.el b/phpinspect-resolve.el
index 31ddbaf8de..8d7b2bb05c 100644
--- a/phpinspect-resolve.el
+++ b/phpinspect-resolve.el
@@ -632,11 +632,11 @@ CLASS-TOKEN-META as parse result."
nil
 
 (cl-defmethod phpi-typedef-resolve-property-type
-  ((_typedef phpinspect-typedef) (_project phpinspect-project) property-name 
&rest _ignored)
+  ((_typedef phpinspect-typedef) (_project phpinspect-project) _property-name 
&rest _ignored)
   ;; Catch-all for cases where one attempts to resolve a nil property
   ;; name. Saves an if-statement for the caller.
   ;; Can't resolve property type when property name is nil, so we do nothing.
-  (cl-assert (not property-name))
+  (cl-assert (not _property-name))
   nil)
 
 (provide 'phpinspect-resolve)
diff --git a/phpinspect-type.el b/phpinspect-type.el
index 458ba2b190..9b42366210 100644
--- a/phpinspect-type.el
+++ b/phpinspect-type.el
@@ -274,8 +274,8 @@ NAMESPACE may be nil, or a string with a namespace FQN."
 (concat self "<" (phpinspect--format-type-name 
(phpinspect--type-format-display-name type)) ">")
   self)))
 
-(cl-defmethod phpinspect--display-format-type-name (type)
-  (cl-assert (not type))
+(cl-defmethod phpinspect--display-format-type-name (_type)
+  (cl-assert (not _type))
 
   (phpinspect--display-format-type-name "unknown-type"))
 

[elpa] externals/phpinspect updated (69f2907ebd -> 01d42dc615)

[ELPA Syncer]

elpasync pushed a change to branch externals/phpinspect.

  from  69f2907ebd Add test for suggest-variables-at-point within foreach 
block + fix bug
   new  37fbfa4114 Add test for incremental parsing of comments + fix bug 
in parser
   new  b25fdfa862 Make completion of words more context aware
   new  01d42dc615 Fix compilation errors


Summary of changes:
 phpinspect-completion.el | 28 --
 phpinspect-parser.el | 10 +---
 phpinspect-project.el|  4 ++--
 phpinspect-resolve.el|  4 ++--
 phpinspect-suggest.el| 61 
 phpinspect-type.el   | 11 ++---
 test/phpinspect-test.el  |  1 +
 test/test-buffer.el  | 16 +
 8 files changed, 123 insertions(+), 12 deletions(-)

[elpa] externals/phpinspect 37fbfa4114 1/3: Add test for incremental parsing of comments + fix bug in parser

[ELPA Syncer]

branch: externals/phpinspect
commit 37fbfa41148e5754cfb141f556b7f50fab10a7dd
Author: Hugo Thunnissen 
Commit: Hugo Thunnissen 

Add test for incremental parsing of comments + fix bug in parser
---
 phpinspect-parser.el | 10 +++---
 test/test-buffer.el  | 16 
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/phpinspect-parser.el b/phpinspect-parser.el
index 67a3fe172f..f34262f4df 100644
--- a/phpinspect-parser.el
+++ b/phpinspect-parser.el
@@ -559,9 +559,13 @@ nature like argument lists"
(forward-char 2)
doc-block))
 (t
- (let ((end-position (line-end-position)))
-   (phpinspect--parse-comment (current-buffer) end-position)
-
+ (let* ((end-position (line-end-position))
+   (token
+(phpinspect--parse-comment (current-buffer) end-position 1)))
+  ;; Move to start of next line (absorb end of line)
+  (while (not (bolp))
+(forward-char))
+  token
 
 (phpinspect-defhandler class-variable (start-token &rest _ignored)
   "Handler for tokens indicating reference to a variable"
diff --git a/test/test-buffer.el b/test/test-buffer.el
index 2c35464362..7ba157f030 100644
--- a/test/test-buffer.el
+++ b/test/test-buffer.el
@@ -810,3 +810,19 @@ class TestClass
 
(let ((method (phpi-typedef-get-method typedef "testMethod")))
  (should method))
+
+(ert-deftest phpinspect-buffer-parse-incrementally-comment ()
+(with-temp-buffer
+  (let* ((project (phpinspect--make-project :autoload 
(phpinspect-make-autoloader)))
+(buffer (phpinspect-make-buffer :buffer (current-buffer) :-project 
project)))
+   (insert "

[elpa] externals/phpinspect b25fdfa862 2/3: Make completion of words more context aware

[ELPA Syncer]

branch: externals/phpinspect
commit b25fdfa862235ea37d8418a66bb52f10e6c1cc85
Author: Hugo Thunnissen 
Commit: Hugo Thunnissen 

Make completion of words more context aware

- Implement completion of scope/static/const keywords in class bodies
- Implement completion of imported type names:
  - After "new" keyword
  - In function/class declarations
  - In property declarations
---
 phpinspect-completion.el | 28 --
 phpinspect-suggest.el| 61 
 phpinspect-type.el   |  7 +-
 test/phpinspect-test.el  |  1 +
 4 files changed, 94 insertions(+), 3 deletions(-)

diff --git a/phpinspect-completion.el b/phpinspect-completion.el
index ea951d8df1..7db48ae387 100644
--- a/phpinspect-completion.el
+++ b/phpinspect-completion.el
@@ -201,9 +201,19 @@ belonging to a token that conforms with 
`phpinspect-attrib-p'"
 (list (phpinspect-meta-start subject) (phpinspect-meta-end subject
 
 (cl-defmethod phpinspect-comp-strategy-execute
-  ((_strat phpinspect-comp-word) (_q phpinspect-completion-query)
+  ((_strat phpinspect-comp-word) (q phpinspect-completion-query)
(rctx phpinspect--resolvecontext))
-  (phpinspect-suggest-functions rctx))
+  ;; The "new" case can't be handled in the less sophisticated "suggest" lib. 
It
+  ;; is not determinable from the resolvecontext alone.
+  (if (phpinspect-new-p
+   (phpinspect-meta-token
+   (phpinspect-meta-find-left-sibling
+(phpinspect-completion-subject-at-point
+ (phpinspect-completion-query-buffer q)
+  (phpinspect-completion-query-point q)
+  #'phpinspect-word-p
+  (phpinspect-suggest-types-at-point rctx)
+(phpinspect-suggest-words-at-point rctx)))
 
 (defvar phpinspect-completion-strategies (list (phpinspect-make-comp-attribute)
(phpinspect-make-comp-sigil)
@@ -381,6 +391,13 @@ Returns list of `phpinspect--completion'."
 (cl-defmethod phpinspect--make-completion ((completion-candidate 
phpinspect-property))
   (phpinspect--make-completion (phpi-prop-definition completion-candidate)))
 
+(cl-defmethod phpinspect--make-completion ((type phpinspect--type))
+  (phpinspect--construct-completion
+   :value (propertize (phpinspect--type-bare-name type) 'face 
'font-lock-type-face)
+   :meta (phpinspect--format-type-name type)
+   :target type
+   :kind 'class))
+
 (cl-defmethod phpinspect--make-completion
   ((completion-candidate phpinspect--variable))
   (phpinspect--construct-completion
@@ -395,6 +412,13 @@ Returns list of `phpinspect--completion'."
 phpinspect--null-type)))
:kind 'variable))
 
+(cl-defmethod phpinspect--make-completion ((keyword 
phpinspect-suggest-keyword))
+  (phpinspect--construct-completion
+   :value (propertize (phpinspect-suggest-keyword-word keyword) 'face 
'font-lock-keyword-face)
+   :target keyword
+   :kind 'keyword
+   :meta "keyword"))
+
 (define-inline phpinspect--prefix-for-completion (completion)
   (inline-letevals (completion)
 (inline-quote
diff --git a/phpinspect-suggest.el b/phpinspect-suggest.el
index 24e821a8a3..4bbe806a31 100644
--- a/phpinspect-suggest.el
+++ b/phpinspect-suggest.el
@@ -75,6 +75,67 @@
 
   variable-list)))
 
+(cl-defstruct (phpinspect-suggest-keyword
+  (:constructor phpinspect-make-suggest-keyword-generated))
+  (word nil
+   :type string))
+
+(defun phpinspect-make-suggest-keyword (word)
+  (phpinspect-make-suggest-keyword-generated :word word))
+
+(defconst phpinspect-class-body-keywords (list "const" "private" "public" 
"protected" "static" "function")
+  "Keywords that can be used within a class")
+
+(defconst phpinspect-scope-body-keywords (list "function" "static")
+  "Keywords that can be used within a statement after a scope keyword.")
+
+(defconst phpinspect-static-body-keywords (list "function")
+  "Keywords that can be used within a statement after a static keyword.")
+
+(defun phpinspect-suggest-class-body-keywords ()
+  (mapcar #'phpinspect-make-suggest-keyword phpinspect-class-body-keywords))
+
+(defun phpinspect-suggest-scope-body-keywords ()
+  (mapcar #'phpinspect-make-suggest-keyword phpinspect-scope-body-keywords))
+
+(defun phpinspect-suggest-static-body-keywords ()
+  (mapcar #'phpinspect-make-suggest-keyword phpinspect-static-body-keywords))
+
+(defun phpinspect-suggest-types-at-point (rctx)
+  (let* ((resolver (phpinspect--make-type-resolver-for-resolvecontext rctx))
+(types (phpinspect-type-resolver--types resolver)))
+
+(append (mapcar #'cdr types) phpinspect-native-types)))
+
+(defun phpinspect-suggest-words-at-point (rctx)
+(let ((parent (car (phpinspect--resolvecontext-enclosing-tokens rctx
+(or (cond ((phpinspect-class-p parent)
+  (phpinspect-suggest-class-body-keywords))
+ ((phpinspect-scope-p parent)
+  (append
+   (phpinspect-suggest-scope-body-keyword

[elpa] externals/denote 4d0409d7bb 2/2: Merge pull request #425 from bryanrinders/fix-typo-readme.org

[ELPA Syncer]

branch: externals/denote
commit 4d0409d7bb452a6245443b232b25770171dc327d
Merge: 4eaa943f1b 502ee1fcf3
Author: Protesilaos Stavrou 
Commit: GitHub 

Merge pull request #425 from bryanrinders/fix-typo-readme.org

Fix typos
---
 README.org | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.org b/README.org
index e7dcbbdd86..8ec77cb2c4 100644
--- a/README.org
+++ b/README.org
@@ -3212,7 +3212,7 @@ own function and assigning it to the 
~denote-rename-buffer-function~.
 [ As part of version 2.3.0, all dynamic blocks are defined in the file
   =denote-org-extras.el=. The file which was once called
   =denote-org-dblock.el= contains aliases for the new function names
-  and dipslays a warning about its deprecation. There is no need to
+  and displays a warning about its deprecation. There is no need to
   ~require~ the ~denote-org-extras~ feature because all of Denote's
   Org dynamic blocks are autoloaded (meaning that they work as soon as
   they are used). For backward compatibility, all dynamic blocks
@@ -3252,7 +3252,7 @@ Evaluate:
 [ As part of version 2.3.0, all dynamic blocks are defined in the file
   =denote-org-extras.el=. The file which was once called
   =denote-org-dblock.el= contains aliases for the new function names
-  and dipslays a warning about its deprecation. There is no need to
+  and displays a warning about its deprecation. There is no need to
   ~require~ the ~denote-org-extras~ feature because all of Denote's
   Org dynamic blocks are autoloaded (meaning that they work as soon as
   they are used). For backward compatibility, all dynamic blocks
@@ -3400,7 +3400,7 @@ the heading 
([[#h:fc1ad245-ec08-41be-8d1e-7153d99daf02][Insert link to an Org fi
 [ As part of version 2.3.0, all dynamic blocks are defined in the file
   =denote-org-extras.el=. The file which was once called
   =denote-org-dblock.el= contains aliases for the new function names
-  and dipslays a warning about its deprecation. There is no need to
+  and displays a warning about its deprecation. There is no need to
   ~require~ the ~denote-org-extras~ feature because all of Denote's
   Org dynamic blocks are autoloaded (meaning that they work as soon as
   they are used). For backward compatibility, all dynamic blocks

[elpa] externals/denote 502ee1fcf3 1/2: fix typos

[ELPA Syncer]

branch: externals/denote
commit 502ee1fcf3892859d6ae99d2c6c37ed6cec85f55
Author: bryanrinders <157743430+bryanrind...@users.noreply.github.com>
Commit: GitHub 

fix typos
---
 README.org | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.org b/README.org
index e7dcbbdd86..8ec77cb2c4 100644
--- a/README.org
+++ b/README.org
@@ -3212,7 +3212,7 @@ own function and assigning it to the 
~denote-rename-buffer-function~.
 [ As part of version 2.3.0, all dynamic blocks are defined in the file
   =denote-org-extras.el=. The file which was once called
   =denote-org-dblock.el= contains aliases for the new function names
-  and dipslays a warning about its deprecation. There is no need to
+  and displays a warning about its deprecation. There is no need to
   ~require~ the ~denote-org-extras~ feature because all of Denote's
   Org dynamic blocks are autoloaded (meaning that they work as soon as
   they are used). For backward compatibility, all dynamic blocks
@@ -3252,7 +3252,7 @@ Evaluate:
 [ As part of version 2.3.0, all dynamic blocks are defined in the file
   =denote-org-extras.el=. The file which was once called
   =denote-org-dblock.el= contains aliases for the new function names
-  and dipslays a warning about its deprecation. There is no need to
+  and displays a warning about its deprecation. There is no need to
   ~require~ the ~denote-org-extras~ feature because all of Denote's
   Org dynamic blocks are autoloaded (meaning that they work as soon as
   they are used). For backward compatibility, all dynamic blocks
@@ -3400,7 +3400,7 @@ the heading 
([[#h:fc1ad245-ec08-41be-8d1e-7153d99daf02][Insert link to an Org fi
 [ As part of version 2.3.0, all dynamic blocks are defined in the file
   =denote-org-extras.el=. The file which was once called
   =denote-org-dblock.el= contains aliases for the new function names
-  and dipslays a warning about its deprecation. There is no need to
+  and displays a warning about its deprecation. There is no need to
   ~require~ the ~denote-org-extras~ feature because all of Denote's
   Org dynamic blocks are autoloaded (meaning that they work as soon as
   they are used). For backward compatibility, all dynamic blocks

[elpa] externals/corfu updated (921dd7c97e -> 98026a98a6)

[ELPA Syncer]

elpasync pushed a change to branch externals/corfu.

  from  921dd7c97e README: Use :config block
   new  98b94fc104 README update
   new  98026a98a6 README rewording


Summary of changes:
 README.org | 20 +---
 1 file changed, 9 insertions(+), 11 deletions(-)

[elpa] externals/corfu 98b94fc104 1/2: README update

[ELPA Syncer]

branch: externals/corfu
commit 98b94fc104cd1e6d72904c69be66ca5ab6bde2db
Author: Daniel Mendler 
Commit: Daniel Mendler 

README update
---
 README.org | 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/README.org b/README.org
index 9f838a4b1f..103a3c53ee 100644
--- a/README.org
+++ b/README.org
@@ -180,8 +180,7 @@ default completion styles. The use of Orderless is not a 
necessity.
 ;; Optionally use the `orderless' completion style.
 (use-package orderless
   :custom
-  ;; Configure a custom style dispatcher (see the Consult wiki)
-  ;; (orderless-style-dispatchers '(+orderless-dispatch))
+  ;; (orderless-style-dispatchers '(orderless-affix-dispatch))
   ;; (orderless-component-separator #'orderless-escapable-split-on-space)
   (completion-styles '(orderless basic))
   (completion-category-defaults nil)
@@ -191,11 +190,10 @@ default completion styles. The use of Orderless is not a 
necessity.
 The =basic= completion style is specified as fallback in addition to 
=orderless= in
 order to ensure that completion commands which rely on dynamic completion
 tables, e.g., ~completion-table-dynamic~ or ~completion-table-in-turn~, work
-correctly. See =+orderless-dispatch= in the 
[[https://github.com/minad/consult/wiki][Consult wiki]] for an advanced 
Orderless
-style dispatcher. Additionally enable =partial-completion= for file path
-expansion. =partial-completion= is important for file wildcard support. 
Multiple
-files can be opened at once with =find-file= if you enter a wildcard. You may 
also
-give the =initials= completion style a try.
+correctly. Additionally enable =partial-completion= for file path expansion.
+=partial-completion= is important for file wildcard support. Multiple files 
can be
+opened at once with =find-file= if you enter a wildcard. You may also give the
+=initials= completion style a try.
 
 See also the [[https://github.com/minad/corfu/wiki][Corfu Wiki]] and the 
[[https://github.com/minad/cape][Cape manual]] for additional Capf configuration
 tips. For more general documentation read the chapter about completion in the

[elpa] externals/corfu 98026a98a6 2/2: README rewording

[ELPA Syncer]

branch: externals/corfu
commit 98026a98a6f74220fac8d79afd523454fceaa468
Author: Daniel Mendler 
Commit: Daniel Mendler 

README rewording
---
 README.org | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.org b/README.org
index 103a3c53ee..8674147745 100644
--- a/README.org
+++ b/README.org
@@ -171,10 +171,10 @@ completion at point function provided by my 
[[https://github.com/minad/cape][Cap
   (add-to-list 'dabbrev-ignored-buffer-modes 'tags-table-mode))
 #+end_src
 
-If you start to configure the package more deeply, I recommend to give the
-Orderless completion style a try for filtering. Orderless completion is
-different from the familiar prefix TAB completion. Corfu can be used with the
-default completion styles. The use of Orderless is not a necessity.
+If you start to configure Corfu more deeply, I recommend to give the Orderless
+completion style a try for filtering. Orderless completion is different from 
the
+familiar prefix TAB completion. Note that Orderless is not a necessity; Corfu
+can be used as well with the default completion styles.
 
 #+begin_src emacs-lisp
 ;; Optionally use the `orderless' completion style.

[elpa] externals/phpinspect 7d75e95355 2/3: Bump version to 2.0.1

[ELPA Syncer]

branch: externals/phpinspect
commit 7d75e95355a04a2b3c26c3be43ff40eb4f28fd65
Author: Hugo Thunnissen 
Commit: Hugo Thunnissen 

Bump version to 2.0.1
---
 phpinspect-autoload.el | 2 +-
 phpinspect-bmap.el | 2 +-
 phpinspect-buffer.el   | 2 +-
 phpinspect-cache.el| 2 +-
 phpinspect-changeset.el| 2 +-
 phpinspect-completion.el   | 2 +-
 phpinspect-edtrack.el  | 2 +-
 phpinspect-eldoc.el| 2 +-
 phpinspect-fs.el   | 2 +-
 phpinspect-imports.el  | 2 +-
 phpinspect-index.el| 2 +-
 phpinspect-meta.el | 2 +-
 phpinspect-method-cell.el  | 2 +-
 phpinspect-parse-context.el| 2 +-
 phpinspect-parser.el   | 2 +-
 phpinspect-pipeline.el | 2 +-
 phpinspect-project-struct.el   | 2 +-
 phpinspect-project.el  | 2 +-
 phpinspect-property-cell.el| 2 +-
 phpinspect-queue.el| 2 +-
 phpinspect-resolve.el  | 2 +-
 phpinspect-resolvecontext.el   | 2 +-
 phpinspect-serialize.el| 2 +-
 phpinspect-splayt.el   | 2 +-
 phpinspect-suggest.el  | 2 +-
 phpinspect-toc.el  | 2 +-
 phpinspect-token-predicates.el | 2 +-
 phpinspect-type.el | 2 +-
 phpinspect-typedef.el  | 2 +-
 phpinspect-util.el | 2 +-
 phpinspect-worker.el   | 2 +-
 phpinspect.el  | 9 +++--
 32 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/phpinspect-autoload.el b/phpinspect-autoload.el
index c23fcf8ac8..76648a8b3d 100644
--- a/phpinspect-autoload.el
+++ b/phpinspect-autoload.el
@@ -4,7 +4,7 @@
 
 ;; Author: Hugo Thunnissen 
 ;; Keywords: php, languages, tools, convenience
-;; Version: 2.0.0
+;; Version: 2.0.1
 
 ;; 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
diff --git a/phpinspect-bmap.el b/phpinspect-bmap.el
index d73f69428a..f1e2c9671f 100644
--- a/phpinspect-bmap.el
+++ b/phpinspect-bmap.el
@@ -4,7 +4,7 @@
 
 ;; Author: Hugo Thunnissen 
 ;; Keywords: php, languages, tools, convenience
-;; Version: 2.0.0
+;; Version: 2.0.1
 
 ;; 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
diff --git a/phpinspect-buffer.el b/phpinspect-buffer.el
index 297f35976e..9f789d13b8 100644
--- a/phpinspect-buffer.el
+++ b/phpinspect-buffer.el
@@ -4,7 +4,7 @@
 
 ;; Author: Hugo Thunnissen 
 ;; Keywords: php, languages, tools, convenience
-;; Version: 2.0.0
+;; Version: 2.0.1
 
 ;; 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
diff --git a/phpinspect-cache.el b/phpinspect-cache.el
index c2b561116c..06edd32284 100644
--- a/phpinspect-cache.el
+++ b/phpinspect-cache.el
@@ -4,7 +4,7 @@
 
 ;; Author: Hugo Thunnissen 
 ;; Keywords: php, languages, tools, convenience
-;; Version: 2.0.0
+;; Version: 2.0.1
 
 ;; 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
diff --git a/phpinspect-changeset.el b/phpinspect-changeset.el
index 9f143a7b2e..e51b1b7a88 100644
--- a/phpinspect-changeset.el
+++ b/phpinspect-changeset.el
@@ -4,7 +4,7 @@
 
 ;; Author: Hugo Thunnissen 
 ;; Keywords: php, languages, tools, convenience
-;; Version: 2.0.0
+;; Version: 2.0.1
 
 ;; 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
diff --git a/phpinspect-completion.el b/phpinspect-completion.el
index e5a5672b9f..ea951d8df1 100644
--- a/phpinspect-completion.el
+++ b/phpinspect-completion.el
@@ -4,7 +4,7 @@
 
 ;; Author: Hugo Thunnissen 
 ;; Keywords: php, languages, tools, convenience
-;; Version: 2.0.0
+;; Version: 2.0.1
 
 ;; 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
diff --git a/phpinspect-edtrack.el b/phpinspect-edtrack.el
index 7f88d18663..35022a1f8d 100644
--- a/phpinspect-edtrack.el
+++ b/phpinspect-edtrack.el
@@ -4,7 +4,7 @@
 
 ;; Author: Hugo Thunnissen 
 ;; Keywords: php, languages, tools, convenience
-;; Version: 2.0.0
+;; Version: 2.0.1
 
 ;; 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
diff --git a/phpinspect-eldoc.el b/phpinspect-eldoc.el
index 2365961dfe..9143621c04 100644
--- a/phpinspect-eldoc.el
+++ b/phpinspect-eldoc.el
@@ -4,7 +4,7 @@
 
 ;; Author: Hugo Thunnissen 
 ;; Keywords: php, languages, tools, convenience
-;; Version: 2.0.0
+;; Version: 2.0.1
 
 ;; 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
diff --git a/phpinspect-fs.el b/phpinspect-fs.el
index 6ee686ce51..e61c441f5

[elpa] externals/phpinspect 69f2907ebd 3/3: Add test for suggest-variables-at-point within foreach block + fix bug

[ELPA Syncer]

branch: externals/phpinspect
commit 69f2907ebd6edb976f7d63f73ec42566dd30ed3e
Author: Hugo Thunnissen 
Commit: Hugo Thunnissen 

Add test for suggest-variables-at-point within foreach block + fix bug
---
 phpinspect-suggest.el |  2 +-
 test/test-fs.el   |  2 +-
 test/test-suggest.el  | 46 ++
 3 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/phpinspect-suggest.el b/phpinspect-suggest.el
index 98ebfec1b0..24e821a8a3 100644
--- a/phpinspect-suggest.el
+++ b/phpinspect-suggest.el
@@ -57,7 +57,7 @@
  (puthash (cadr argument)
   (phpinspect--make-variable :name (cadr argument))
   variables
-((phpinspect-block-p potential-variable)
+((phpinspect-block-or-list-p potential-variable)
  (dolist (nested-token (cdr potential-variable))
(push nested-token token-list
 
diff --git a/test/test-fs.el b/test/test-fs.el
index baec5c4f79..8d10b87da7 100644
--- a/test/test-fs.el
+++ b/test/test-fs.el
@@ -1,4 +1,4 @@
-;;; test-autoload.el --- Unit tests for phpinspect.el  -*- lexical-binding: t; 
-*-
+;;; test-fs.el --- Unit tests for phpinspect.el  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2021-2023 Free Software Foundation, Inc.
 
diff --git a/test/test-suggest.el b/test/test-suggest.el
new file mode 100644
index 00..eee25279f5
--- /dev/null
+++ b/test/test-suggest.el
@@ -0,0 +1,46 @@
+;;; test-suggest.el --- Unit tests for phpinspect-suggest.el  -*- 
lexical-binding: t; -*-
+
+;; Copyright (C) 2021-2023 Free Software Foundation, Inc.
+
+;; Author: Hugo Thunnissen 
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see .
+
+;;; Commentary:
+
+;;
+
+;;; Code:
+
+(require 'phpinspect-suggest)
+(require 'phpinspect-buffer)
+(require 'ert)
+
+(require 'phpinspect-test-env
+ (expand-file-name "phpinspect-test-env.el"
+   (file-name-directory (macroexp-file-name
+
+(ert-deftest phpinspect-suggest-variables-at-point-foreach ()
+  (with-temp-buffer
+(insert " $value) {")
+
+(let* ((buffer (phpinspect-make-buffer :buffer (current-buffer)))
+
+  (rctx (phpinspect-get-resolvecontext
+ (phpinspect--make-dummy-project) (phpinspect-buffer-parse-map 
buffer) (point)))
+  (variables (phpinspect-suggest-variables-at-point rctx)))
+
+  (should (length= variables 3))
+  (should (equal (list "array" "key" "value")
+(sort (mapcar #'phpi-var-name variables) #'string<))

[elpa] externals/phpinspect 83b55ce1ee 1/3: Add test for behaviour of `phpinspect-imports-remove-unused' variable + fix bug

[ELPA Syncer]

branch: externals/phpinspect
commit 83b55ce1eeed4223f1e787a0315b0c9ade6ab6f7
Author: Hugo Thunnissen 
Commit: Hugo Thunnissen 

Add test for behaviour of `phpinspect-imports-remove-unused' variable + fix 
bug
---
 phpinspect-imports.el | 10 +-
 test/test-imports.el  | 37 +
 2 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/phpinspect-imports.el b/phpinspect-imports.el
index 2537067af7..25c8c949d7 100644
--- a/phpinspect-imports.el
+++ b/phpinspect-imports.el
@@ -386,12 +386,12 @@ that there are import (\"use\") statements for them."
 (unless token-meta
   (error "Unable to find token for namespace %s" namespace-name))
 
-   (when phpinspect-imports-remove-unused
-  (phpinspect-add-use-statements-for-missing-types
-   used-types buffer (append imports namespace-imports) project 
token-meta))
+(phpinspect-add-use-statements-for-missing-types
+ used-types buffer (append imports namespace-imports) project 
token-meta)
 
-;; (phpinspect-remove-unneeded-use-statements
-;;  used-types buffer (append imports namespace-imports) 
token-meta)
+   (when phpinspect-imports-remove-unused
+  (phpinspect-remove-unneeded-use-statements
+   used-types buffer (append imports namespace-imports) 
token-meta))
 
 (let ((parent (phpinspect-meta-find-parent-matching-token
token-meta #'phpinspect-namespace-or-root-p)))
diff --git a/test/test-imports.el b/test/test-imports.el
index 3fa4cff74c..d0c9c9be90 100644
--- a/test/test-imports.el
+++ b/test/test-imports.el
@@ -63,6 +63,43 @@ class Baz {
 }"
  (buffer-string)))
 
+(ert-deftest phpinspect-fix-imports-no-remove-unused ()
+  (dlet ((phpinspect-imports-remove-unused nil))
+(let ((project (phpinspect--make-dummy-composer-project)))
+  (with-temp-buffer
+   (let* ((buffer (phpinspect-make-buffer :buffer (current-buffer)
+   :-project project)))
+
+  (insert "

[elpa] externals/phpinspect updated (95a29a3982 -> 69f2907ebd)

[ELPA Syncer]

elpasync pushed a change to branch externals/phpinspect.

  from  95a29a3982 Bump version to 2.0.0
   new  83b55ce1ee Add test for behaviour of 
`phpinspect-imports-remove-unused' variable + fix bug
   new  7d75e95355 Bump version to 2.0.1
   new  69f2907ebd Add test for suggest-variables-at-point within foreach 
block + fix bug


Summary of changes:
 phpinspect-autoload.el |  2 +-
 phpinspect-bmap.el |  2 +-
 phpinspect-buffer.el   |  2 +-
 phpinspect-cache.el|  2 +-
 phpinspect-changeset.el|  2 +-
 phpinspect-completion.el   |  2 +-
 phpinspect-edtrack.el  |  2 +-
 phpinspect-eldoc.el|  2 +-
 phpinspect-fs.el   |  2 +-
 phpinspect-imports.el  | 12 +--
 phpinspect-index.el|  2 +-
 phpinspect-meta.el |  2 +-
 phpinspect-method-cell.el  |  2 +-
 phpinspect-parse-context.el|  2 +-
 phpinspect-parser.el   |  2 +-
 phpinspect-pipeline.el |  2 +-
 phpinspect-project-struct.el   |  2 +-
 phpinspect-project.el  |  2 +-
 phpinspect-property-cell.el|  2 +-
 phpinspect-queue.el|  2 +-
 phpinspect-resolve.el  |  2 +-
 phpinspect-resolvecontext.el   |  2 +-
 phpinspect-serialize.el|  2 +-
 phpinspect-splayt.el   |  2 +-
 phpinspect-suggest.el  |  4 ++--
 phpinspect-toc.el  |  2 +-
 phpinspect-token-predicates.el |  2 +-
 phpinspect-type.el |  2 +-
 phpinspect-typedef.el  |  2 +-
 phpinspect-util.el |  2 +-
 phpinspect-worker.el   |  2 +-
 phpinspect.el  |  9 +++--
 test/test-fs.el|  2 +-
 test/test-imports.el   | 37 +
 test/test-suggest.el   | 46 ++
 35 files changed, 128 insertions(+), 40 deletions(-)
 create mode 100644 test/test-suggest.el