[elpa] externals/org 26a2811b06: org-cite-basic-export-bibliography: Skip missing bibliography keys

[ELPA Syncer]

branch: externals/org
commit 26a2811b06a5916a66d101b10238552db12ff6e7
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

org-cite-basic-export-bibliography: Skip missing bibliography keys

* lisp/oc-basic.el (org-cite-basic-export-bibliography): Ignore
citation keys that are not present in bibliography.  Previously, an
error was thrown.
---
 lisp/oc-basic.el | 20 +++-
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/lisp/oc-basic.el b/lisp/oc-basic.el
index f1b7c8263c..3ef7a37e3b 100644
--- a/lisp/oc-basic.el
+++ b/lisp/oc-basic.el
@@ -713,15 +713,17 @@ KEYS is the list of cited keys, as strings.  STYLE is the 
expected bibliography
 style, as a string.  BACKEND is the export back-end, as a symbol.  INFO is the
 export state, as a property list."
   (mapconcat
-   (lambda (k)
- (let ((entry (org-cite-basic--get-entry k info)))
-   (org-export-data
-(org-cite-make-paragraph
- (and (org-export-derived-backend-p backend 'latex)
-  (org-export-raw-string "\\noindent\n"))
- (org-cite-basic--print-entry entry style info))
-info)))
-   (org-cite-basic--sort-keys keys info)
+   (lambda (entry)
+ (org-export-data
+  (org-cite-make-paragraph
+   (and (org-export-derived-backend-p backend 'latex)
+(org-export-raw-string "\\noindent\n"))
+   (org-cite-basic--print-entry entry style info))
+  info))
+   (delq nil
+ (mapcar
+  (lambda (k) (org-cite-basic--get-entry k info))
+  (org-cite-basic--sort-keys keys info)))
"\n"))
 
 

[elpa] externals/gpr-mode 24e67684df: Fix header comment style

[Stephen Leake]

branch: externals/gpr-mode
commit 24e67684dfacd4b12e4d5792361f5fc8bb2c2f7f
Author: Stephen Leake 
Commit: Stephen Leake 

Fix header comment style

* gpr-indent-user-options.el: Fix header comment style.
* gpr-mode.el:
* gpr-skel.el:

* prj-eglot.el: Delete.
---
 gpr-indent-user-options.el |  4 ++--
 gpr-mode.el|  2 +-
 gpr-skel.el|  4 ++--
 prj-eglot.el   | 40 
 4 files changed, 5 insertions(+), 45 deletions(-)

diff --git a/gpr-indent-user-options.el b/gpr-indent-user-options.el
index 174a5ebc0b..b724ad274b 100644
--- a/gpr-indent-user-options.el
+++ b/gpr-indent-user-options.el
@@ -1,4 +1,4 @@
-;; user options shared by gpr mode indentation engines  -*- lexical-binding:t 
-*-
+;;; user options shared by gpr mode indentation engines  -*- lexical-binding:t 
-*-
 ;;
 ;; Copyright (C) 2017, 2019  Free Software Foundation, Inc.
 ;;
@@ -45,4 +45,4 @@
 
 (provide 'gpr-indent-user-options)
 
-;; end file
+;; gpr-indent-user-options.el ends here
diff --git a/gpr-mode.el b/gpr-mode.el
index d5b7db2ba7..00094469a6 100644
--- a/gpr-mode.el
+++ b/gpr-mode.el
@@ -1,4 +1,4 @@
-;; gpr-mode --- Major mode for editing GNAT project files  -*- 
lexical-binding:t -*-
+;;; gpr-mode --- Major mode for editing GNAT project files  -*- 
lexical-binding:t -*-
 
 ;; Copyright (C) 2004, 2007, 2008, 2012-2015, 2017 - 2020, 2022  Free Software 
Foundation, Inc.
 
diff --git a/gpr-skel.el b/gpr-skel.el
index 9a53364fcf..599fadcb5e 100644
--- a/gpr-skel.el
+++ b/gpr-skel.el
@@ -1,4 +1,4 @@
-;; gpr-skel.el --- Extension to gpr-mode for inserting statement skeletons  
-*- lexical-binding:t -*-
+;;; gpr-skel.el --- Extension to gpr-mode for inserting statement skeletons  
-*- lexical-binding:t -*-
 
 ;; Copyright (C) 2013-2015, 2018 - 2021 Free Software Foundation, Inc.
 
@@ -134,4 +134,4 @@ Each user will probably want to override this."
 (add-hook 'gpr-mode-hook #'gpr-skel-setup)
 
 (provide 'gpr-skel)
-;;; end of file
+;;; gpr-skel.el ends here
diff --git a/prj-eglot.el b/prj-eglot.el
deleted file mode 100644
index a88589f730..00
--- a/prj-eglot.el
+++ /dev/null
@@ -1,40 +0,0 @@
-;; project settings for building gpr-mode with Alire/editing with eglot -*- 
no-byte-compile : t -*-
-
-(require 'ada-mode)
-;; This require is not needed for the following code, but is needed to
-;; ensure ada-mode-hook has sal-ada-mode-setup.
-
-(setq ada-indent-engine 'wisi) ;; ada_language_server 22.0 doesn't support 
RangeFormatting
-
-(setq ada-xref-tool 'eglot)
-
-(add-hook 'ada-mode-hook #'ada-eglot-setup)
-
-(let* ((gpr-file (expand-file-name "emacs_gpr_mode.gpr" (file-name-directory 
load-file-name)))
-   (prj-file (expand-file-name "prj-eglot.prj" (file-name-directory 
load-file-name)))
-   (eglot-workspace-configuration (list `(ada (projectFile . ,gpr-file
-
-   (project
-   (create-alire-project
-:prj-name "gpr-mode main Alire eglot"
-:prj-file prj-file
-:gpr-file gpr-file)))
-
-  (wisi-prj-select-cache prj-file nil "Makefile")
-
-  ;; ada_language_server gets GPR_PROJECT_PATH from its process
-  ;; environment, and the gpr file from eglot-workspace-configuration.
-  (let ((process-environment
-(append
- (copy-sequence process-environment)
- (wisi-prj-compile-env project)
- (wisi-prj-file-env project
-
-(eglot 'ada-mode ;; managed-major-mode
-  project ;; project; project-root is server process directory
-  'eglot-lsp-server ;; class
-  'gnat-find-als ;; contact
-  "Ada" ;; language-id
-  ))
-  )
-;; end of file

[nongnu] elpa/haskell-mode 57d249c043 3/4: Merge pull request #1791 from syohex/obsoleted

[ELPA Syncer]

branch: elpa/haskell-mode
commit 57d249c043e83e81b902deac7bf6c29531f58475
Merge: 90503413f4 fb2d922399
Author: Steve Purcell 
Commit: GitHub 

Merge pull request #1791 from syohex/obsoleted

Replace obsoleted functions
---
 haskell-collapse.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/haskell-collapse.el b/haskell-collapse.el
index 8a73fa3887..8c4d7906f5 100644
--- a/haskell-collapse.el
+++ b/haskell-collapse.el
@@ -43,7 +43,7 @@
   "Returns `t' if line is empty or composed only of whitespace."
   (save-excursion
 (beginning-of-line)
-(= (point-at-eol)
+(= (line-end-position)
(progn (skip-chars-forward "[:blank:]") (point)
 
 (defun haskell-indented-block ()
@@ -92,7 +92,7 @@ indentation if dir=-1"
   (save-excursion
 (goto-char (point-max))
 (while (zerop (forward-line -1))
-  (goto-char (point-at-bol))
+  (goto-char (line-beginning-position))
   (when (= (current-indentation) 0) (haskell-hide-toggle)
 
 (defvar haskell-collapse-mode-map

[nongnu] elpa/haskell-mode fb2d922399 2/4: Replace obsoleted functions

[ELPA Syncer]

branch: elpa/haskell-mode
commit fb2d922399933348df9921f209d0612815e05d86
Author: Shohei YOSHIDA 
Commit: Shohei YOSHIDA 

Replace obsoleted functions

point-at-bol and point-at-eol will be obsoleted since Emacs 29.1
---
 haskell-collapse.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/haskell-collapse.el b/haskell-collapse.el
index 8a73fa3887..8c4d7906f5 100644
--- a/haskell-collapse.el
+++ b/haskell-collapse.el
@@ -43,7 +43,7 @@
   "Returns `t' if line is empty or composed only of whitespace."
   (save-excursion
 (beginning-of-line)
-(= (point-at-eol)
+(= (line-end-position)
(progn (skip-chars-forward "[:blank:]") (point)
 
 (defun haskell-indented-block ()
@@ -92,7 +92,7 @@ indentation if dir=-1"
   (save-excursion
 (goto-char (point-max))
 (while (zerop (forward-line -1))
-  (goto-char (point-at-bol))
+  (goto-char (line-beginning-position))
   (when (= (current-indentation) 0) (haskell-hide-toggle)
 
 (defvar haskell-collapse-mode-map

[nongnu] elpa/haskell-mode 03e2e8577b 1/4: Remove needless quotes from keylist of case macro

[ELPA Syncer]

branch: elpa/haskell-mode
commit 03e2e8577b797b7dafed88b27734b243a6da31b6
Author: Shohei YOSHIDA 
Commit: Shohei YOSHIDA 

Remove needless quotes from keylist of case macro
---
 haskell-cabal.el   |  6 +++---
 haskell-commands.el|  6 +++---
 haskell-completions.el |  6 +++---
 haskell-load.el| 12 ++--
 haskell-process.el |  6 +++---
 inf-haskell.el | 16 
 6 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/haskell-cabal.el b/haskell-cabal.el
index 1ef8091d3e..026d56b95e 100644
--- a/haskell-cabal.el
+++ b/haskell-cabal.el
@@ -702,7 +702,7 @@ Respect the COMMA-STYLE, see
 `haskell-cabal-strip-list-and-detect-style' for the possible
 styles."
   (cl-case comma-style
-('before
+(before
  (goto-char (point-min))
  (while (haskell-cabal-ignore-line-p) (forward-line))
  (indent-to 2)
@@ -710,14 +710,14 @@ styles."
  (haskell-cabal-each-line
   (unless (haskell-cabal-ignore-line-p)
 (insert ", "
-('after
+(after
  (goto-char (point-max))
  (while (equal 0 (forward-line -1))
(unless (haskell-cabal-ignore-line-p)
  (end-of-line)
  (insert ",")
  (beginning-of-line
-('single
+(single
  (goto-char (point-min))
  (while (not (eobp))
(end-of-line)
diff --git a/haskell-commands.el b/haskell-commands.el
index 0cacb376b4..f9ed3da4cf 100644
--- a/haskell-commands.el
+++ b/haskell-commands.el
@@ -653,11 +653,11 @@ happened since function invocation)."
   (cl-case res-type
 ;; neither popup presentation buffer
 ;; nor insert response in error case
-('unknown-command
+(unknown-command
  (message "This command requires GHCi 8+ or GHCi-ng. Please read 
command description for details."))
-('option-missing
+(option-missing
  (message "Could not infer type signature. You need to load file 
first. Also :set +c is required, see customization 
`haskell-interactive-set-+c'. Please read command description for details."))
-('interactive-error (message "Wrong REPL response: %s" sig))
+(interactive-error (message "Wrong REPL response: %s" sig))
 (otherwise
  (if insert-value
  ;; Only insert type signature and do not present it
diff --git a/haskell-completions.el b/haskell-completions.el
index 8585b14bac..3fd75023fb 100644
--- a/haskell-completions.el
+++ b/haskell-completions.el
@@ -308,11 +308,11 @@ PREFIX should be a list such one returned by
 (when (not (eql typ 'haskell-completions-general-prefix))
   (let ((candidates
  (cl-case typ
-   ('haskell-completions-pragma-name-prefix
+   (haskell-completions-pragma-name-prefix
 haskell-completions--pragma-names)
-   ('haskell-completions-ghc-option-prefix
+   (haskell-completions-ghc-option-prefix
 haskell-ghc-supported-options)
-   ('haskell-completions-language-extension-prefix
+   (haskell-completions-language-extension-prefix
 haskell-ghc-supported-extensions)
(otherwise
 (append (when (bound-and-true-p haskell-tags-on-save)
diff --git a/haskell-load.el b/haskell-load.el
index f43fd863c8..d6a9f0f003 100644
--- a/haskell-load.el
+++ b/haskell-load.el
@@ -265,9 +265,9 @@ list of modules where missed IDENT was found."
  (get-buffer-create "*haskell-process-log*"))
   (switch-to-buffer-other-window (get-buffer "*haskell-process-log*")))
  (t (let ((app-name (cl-ecase (haskell-process-type)
-  ('ghci haskell-process-path-cabal)
-  ('cabal-repl haskell-process-path-cabal)
-  ('stack-ghci haskell-process-path-stack
+  (ghci haskell-process-path-cabal)
+  (cabal-repl haskell-process-path-cabal)
+  (stack-ghci haskell-process-path-stack
   (haskell-process-queue-command
process
(make-haskell-command
@@ -566,12 +566,12 @@ When MODULE-BUFFER is non-NIL, paint error overlays."
   "Show the '(Compiling|Loading) X' message."
   (let ((msg (concat
   (cl-ecase type
-('compiling
+(compiling
  (if haskell-interactive-mode-include-file-name
  (format "Compiling: %s (%s)" module-name file-name)
(format "Compiling: %s" module-name)))
-('loading (format "Loading: %s" module-name))
-('import-cycle
+(loading (format "Loading: %s" module-name))
+(import-cycle
  (format "Module has an import cycle: %s" module-name)))
   (if th " [TH]" ""
 (haskell-mode-message-line msg)
diff --git a/haskel

[nongnu] elpa/haskell-mode updated (90503413f4 -> 910800d537)

[ELPA Syncer]

elpasync pushed a change to branch elpa/haskell-mode.

  from  90503413f4 Merge pull request #1784 from 
VitalyAnkh/fix_cl_case_error
   new  fb2d922399 Replace obsoleted functions
   new  57d249c043 Merge pull request #1791 from syohex/obsoleted
   new  03e2e8577b Remove needless quotes from keylist of case macro
   new  910800d537 Merge pull request #1790 from syohex/needless-quote


Summary of changes:
 haskell-cabal.el   |  6 +++---
 haskell-collapse.el|  4 ++--
 haskell-commands.el|  6 +++---
 haskell-completions.el |  6 +++---
 haskell-load.el| 12 ++--
 haskell-process.el |  6 +++---
 inf-haskell.el | 16 
 7 files changed, 28 insertions(+), 28 deletions(-)

[nongnu] elpa/haskell-mode 910800d537 4/4: Merge pull request #1790 from syohex/needless-quote

[ELPA Syncer]

branch: elpa/haskell-mode
commit 910800d53774b80d7448f4addfd2d82975d3a482
Merge: 57d249c043 03e2e8577b
Author: Steve Purcell 
Commit: GitHub 

Merge pull request #1790 from syohex/needless-quote

Remove needless quotes from keylist of case macro
---
 haskell-cabal.el   |  6 +++---
 haskell-commands.el|  6 +++---
 haskell-completions.el |  6 +++---
 haskell-load.el| 12 ++--
 haskell-process.el |  6 +++---
 inf-haskell.el | 16 
 6 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/haskell-cabal.el b/haskell-cabal.el
index 1ef8091d3e..026d56b95e 100644
--- a/haskell-cabal.el
+++ b/haskell-cabal.el
@@ -702,7 +702,7 @@ Respect the COMMA-STYLE, see
 `haskell-cabal-strip-list-and-detect-style' for the possible
 styles."
   (cl-case comma-style
-('before
+(before
  (goto-char (point-min))
  (while (haskell-cabal-ignore-line-p) (forward-line))
  (indent-to 2)
@@ -710,14 +710,14 @@ styles."
  (haskell-cabal-each-line
   (unless (haskell-cabal-ignore-line-p)
 (insert ", "
-('after
+(after
  (goto-char (point-max))
  (while (equal 0 (forward-line -1))
(unless (haskell-cabal-ignore-line-p)
  (end-of-line)
  (insert ",")
  (beginning-of-line
-('single
+(single
  (goto-char (point-min))
  (while (not (eobp))
(end-of-line)
diff --git a/haskell-commands.el b/haskell-commands.el
index 0cacb376b4..f9ed3da4cf 100644
--- a/haskell-commands.el
+++ b/haskell-commands.el
@@ -653,11 +653,11 @@ happened since function invocation)."
   (cl-case res-type
 ;; neither popup presentation buffer
 ;; nor insert response in error case
-('unknown-command
+(unknown-command
  (message "This command requires GHCi 8+ or GHCi-ng. Please read 
command description for details."))
-('option-missing
+(option-missing
  (message "Could not infer type signature. You need to load file 
first. Also :set +c is required, see customization 
`haskell-interactive-set-+c'. Please read command description for details."))
-('interactive-error (message "Wrong REPL response: %s" sig))
+(interactive-error (message "Wrong REPL response: %s" sig))
 (otherwise
  (if insert-value
  ;; Only insert type signature and do not present it
diff --git a/haskell-completions.el b/haskell-completions.el
index 8585b14bac..3fd75023fb 100644
--- a/haskell-completions.el
+++ b/haskell-completions.el
@@ -308,11 +308,11 @@ PREFIX should be a list such one returned by
 (when (not (eql typ 'haskell-completions-general-prefix))
   (let ((candidates
  (cl-case typ
-   ('haskell-completions-pragma-name-prefix
+   (haskell-completions-pragma-name-prefix
 haskell-completions--pragma-names)
-   ('haskell-completions-ghc-option-prefix
+   (haskell-completions-ghc-option-prefix
 haskell-ghc-supported-options)
-   ('haskell-completions-language-extension-prefix
+   (haskell-completions-language-extension-prefix
 haskell-ghc-supported-extensions)
(otherwise
 (append (when (bound-and-true-p haskell-tags-on-save)
diff --git a/haskell-load.el b/haskell-load.el
index f43fd863c8..d6a9f0f003 100644
--- a/haskell-load.el
+++ b/haskell-load.el
@@ -265,9 +265,9 @@ list of modules where missed IDENT was found."
  (get-buffer-create "*haskell-process-log*"))
   (switch-to-buffer-other-window (get-buffer "*haskell-process-log*")))
  (t (let ((app-name (cl-ecase (haskell-process-type)
-  ('ghci haskell-process-path-cabal)
-  ('cabal-repl haskell-process-path-cabal)
-  ('stack-ghci haskell-process-path-stack
+  (ghci haskell-process-path-cabal)
+  (cabal-repl haskell-process-path-cabal)
+  (stack-ghci haskell-process-path-stack
   (haskell-process-queue-command
process
(make-haskell-command
@@ -566,12 +566,12 @@ When MODULE-BUFFER is non-NIL, paint error overlays."
   "Show the '(Compiling|Loading) X' message."
   (let ((msg (concat
   (cl-ecase type
-('compiling
+(compiling
  (if haskell-interactive-mode-include-file-name
  (format "Compiling: %s (%s)" module-name file-name)
(format "Compiling: %s" module-name)))
-('loading (format "Loading: %s" module-name))
-('import-cycle
+(loading (format "Loading: %s" module-name))
+(import-cycle
  (format "Module has an import cycle: %s" module-name)))

[elpa] externals/ada-mode e72d65d459: * build.sh: Move *_parse_table.txt to bin, so install.sh copies it

[Stephen Leake]

branch: externals/ada-mode
commit e72d65d459949e71d61f816fc5f88a6076207532
Author: Stephen Leake 
Commit: Stephen Leake 

* build.sh: Move *_parse_table.txt to bin, so install.sh copies it
---
 build.sh | 4 
 1 file changed, 4 insertions(+)

diff --git a/build.sh b/build.sh
index f88790beba..fa87fda833 100755
--- a/build.sh
+++ b/build.sh
@@ -15,6 +15,9 @@ if type alr; then
 alr get emacs_ada_mode~8.0.2
 cd emacs_ada_mode_*; alr build --release
 
+# WORKAROUND: this should be in alire_rules.make
+mv emacs_ada_mode_*/ada_annex_p_lr1_parse_table.txt emacs_ada_mode_*/bin
+
 elif type gprbuild; then
 echo "building ada-mode executables via gnat compiler"
 
@@ -45,6 +48,7 @@ elif type gprbuild; then
 $WISI_DIR/wisitoken-bnf-generate --task_count 1 ada_annex_p.wy
 
 gprbuild -p -j8 -P ada_mode_wisi_parse.gpr -aP $WISI_DIR "$@"
+mv ada_annex_p_lr1_parse_table.txt bin
 
 else
 echo "neither Alire nor gnat compiler found"

[nongnu] elpa/haskell-mode 53d26263db 2/2: Merge pull request #1792 from syohex/escape-quote-in-docstring

[ELPA Syncer]

branch: elpa/haskell-mode
commit 53d26263dbe2c607471048646d94788c0d232f98
Merge: 910800d537 70a21213ba
Author: Steve Purcell 
Commit: GitHub 

Merge pull request #1792 from syohex/escape-quote-in-docstring

Escape single quote in docstring
---
 Makefile|  1 +
 haskell-cabal.el|  4 ++--
 haskell-completions.el  |  6 +++---
 haskell-customize.el| 14 +++---
 haskell-indent.el   |  2 +-
 haskell-indentation.el  |  8 
 haskell-interactive-mode.el |  2 +-
 haskell-lexeme.el   | 34 +-
 haskell-load.el |  2 +-
 haskell-mode.el |  2 +-
 haskell-utils.el|  6 +++---
 haskell.el  |  2 +-
 12 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/Makefile b/Makefile
index 39d6495c89..a6916754db 100644
--- a/Makefile
+++ b/Makefile
@@ -150,6 +150,7 @@ $(AUTOLOADS): $(ELFILES)
$(BATCH) \
--eval '(setq make-backup-files nil)' \
--eval "(setq generated-autoload-file (concat 
command-line-default-directory \"/\" \"$@\"))" \
+   --eval "(require 'autoload)" \
-f batch-update-autoloads "."
 # check if autoloads will really load
$(BATCH) -l "$@"
diff --git a/haskell-cabal.el b/haskell-cabal.el
index 026d56b95e..99a07e9495 100644
--- a/haskell-cabal.el
+++ b/haskell-cabal.el
@@ -362,8 +362,8 @@ OTHER-WINDOW use `find-file-other-window'."
 
 (defun haskell-cabal-classify-line ()
   "Classify the current line's type.
-Possible results are 'section-header 'subsection-header 'section-data 'comment
-and 'empty '"
+Possible results are \\='section-header \\='subsection-header \\='section-data
+\\='comment and \\='empty"
   (save-excursion
 (beginning-of-line)
 (cond
diff --git a/haskell-completions.el b/haskell-completions.el
index 3fd75023fb..f4ea94d186 100644
--- a/haskell-completions.el
+++ b/haskell-completions.el
@@ -144,7 +144,7 @@ whitespace or new line, otherwise returns nil.
 
 (defun haskell-completions-grab-pragma-prefix ()
   "Grab completion prefix for pragma completions.
-Returns a list of form '(prefix-start-position
+Returns a list of form \\='(prefix-start-position
 prefix-end-position prefix-value prefix-type) for pramga names
 such as WARNING, DEPRECATED, LANGUAGE etc.  Also returns
 completion prefixes for options in case OPTIONS_GHC pragma, or
@@ -214,7 +214,7 @@ pragma is supported also."
 
 (defun haskell-completions-grab-identifier-prefix ()
   "Grab completion prefix for identifier at point.
-Returns a list of form '(prefix-start-position
+Returns a list of form \\='(prefix-start-position
 prefix-end-position prefix-value prefix-type) for haskell
 identifier at point depending on result of function
 `haskell-ident-pos-at-point'."
@@ -265,7 +265,7 @@ identifier at point depending on result of function
 
 (defun haskell-completions-grab-prefix (&optional minlen)
"Grab prefix at point for possible completion.
-Returns a list of form '(prefix-start-position
+Returns a list of form \\='(prefix-start-position
 prefix-end-position prefix-value prefix-type) depending on
 situation, e.g. is it needed to complete pragma, module name,
 arbitrary identifier, etc.  Returns nil in case it is
diff --git a/haskell-customize.el b/haskell-customize.el
index d2ae85f22a..dccddc7a6e 100644
--- a/haskell-customize.el
+++ b/haskell-customize.el
@@ -53,7 +53,7 @@ Used for locating additional package data files.")
 
 Customize this variable to see the supported symbol values.
 
-When set to 'auto (the default), the directory contents and
+When set to \\='auto (the default), the directory contents and
 available programs will be used to make a best guess at the
 process type and the project directory.
 
@@ -86,7 +86,7 @@ The following example function arranges for all haskell 
process
 commands to be started in the current nix-shell environment:
 
   (lambda (argv) (append (list \"nix-shell\" \"-I\" \".\" \"--command\" )
-(list (mapconcat 'identity argv \" \"
+(list (mapconcat \\='identity argv \" \"
 
 See Info Node `(emacs)Directory Variables' for a way to set this option on
 a per-project basis."
@@ -367,7 +367,7 @@ read-only property."
   '()
   "Support a mapping from module to import lines.
 
-E.g. '((\"Data.Map\" . \"import qualified Data.Map as M
+E.g. \\='((\"Data.Map\" . \"import qualified Data.Map as M
 import Data.Map (Map)
 \"))
 
@@ -413,9 +413,9 @@ presence of a *.cabal file or stack.yaml file or something 
similar.")
 (defun haskell-build-type ()
   "Looks for cabal and stack spec files.
When found, returns a pair (TAG . DIR)
-   where TAG is 'cabal-project, 'cabal-sandbox. 'cabal, or 'stack;
+   where TAG is \\='cabal-project, \\='cabal-sandbox. \\='cabal, or \\='stack;
and DIR is the directory containing cabal or stack file.
-   When none found, DIR is nil, and TAG is 'ghc"
+   When none found, 

[nongnu] elpa/haskell-mode 70a21213ba 1/2: Escape single quote in docstring

[ELPA Syncer]

branch: elpa/haskell-mode
commit 70a21213ba55d532a8bc58710613e23a7290c072
Author: Shohei YOSHIDA 
Commit: Shohei YOSHIDA 

Escape single quote in docstring
---
 Makefile|  1 +
 haskell-cabal.el|  4 ++--
 haskell-completions.el  |  6 +++---
 haskell-customize.el| 14 +++---
 haskell-indent.el   |  2 +-
 haskell-indentation.el  |  8 
 haskell-interactive-mode.el |  2 +-
 haskell-lexeme.el   | 34 +-
 haskell-load.el |  2 +-
 haskell-mode.el |  2 +-
 haskell-utils.el|  6 +++---
 haskell.el  |  2 +-
 12 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/Makefile b/Makefile
index 39d6495c89..a6916754db 100644
--- a/Makefile
+++ b/Makefile
@@ -150,6 +150,7 @@ $(AUTOLOADS): $(ELFILES)
$(BATCH) \
--eval '(setq make-backup-files nil)' \
--eval "(setq generated-autoload-file (concat 
command-line-default-directory \"/\" \"$@\"))" \
+   --eval "(require 'autoload)" \
-f batch-update-autoloads "."
 # check if autoloads will really load
$(BATCH) -l "$@"
diff --git a/haskell-cabal.el b/haskell-cabal.el
index 026d56b95e..99a07e9495 100644
--- a/haskell-cabal.el
+++ b/haskell-cabal.el
@@ -362,8 +362,8 @@ OTHER-WINDOW use `find-file-other-window'."
 
 (defun haskell-cabal-classify-line ()
   "Classify the current line's type.
-Possible results are 'section-header 'subsection-header 'section-data 'comment
-and 'empty '"
+Possible results are \\='section-header \\='subsection-header \\='section-data
+\\='comment and \\='empty"
   (save-excursion
 (beginning-of-line)
 (cond
diff --git a/haskell-completions.el b/haskell-completions.el
index 3fd75023fb..f4ea94d186 100644
--- a/haskell-completions.el
+++ b/haskell-completions.el
@@ -144,7 +144,7 @@ whitespace or new line, otherwise returns nil.
 
 (defun haskell-completions-grab-pragma-prefix ()
   "Grab completion prefix for pragma completions.
-Returns a list of form '(prefix-start-position
+Returns a list of form \\='(prefix-start-position
 prefix-end-position prefix-value prefix-type) for pramga names
 such as WARNING, DEPRECATED, LANGUAGE etc.  Also returns
 completion prefixes for options in case OPTIONS_GHC pragma, or
@@ -214,7 +214,7 @@ pragma is supported also."
 
 (defun haskell-completions-grab-identifier-prefix ()
   "Grab completion prefix for identifier at point.
-Returns a list of form '(prefix-start-position
+Returns a list of form \\='(prefix-start-position
 prefix-end-position prefix-value prefix-type) for haskell
 identifier at point depending on result of function
 `haskell-ident-pos-at-point'."
@@ -265,7 +265,7 @@ identifier at point depending on result of function
 
 (defun haskell-completions-grab-prefix (&optional minlen)
"Grab prefix at point for possible completion.
-Returns a list of form '(prefix-start-position
+Returns a list of form \\='(prefix-start-position
 prefix-end-position prefix-value prefix-type) depending on
 situation, e.g. is it needed to complete pragma, module name,
 arbitrary identifier, etc.  Returns nil in case it is
diff --git a/haskell-customize.el b/haskell-customize.el
index d2ae85f22a..dccddc7a6e 100644
--- a/haskell-customize.el
+++ b/haskell-customize.el
@@ -53,7 +53,7 @@ Used for locating additional package data files.")
 
 Customize this variable to see the supported symbol values.
 
-When set to 'auto (the default), the directory contents and
+When set to \\='auto (the default), the directory contents and
 available programs will be used to make a best guess at the
 process type and the project directory.
 
@@ -86,7 +86,7 @@ The following example function arranges for all haskell 
process
 commands to be started in the current nix-shell environment:
 
   (lambda (argv) (append (list \"nix-shell\" \"-I\" \".\" \"--command\" )
-(list (mapconcat 'identity argv \" \"
+(list (mapconcat \\='identity argv \" \"
 
 See Info Node `(emacs)Directory Variables' for a way to set this option on
 a per-project basis."
@@ -367,7 +367,7 @@ read-only property."
   '()
   "Support a mapping from module to import lines.
 
-E.g. '((\"Data.Map\" . \"import qualified Data.Map as M
+E.g. \\='((\"Data.Map\" . \"import qualified Data.Map as M
 import Data.Map (Map)
 \"))
 
@@ -413,9 +413,9 @@ presence of a *.cabal file or stack.yaml file or something 
similar.")
 (defun haskell-build-type ()
   "Looks for cabal and stack spec files.
When found, returns a pair (TAG . DIR)
-   where TAG is 'cabal-project, 'cabal-sandbox. 'cabal, or 'stack;
+   where TAG is \\='cabal-project, \\='cabal-sandbox. \\='cabal, or \\='stack;
and DIR is the directory containing cabal or stack file.
-   When none found, DIR is nil, and TAG is 'ghc"
+   When none found, DIR is nil, and TAG is \\='ghc"
   ;; REVIEW maybe just 'cabal is enough.
   (let ((cabal-pr

[elpa] externals/gpr-mode 924bad9645: Fix header comment style again, improve install.sh

[Stephen Leake]

branch: externals/gpr-mode
commit 924bad964550047a4c06405c66a035fa28e1f4d2
Author: Stephen Leake 
Commit: Stephen Leake 

Fix header comment style again, improve install.sh

* gpr-mode.el: Really fix header comment style.

* install.sh: Improve.
---
 gpr-mode.el |  2 +-
 install.sh  | 37 -
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/gpr-mode.el b/gpr-mode.el
index 00094469a6..a8b5d8fe41 100644
--- a/gpr-mode.el
+++ b/gpr-mode.el
@@ -1,4 +1,4 @@
-;;; gpr-mode --- Major mode for editing GNAT project files  -*- 
lexical-binding:t -*-
+;;; gpr-mode.el --- Major mode for editing GNAT project files  -*- 
lexical-binding:t -*-
 
 ;; Copyright (C) 2004, 2007, 2008, 2012-2015, 2017 - 2020, 2022  Free Software 
Foundation, Inc.
 
diff --git a/install.sh b/install.sh
index 0f279215ac..2cda816129 100644
--- a/install.sh
+++ b/install.sh
@@ -1,31 +1,26 @@
 #!/bin/sh
 # Install executables for Gpr mode.
-#
+# 
+# $1 : optional --prefix=
+#   
 # See build.sh for build (must be run before install).
 
-if type alr; then
-echo "installing gpr-mode executables via Alire"
+if [ x$1 = x ]; then
+PREFIX=$HOME/.local
+# as recommended by 
https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
+else
+PREFIX=$1
+fi
+
+echo "installing gpr-mode executables to" $PREFIX/bin
 
-if [ x$1 == x ]; then
-echo "you must specify the install directory with 'install.sh '"
-return 1
-fi
-# IMPROVEME: when alr supports install, use that
-cp emacs_gpr_mode*/bin/* $1
+# No need for gprinstall; we only need the executables
 
-elif type gprbuild; then
-echo "installing gpr-mode executables via gnat compiler"
-
-# $1 : optional --prefix=
-#
-# If you don't have write permission in the GNAT installation
-# directory, you need to use --prefix=, or run with root priviledges.
+if type alr; then
+cp emacs_gpr_mode*/bin/* $PREFIX/bin
 
-if [ -d ../wisi-4.1.? ]; then
-WISI_DIR=`ls -d ../wisi-4.1.?`
-fi
-
-gprinstall -f -p -P gpr_mode_wisi_parse.gpr -aP $WISI_DIR 
--install-name=gpr_mode_wisi_parse $1 
+elif type gprbuild; then
+cp bin/* $PREFIX/bin
 
 else
 echo "neither Alire nor gnat compiler found"

[elpa] externals/gpr-query 6356b18639: * build.sh: Show compiler

[Stephen Leake]

branch: externals/gpr-query
commit 6356b186399180bb67319247cad07965bb6ad6ff
Author: Stephen Leake 
Commit: Stephen Leake 

* build.sh: Show compiler
---
 build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 2c70e6607a..4f6d3f1ad0 100644
--- a/build.sh
+++ b/build.sh
@@ -9,7 +9,8 @@
 
 if type alr; then
 # alr can be installed from https://alire.ada.dev/
-echo "building gpr_query via Alire"
+echo "building gpr_query via Alire; compiler:"
+alr toolchain
 alr get emacs_gpr_query~1.0.1
 cd emacs_gpr_query_*; alr build --release
 

[elpa] externals/triples bc0fb6fc91 1/2: Compilation fixes by Stefan Monnier.

[ELPA Syncer]

branch: externals/triples
commit bc0fb6fc917d91dc3670d707c61977a9a73b0b88
Author: Andrew Hyatt 
Commit: Andrew Hyatt 

Compilation fixes by Stefan Monnier.

Also, various other fixes, most notably being a new macro `triples-deftest' 
to
make our testing with both builtin and emacsql easier.
---
 README.org  |   4 +-
 triples-test.el | 273 ++--
 triples.el  |  31 ---
 3 files changed, 152 insertions(+), 156 deletions(-)

diff --git a/README.org b/README.org
index 81c820537c..a3f1387a2d 100644
--- a/README.org
+++ b/README.org
@@ -1,7 +1,9 @@
 #+TITLE: Triples
 
-The =triples= module is a standard database module designed for use in other 
emacs modules.  It works with either the builtin sqlite in Emacs 29 or the 
[[https://github.com/magit/emacsql][emacsql]] module, and provides a simple way 
of storing entities and their associated schema.  The triples module is well 
suited to graph-like applications, where links between entities are important.  
The module has wrappers for most common operations, but it is anticipated that 
occasionally client modu [...]
+The =triples= module is a standard database module designed for use in other 
emacs modules.  It works with either the builtin sqlite in Emacs 29 or the 
[[https://github.com/magit/emacsql][emacsql]] module, and provides a simple way 
of storing entities and their associated schema.  The triples module is well 
suited to graph-like applications, where links between entities are important.  
The module has wrappers for most common operations, but it is anticipated that 
occasionally client modu [...]
 
+* Installing
+This module is available through GNU ELPA, and can be installed as normal.  
However, most of the time this module is only useful in concert with another 
module which uses it as a library and will declare it as a dependency, so 
unless you are planning on developing with it, there is usually no need to 
install it directly.
 * Maturity
 This module is very new should be considered alpha quality.
 
diff --git a/triples-test.el b/triples-test.el
index d8776100b1..e299dc5b53 100644
--- a/triples-test.el
+++ b/triples-test.el
@@ -1,10 +1,34 @@
 ;;; triples-test.el --- Tests for triples module.  -*- lexical-binding: t; -*-
+
+;; Copyright (c) 2022  Free Software Foundation, Inc.
+
+;; 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 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 GNU Emacs.  If not, see .
+
+;;; Commentary:
+
 ;; Note: It's important to test this on emacs 29, with emacsql installed, so we
 ;; can make both types of sqlite backend work.
+;;
+;; The tests also require the `kv' package, which can be found at
+;; https://github.com/jjeffery/kv.
+
+;;; Code:
+
 (require 'triples)
 (require 'seq)
-(require 'kv)
-(require 'emacsql nil t)
+(require 'kv nil t) ;; May be absent.
+(require 'emacsql nil t);; May be absent.
 
 ;;; Code:
 
@@ -29,144 +53,107 @@ easily debug into it.")
   (let ((sql-database triples-test-db-file))
 (sql-sqlite (format "*schema test db SQL %s*" triples-test-db-file
 
-(defun triples-test-insert (mode)
-  (let ((triples-sqlite-interface mode))
-(triples-test-with-temp-db
-  (triples-db-insert db "sub" 'pred "obj")
-  (should (equal (mapcar (lambda (row) (seq-take row 3)) 
(triples-db-select db))
- '(("sub" pred "obj"
-  ;; Test that we actually are storing with builtin something compatible
-  ;; with emacsql.
-  (when (eq mode 'builtin)
-(should (equal (sqlite-select db "SELECT * FROM triples")
-   '(("\"sub\"" "pred" "\"obj\"" "()")
-  ;; Test that it replaces - this shouldn't result in two rows.
-  (triples-db-insert db "sub" 'pred "obj")
-  (should (= (length (triples-db-select db)) 1))
-  ;; Test that colons in the predicate are stripped away when stored.
-  (triples-db-insert db "sub" :test/pred "obj")
-  (should (= (length (triples-db-select db nil 'test/pred)) 1))
-  ;; Test we correctly test for bad inputs.
-  (should-error (triples-db-insert db "sub" "pred" "obj"))
-  (should-error (triples-db-insert db "sub" 'pred "obj" '(ordinary-list)))
-  (should-error (triples-db-insert db "sub" 'pred "obj" "string"))
-  ;; Test that we can have symbol subject and objects.
-  (triples-db-insert db 'sub 'pred 'obj)
-  (should (equal
- 

[elpa] externals/triples 722b43d640 2/2: Merge branch 'externals/triples' of git://git.sv.gnu.org/emacs/elpa

[ELPA Syncer]

branch: externals/triples
commit 722b43d6404d9f196374c38a26c8eaf6d573e9a3
Merge: bc0fb6fc91 9673b6de5e
Author: Andrew Hyatt 
Commit: Andrew Hyatt 

Merge branch 'externals/triples' of git://git.sv.gnu.org/emacs/elpa

This fixes a mistake where I pushed to GNU ELPA directly.

[nongnu] elpa/helm-core updated (1327e97f14 -> cc0a87623b)

[ELPA Syncer]

elpasync pushed a change to branch elpa/helm-core.

  from  1327e97f14 Fix regexp matching private symbols in helm-occur
  adds  d6f4d6af7a Fix typo in regexp
  adds  b976aed65b Update documentation about shorthands
  adds  ed66bea2e0 Fix shorthands transformer so that it match from 
everywhere
  adds  cc0a87623b Update documentation

No new revisions were added by this update.

Summary of changes:
 helm-help.el  | 45 +
 helm-occur.el | 38 ++
 2 files changed, 67 insertions(+), 16 deletions(-)

[nongnu] elpa/helm updated (1327e97f14 -> cc0a87623b)

[ELPA Syncer]

elpasync pushed a change to branch elpa/helm.

  from  1327e97f14 Fix regexp matching private symbols in helm-occur
   new  d6f4d6af7a Fix typo in regexp
   new  b976aed65b Update documentation about shorthands
   new  ed66bea2e0 Fix shorthands transformer so that it match from 
everywhere
   new  cc0a87623b Update documentation


Summary of changes:
 helm-help.el  | 45 +
 helm-occur.el | 38 ++
 2 files changed, 67 insertions(+), 16 deletions(-)

[nongnu] elpa/helm d6f4d6af7a 1/4: Fix typo in regexp

[ELPA Syncer]

branch: elpa/helm
commit d6f4d6af7a927f6dc406d3de3e20f2de79bf39e5
Author: Thierry Volpiatto 
Commit: Thierry Volpiatto 

Fix typo in regexp
---
 helm-occur.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helm-occur.el b/helm-occur.el
index 2587e901e4..b7ffc6115b 100644
--- a/helm-occur.el
+++ b/helm-occur.el
@@ -296,7 +296,7 @@ car of the shorthand association.
 When no `read-symbol-shorthands' local value is found use PATTERN unmodified."
   (if helm-occur-match-shorthands
   (let ((shorthands (buffer-local-value 'read-symbol-shorthands buffer))
-(prefix (and (string-match "\\`\\(.*-\\)-?.**" pattern)
+(prefix (and (string-match "\\`\\(.*-\\)-?.*" pattern)
  (match-string 1 pattern
 (if (and shorthands prefix)
 (helm-aif (or (assoc prefix shorthands)

[nongnu] elpa/helm b976aed65b 2/4: Update documentation about shorthands

[ELPA Syncer]

branch: elpa/helm
commit b976aed65bbb80041767eef8d9ee044cc1a09322
Author: Thierry Volpiatto 
Commit: Thierry Volpiatto 

Update documentation about shorthands
---
 helm-help.el | 49 +
 1 file changed, 49 insertions(+)

diff --git a/helm-help.el b/helm-help.el
index 98fd3e86b0..da4efde3fe 100644
--- a/helm-help.el
+++ b/helm-help.el
@@ -2118,6 +2118,55 @@ Matching empty lines is supported with the regexp 
\"^$\", you then get the
 results displayed as the buffer-name and the line number only.  You can
 save and edit these results, i.e. add text to the empty line.
 
+ Matching shorthands symbols in Elisp code
+
+Helm-occur have a basic support of [[(info \"(elisp) 
Shorthands\")][read-symbol-shorthands]].
+You can enable this by customizing =helm-occur-match-shorthands=.
+
+The main usage is when you are in a given buffer with cursor on a
+symbol and you want to see where the definition is or where it is
+used in another buffer or other buffers.  Of course matching is
+working on both versions of the definition, the short one and the
+long one.  Here an example reusing the sample files used in the
+Manual:
+
+Here snu.el file with cursor on snu-lines definition:
+
+#+begin_src elisp
+ (defun snu-split (separator s &optional omit-nulls)
+   \"A match-data saving variation on `split-string'.\"
+   (save-match-data (split-string s separator omit-nulls)))
+
+ (defun snu-lines (s)
+   \"Split string S into a list of strings on newline characters.\"
+   (snu-split \"(\\r\\n|[\\n\\r])\" s))
+
+ ;; Local Variables:
+ ;; read-symbol-shorthands: ((\"snu-\" . \"some-nice-string-utils-\"))
+ ;; End:
+#+end_src
+
+And here the my-tricks.el file reusing snu-lines but under another name:
+
+#+begin_src elisp
+ (defun t-reverse-lines (s)
+   (string-join (reverse (sns-lines s)) \"\\n\"))
+
+ ;; Local Variables:
+ ;; read-symbol-shorthands: ((\"t-\" . \"my-tricks-\")
+ ;;  (\"sns-\" . \"some-nice-string-utils-\"))
+ ;; End:
+
+#+end_src
+
+You want to know where the definition currently at point ('snu-lines') is used 
in the my-tricks.el buffer.
+You launch for example helm-mini and start helm-occur on my-tricks.el, helm 
occur will match immediately
+'sns-lines'.
+
+Note that 'snu-lines' is known because we start from its buffer,
+it will be unknown when you start from another buffer not
+specifiying the shorthand association.
+
 *** Automatically match symbol at point
 
 Helm can automatically match the symbol at point while keeping

[nongnu] elpa/helm ed66bea2e0 3/4: Fix shorthands transformer so that it match from everywhere

[ELPA Syncer]

branch: elpa/helm
commit ed66bea2e0c871e123167d1d2fd67ffb6e6cefa9
Author: Thierry Volpiatto 
Commit: Thierry Volpiatto 

Fix shorthands transformer so that it match from everywhere
---
 helm-occur.el | 38 ++
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/helm-occur.el b/helm-occur.el
index b7ffc6115b..f27f86fdb5 100644
--- a/helm-occur.el
+++ b/helm-occur.el
@@ -288,23 +288,22 @@ engine beeing completely different and also much faster."
when (and disp (not (string= disp "")))
collect (cons disp (string-to-number linum
 
-(defun helm-occur-symbol-shorthands-pattern-transformer (pattern buffer 
&optional default)
+(defvar helm-occur--gshorthands nil)
+(defun helm-occur-symbol-shorthands-pattern-transformer (pattern buffer 
gshorthands)
   "Maybe transform PATTERN to its `read-symbol-shorthands' counterpart in 
BUFFER.
 If DEFAULT is specified, always transform PATTERN with the cdr of the matched
 shorthand i.e. the one that is interned, otherwise transform pattern with the
 car of the shorthand association.
 When no `read-symbol-shorthands' local value is found use PATTERN unmodified."
-  (if helm-occur-match-shorthands
-  (let ((shorthands (buffer-local-value 'read-symbol-shorthands buffer))
-(prefix (and (string-match "\\`\\(.*-\\)-?.*" pattern)
- (match-string 1 pattern
-(if (and shorthands prefix)
-(helm-aif (or (assoc prefix shorthands)
-  (rassoc prefix shorthands))
-(if default
-(replace-match (cdr it) nil nil pattern 1)
-  (replace-match (car it) nil nil pattern 1))
-  pattern)
+  (if gshorthands
+  (let* ((lshorthands (buffer-local-value 'read-symbol-shorthands buffer))
+ (prefix (and (string-match "^\\(\\(?:[^-]+-\\)*\\)" pattern)
+  (match-string 1 pattern)))
+ (lgstr (cdr (or (assoc prefix gshorthands)
+ (rassoc prefix gshorthands)
+(if (and lgstr lshorthands)
+(concat (car (rassoc lgstr lshorthands))
+(replace-regexp-in-string prefix "" pattern))
   pattern))
 pattern))
 
@@ -317,6 +316,14 @@ When no `read-symbol-shorthands' local value is found use 
PATTERN unmodified."
 
 (defun helm-occur-build-sources (buffers &optional source-name)
   "Build sources for `helm-occur' for each buffer in BUFFERS list."
+  (setq helm-occur--gshorthands nil)
+  (and helm-occur-match-shorthands
+   (setq helm-occur--gshorthands
+ (cl-loop for b in (buffer-list)
+  for rss = (buffer-local-value
+ 'read-symbol-shorthands
+ b)
+  when rss append rss)))
   (let (sources)
 (dolist (buf buffers)
   (let ((bname (buffer-name buf)))
@@ -343,7 +350,7 @@ When no `read-symbol-shorthands' local value is found use 
PATTERN unmodified."
 (invalid-regexp nil)))
 :pattern-transformer (lambda (pattern)

(helm-occur-symbol-shorthands-pattern-transformer
-pattern buf))
+pattern buf helm-occur--gshorthands))
 :init (lambda ()
 (with-current-buffer buf
   (let* ((bsfn (or (cdr (assq
@@ -415,8 +422,7 @@ Each buffer's result is displayed in a separated source."
   :buffer "*helm moccur*"
   :history 'helm-occur-history
   :default (helm-aif (thing-at-point 'symbol)
-   (helm-occur-symbol-shorthands-pattern-transformer
-(regexp-quote it) (current-buffer) t))
+   (regexp-quote it))
   :input input
   :truncate-lines helm-occur-truncate-lines)
   (remove-hook 'helm-after-update-hook 
'helm-occur--select-closest-candidate
@@ -441,7 +447,7 @@ METHOD can be one of buffer, buffer-other-window, 
buffer-other-frame."
   ;; Move point to the nearest matching regexp from bol.
   (cl-loop for str in split-pat
for reg = (helm-occur-symbol-shorthands-pattern-transformer
-  str (get-buffer buf))
+  str (get-buffer buf) helm-occur--gshorthands)
when (save-excursion
   (condition-case _err
   (if helm-migemo-mode

[nongnu] elpa/helm cc0a87623b 4/4: Update documentation

[ELPA Syncer]

branch: elpa/helm
commit cc0a87623bf18678339fa80e8a2e4c1be3380248
Author: Thierry Volpiatto 
Commit: Thierry Volpiatto 

Update documentation
---
 helm-help.el | 4 
 1 file changed, 4 deletions(-)

diff --git a/helm-help.el b/helm-help.el
index da4efde3fe..04b88d4b69 100644
--- a/helm-help.el
+++ b/helm-help.el
@@ -2163,10 +2163,6 @@ You want to know where the definition currently at point 
('snu-lines') is used i
 You launch for example helm-mini and start helm-occur on my-tricks.el, helm 
occur will match immediately
 'sns-lines'.
 
-Note that 'snu-lines' is known because we start from its buffer,
-it will be unknown when you start from another buffer not
-specifiying the shorthand association.
-
 *** Automatically match symbol at point
 
 Helm can automatically match the symbol at point while keeping

[nongnu] elpa/helm updated (cc0a87623b -> 6d77a65475)

[ELPA Syncer]

elpasync pushed a change to branch elpa/helm.

  from  cc0a87623b Update documentation
   new  ba2d46550e Update docstring
   new  6d77a65475 Fix apropos default thing-at-point with shorthands


Summary of changes:
 helm-elisp.el | 15 +--
 helm-occur.el |  8 
 2 files changed, 17 insertions(+), 6 deletions(-)

[nongnu] elpa/helm-core updated (cc0a87623b -> 6d77a65475)

[ELPA Syncer]

elpasync pushed a change to branch elpa/helm-core.

  from  cc0a87623b Update documentation
  adds  ba2d46550e Update docstring
  adds  6d77a65475 Fix apropos default thing-at-point with shorthands

No new revisions were added by this update.

Summary of changes:
 helm-elisp.el | 15 +--
 helm-occur.el |  8 
 2 files changed, 17 insertions(+), 6 deletions(-)

[nongnu] elpa/helm ba2d46550e 1/2: Update docstring

[ELPA Syncer]

branch: elpa/helm
commit ba2d46550ee679e219bace5f083648274ccc3dd5
Author: Thierry Volpiatto 
Commit: Thierry Volpiatto 

Update docstring
---
 helm-occur.el | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/helm-occur.el b/helm-occur.el
index f27f86fdb5..0f26fc2753 100644
--- a/helm-occur.el
+++ b/helm-occur.el
@@ -291,10 +291,10 @@ engine beeing completely different and also much faster."
 (defvar helm-occur--gshorthands nil)
 (defun helm-occur-symbol-shorthands-pattern-transformer (pattern buffer 
gshorthands)
   "Maybe transform PATTERN to its `read-symbol-shorthands' counterpart in 
BUFFER.
-If DEFAULT is specified, always transform PATTERN with the cdr of the matched
-shorthand i.e. the one that is interned, otherwise transform pattern with the
-car of the shorthand association.
-When no `read-symbol-shorthands' local value is found use PATTERN unmodified."
+
+GSHORTHANDS is the concatenation of all `read-symbol-shorthands' value found in
+all buffers i.e. `buffer-list'.
+When GSHORTHANDS is nil use PATTERN unmodified."
   (if gshorthands
   (let* ((lshorthands (buffer-local-value 'read-symbol-shorthands buffer))
  (prefix (and (string-match "^\\(\\(?:[^-]+-\\)*\\)" pattern)

[nongnu] elpa/helm 6d77a65475 2/2: Fix apropos default thing-at-point with shorthands

[ELPA Syncer]

branch: elpa/helm
commit 6d77a65475e7202734c1eb977228cf4b238ac2b7
Author: Thierry Volpiatto 
Commit: Thierry Volpiatto 

Fix apropos default thing-at-point with shorthands
---
 helm-elisp.el | 15 +--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/helm-elisp.el b/helm-elisp.el
index 7f0455ca35..530f7c0e04 100644
--- a/helm-elisp.el
+++ b/helm-elisp.el
@@ -796,13 +796,24 @@ is only used to test DEFAULT."
   (helm-force-update (concat "^" (helm-stringify (helm-get-selection)))
  (helm-get-current-source)
 
+(defun helm-apropos-get-default ()
+  (with-syntax-table emacs-lisp-mode-syntax-table
+(let* ((rss (buffer-local-value 'read-symbol-shorthands (current-buffer)))
+   (sym (thing-at-point 'symbol))
+   (prefix (when (and sym rss)
+ (cl-loop for (k . _v) in rss
+  when (string-match k sym)
+  return k
+  (if prefix
+  (replace-regexp-in-string prefix (cdr (assoc prefix rss)) sym)
+sym
+
 ;;;###autoload
 (defun helm-apropos (default)
   "Preconfigured Helm to describe commands, functions, variables and faces.
 In non interactives calls DEFAULT argument should be provided as
 a string, i.e. the `symbol-name' of any existing symbol."
-  (interactive (list (with-syntax-table emacs-lisp-mode-syntax-table
-   (thing-at-point 'symbol
+  (interactive (list (helm-apropos-get-default)))
   (let ((helm-M-x-show-short-doc
  (and helm-apropos-show-short-doc
   (null (memq 'helm-apropos helm-commands-using-frame)

[nongnu] elpa/helm 2fcae8af8c: Fix extraction of prefix in helm-occur pattern transformer

[ELPA Syncer]

branch: elpa/helm
commit 2fcae8af8cbdce9303c77164fb0d7df03ebdd5e2
Author: Thierry Volpiatto 
Commit: Thierry Volpiatto 

Fix extraction of prefix in helm-occur pattern transformer
---
 helm-occur.el | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/helm-occur.el b/helm-occur.el
index 0f26fc2753..18a5bd11d8 100644
--- a/helm-occur.el
+++ b/helm-occur.el
@@ -297,8 +297,12 @@ all buffers i.e. `buffer-list'.
 When GSHORTHANDS is nil use PATTERN unmodified."
   (if gshorthands
   (let* ((lshorthands (buffer-local-value 'read-symbol-shorthands buffer))
- (prefix (and (string-match "^\\(\\(?:[^-]+-\\)*\\)" pattern)
-  (match-string 1 pattern)))
+ (prefix (cl-loop for (k . v) in gshorthands
+  if (string-match (concat "\\`" k) pattern)
+  return k
+  else
+  if (string-match (concat "\\`" v) pattern)
+  return v))
  (lgstr (cdr (or (assoc prefix gshorthands)
  (rassoc prefix gshorthands)
 (if (and lgstr lshorthands)

[nongnu] elpa/helm-core updated (6d77a65475 -> 2fcae8af8c)

[ELPA Syncer]

elpasync pushed a change to branch elpa/helm-core.

  from  6d77a65475 Fix apropos default thing-at-point with shorthands
  adds  2fcae8af8c Fix extraction of prefix in helm-occur pattern 
transformer

No new revisions were added by this update.

Summary of changes:
 helm-occur.el | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

[nongnu] elpa/helm ce00578ea1 4/4: Use the undocumented feature of intern-soft to get the symbol at point

[ELPA Syncer]

branch: elpa/helm
commit ce00578ea1aa11692c1e05d1f5005dbdc856db87
Author: Thierry Volpiatto 
Commit: Thierry Volpiatto 

Use the undocumented feature of intern-soft to get the symbol at point

What is undocumented is that intern-soft returns the real symbol name
when this symbol is a shorthand symbol.
---
 helm-elisp.el | 10 +-
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/helm-elisp.el b/helm-elisp.el
index 82bb723c48..de269a6fe0 100644
--- a/helm-elisp.el
+++ b/helm-elisp.el
@@ -798,15 +798,7 @@ is only used to test DEFAULT."
 
 (defun helm-apropos-get-default ()
   (with-syntax-table emacs-lisp-mode-syntax-table
-(let* ((rss (buffer-local-value 'read-symbol-shorthands (current-buffer)))
-   (sym (thing-at-point 'symbol))
-   (prefix (when (and sym rss)
- (cl-loop for (k . _v) in rss
-  when (string-match (concat "\\`" k) sym)
-  return k
-  (if prefix
-  (replace-regexp-in-string prefix (cdr (assoc prefix rss)) sym)
-sym
+(symbol-name (intern-soft (thing-at-point 'symbol)
 
 ;;;###autoload
 (defun helm-apropos (default)

[nongnu] elpa/helm 94d6a51cad 1/4: Fix info link in help

[ELPA Syncer]

branch: elpa/helm
commit 94d6a51cad0051146f54343cee840a327b4d2fc8
Author: Thierry Volpiatto 
Commit: Thierry Volpiatto 

Fix info link in help
---
 helm-help.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helm-help.el b/helm-help.el
index 04b88d4b69..5f1100d625 100644
--- a/helm-help.el
+++ b/helm-help.el
@@ -2120,7 +2120,7 @@ save and edit these results, i.e. add text to the empty 
line.
 
  Matching shorthands symbols in Elisp code
 
-Helm-occur have a basic support of [[(info \"(elisp) 
Shorthands\")][read-symbol-shorthands]].
+Helm-occur have a basic support of 
[[info:elisp#Shorthands][read-symbol-shorthands]].
 You can enable this by customizing =helm-occur-match-shorthands=.
 
 The main usage is when you are in a given buffer with cursor on a

[nongnu] elpa/helm 27d21f7637 2/4: Fix helm-helm-quit function after jumping to an external link

[ELPA Syncer]

branch: elpa/helm
commit 27d21f76371c46ed61cbd744011ba4666af449a5
Author: Thierry Volpiatto 
Commit: Thierry Volpiatto 

Fix helm-helm-quit function after jumping to an external link

When jumping to an info node for example, if we hit quit from this
info window we expect exiting info and not helm help.
---
 helm-lib.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/helm-lib.el b/helm-lib.el
index d47bc38bc0..fefe45dd8e 100644
--- a/helm-lib.el
+++ b/helm-lib.el
@@ -745,7 +745,9 @@ displayed in BUFNAME."
 
 (defun helm-help-quit ()
   "Quit `helm-help'."
-  (throw 'helm-help-quit nil))
+  (if (get-buffer-window helm-help-buffer-name 'visible)
+  (throw 'helm-help-quit nil)
+(quit-window)))
 
 (defun helm-help-org-open-at-point ()
   "Calls `org-open-at-point' ignoring errors."

[nongnu] elpa/helm-core updated (2fcae8af8c -> ce00578ea1)

[ELPA Syncer]

elpasync pushed a change to branch elpa/helm-core.

  from  2fcae8af8c Fix extraction of prefix in helm-occur pattern 
transformer
  adds  94d6a51cad Fix info link in help
  adds  27d21f7637 Fix helm-helm-quit function after jumping to an external 
link
  adds  402ba1f548 Improve regexp in `helm-apropos-get-default`
  adds  ce00578ea1 Use the undocumented feature of intern-soft to get the 
symbol at point

No new revisions were added by this update.

Summary of changes:
 helm-elisp.el | 10 +-
 helm-help.el  |  2 +-
 helm-lib.el   |  4 +++-
 3 files changed, 5 insertions(+), 11 deletions(-)

[nongnu] elpa/helm updated (2fcae8af8c -> ce00578ea1)

[ELPA Syncer]

elpasync pushed a change to branch elpa/helm.

  from  2fcae8af8c Fix extraction of prefix in helm-occur pattern 
transformer
   new  94d6a51cad Fix info link in help
   new  27d21f7637 Fix helm-helm-quit function after jumping to an external 
link
   new  402ba1f548 Improve regexp in `helm-apropos-get-default`
   new  ce00578ea1 Use the undocumented feature of intern-soft to get the 
symbol at point


Summary of changes:
 helm-elisp.el | 10 +-
 helm-help.el  |  2 +-
 helm-lib.el   |  4 +++-
 3 files changed, 5 insertions(+), 11 deletions(-)

[nongnu] elpa/helm 402ba1f548 3/4: Improve regexp in `helm-apropos-get-default`

[ELPA Syncer]

branch: elpa/helm
commit 402ba1f548c235766e33f76b8cc0483053768d79
Author: Thierry Volpiatto 
Commit: Thierry Volpiatto 

Improve regexp in `helm-apropos-get-default`
---
 helm-elisp.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helm-elisp.el b/helm-elisp.el
index 530f7c0e04..82bb723c48 100644
--- a/helm-elisp.el
+++ b/helm-elisp.el
@@ -802,7 +802,7 @@ is only used to test DEFAULT."
(sym (thing-at-point 'symbol))
(prefix (when (and sym rss)
  (cl-loop for (k . _v) in rss
-  when (string-match k sym)
+  when (string-match (concat "\\`" k) sym)
   return k
   (if prefix
   (replace-regexp-in-string prefix (cdr (assoc prefix rss)) sym)

[elpa] externals/vertico 5499642f97: Simplify, replace vertico--allow-prompt-p function with variable

[ELPA Syncer]

branch: externals/vertico
commit 5499642f9708aa943191a7919ac711c94dfab62f
Author: Daniel Mendler 
Commit: Daniel Mendler 

Simplify, replace vertico--allow-prompt-p function with variable
---
 vertico.el | 28 
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/vertico.el b/vertico.el
index 86afac796c..f765e1ff82 100644
--- a/vertico.el
+++ b/vertico.el
@@ -175,8 +175,8 @@ The value should lie between 0 and vertico-count/2."
 (defvar-local vertico--groups nil
   "List of current group titles.")
 
-(defvar-local vertico--default-missing nil
-  "Default candidate is missing from candidates list.")
+(defvar-local vertico--allow-prompt nil
+  "Prompt selection is allowed.")
 
 (defun vertico--history-hash ()
   "Recompute history hash table and return it."
@@ -359,7 +359,9 @@ The function is configured by BY, BSIZE, BINDEX, BPRED and 
PRED."
   (vertico--candidates . ,all)
   (vertico--total . ,(length all))
   (vertico--highlight . ,hl)
-  (vertico--default-missing . ,def-missing)
+  (vertico--allow-prompt . ,(or def-missing
+(memq minibuffer--require-match
+  '(nil confirm 
confirm-after-completion
   (vertico--lock-candidate . ,lock)
   (vertico--groups . ,(cadr groups))
   (vertico--all-groups . ,(or (caddr groups) vertico--all-groups))
@@ -570,7 +572,7 @@ The function is configured by BY, BSIZE, BINDEX, BPRED and 
PRED."
   (format (car vertico-count-format)
   (format (cdr vertico-count-format)
   (cond ((>= vertico--index 0) (1+ vertico--index))
-((vertico--allow-prompt-p) "*")
+(vertico--allow-prompt "*")
 (t "!"))
   vertico--total)))
 
@@ -583,7 +585,7 @@ The function is configured by BY, BSIZE, BINDEX, BPRED and 
PRED."
 (defun vertico--prompt-selection ()
   "Highlight the prompt if selected."
   (let ((inhibit-modification-hooks t))
-(if (and (< vertico--index 0) (vertico--allow-prompt-p))
+(if (and (< vertico--index 0) vertico--allow-prompt)
 (add-face-text-property (minibuffer-prompt-end) (point-max) 
'vertico-current 'append)
   (vertico--remove-face (minibuffer-prompt-end) (point-max) 
'vertico-current
 
@@ -603,18 +605,12 @@ The function is configured by BY, BSIZE, BINDEX, BPRED 
and PRED."
 (vertico--display-count)
 (vertico--display-candidates (vertico--arrange-candidates
 
-(defun vertico--allow-prompt-p ()
-  "Return t if prompt can be selected."
-  (or vertico--default-missing (memq minibuffer--require-match
- '(nil confirm confirm-after-completion
-
 (defun vertico--goto (index)
   "Go to candidate with INDEX."
-  (let ((prompt (vertico--allow-prompt-p)))
-(setq vertico--index
-  (max (if (or prompt (= 0 vertico--total)) -1 0)
-   (min index (1- vertico--total)))
-  vertico--lock-candidate (or (>= vertico--index 0) prompt
+  (setq vertico--index
+(max (if (or vertico--allow-prompt (= 0 vertico--total)) -1 0)
+ (min index (1- vertico--total)))
+vertico--lock-candidate (or (>= vertico--index 0) 
vertico--allow-prompt)))
 
 (defun vertico-first ()
   "Go to first candidate, or to the prompt when the first candidate is 
selected."
@@ -644,7 +640,7 @@ The function is configured by BY, BSIZE, BINDEX, BPRED and 
PRED."
  (cond
   ((not vertico-cycle) index)
   ((= vertico--total 0) -1)
-  ((vertico--allow-prompt-p) (1- (mod (1+ index) (1+ vertico--total
+  (vertico--allow-prompt (1- (mod (1+ index) (1+ vertico--total
   (t (mod index vertico--total))
 
 (defun vertico-previous (&optional n)

[elpa] externals/hyperbole ed8a8e05de 1/4: HY-TALK/HYPB - Move all interaction log setup code to hypb.el

[ELPA Syncer]

branch: externals/hyperbole
commit ed8a8e05de33e3eb8b1df0f6d83ae120e7c4f7e3
Author: Bob Weiner 
Commit: Bob Weiner 

HY-TALK/HYPB - Move all interaction log setup code to hypb.el
---
 HY-TALK/HYPB | 60 
 hypb.el  | 11 +++
 2 files changed, 11 insertions(+), 60 deletions(-)

diff --git a/HY-TALK/HYPB b/HY-TALK/HYPB
index d9f74d7b0b..34d416f29b 100644
--- a/HY-TALK/HYPB
+++ b/HY-TALK/HYPB
@@ -22,62 +22,10 @@ or interactively after loading Hyperbole:
 ** interaction-log Package - font-lock highlighted log of keys and commands
Used for EmacsConf 2022
 
-  Install:
-  Load:   
-
-  Configure:
-
-
- (setq ilog-display-state 'commands
- ilog-print-lambdas 'not-compiled)
-   (mapc (lambda (cmd-str) (push (format "^%s$" cmd-str) 
ilog-self-insert-command-regexps))
- '("hyperbole" "hui:menu-enter"))
-   (interaction-log-mode 0)
-
-   (global-set-key
-   (kbd "C-h C-l")
-   (lambda () (interactive) (display-buffer ilog-buffer-name)))
-
-  (defun ilog-show-in-new-frame ()
-"Display log in a pop up frame of width 41 with parameters of 
selected frame."
-(interactive)
-(require 'hycontrol)
-(unless interaction-log-mode (interaction-log-mode +1))
-(let ((params (frame-parameters)))
-  (setcdr (assq 'width params) 41)
-  (let ((win (display-buffer-pop-up-frame
-  (get-buffer ilog-buffer-name)
-  (list (cons 'pop-up-frame-parameters params)
-(set-window-dedicated-p win t)
-(select-frame (window-frame win))
-(hycontrol-frame-to-right-center)
-win)))
-
-  (define-minor-mode interaction-log-mode
-"Global minor mode logging keys, commands, file loads and messages.
-  Logged stuff goes to the *Emacs Log* buffer."
-:group 'interaction-log
-:lighter nil
-:global t
-:after-hook interaction-log-mode-hook
-(if interaction-log-mode
-(progn
-  (add-hook 'after-change-functions #'ilog-note-buffer-change)
-  (add-hook 'post-command-hook  #'ilog-record-this-command)
-  (add-hook 'post-command-hook  #'ilog-post-command)
-  (setq ilog-truncation-timer (run-at-time 30 30 
#'ilog-truncate-log-buffer))
-  (setq ilog-insertion-timer (run-with-timer ilog-idle-time 
ilog-idle-time
- 
#'ilog-timer-function))
-  (message "Interaction Log: started logging in %s" 
ilog-buffer-name)
-  (easy-menu-add ilog-minor-mode-menu))
-  (remove-hook 'after-change-functions #'ilog-note-buffer-change)
-  (remove-hook 'post-command-hook  #'ilog-record-this-command)
-  (remove-hook 'post-command-hook  #'ilog-post-command)
-  (when (timerp ilog-truncation-timer) (cancel-timer 
ilog-truncation-timer))
-  (setq ilog-truncation-timer nil)
-  (when (timerp ilog-insertion-timer) (cancel-timer 
ilog-insertion-timer))
-  (setq ilog-insertion-timer nil)))>
+  Install,
+  Load,
+  Configure,
+  Activate:   
 
   Activate:   
   Deactivate: 
diff --git a/hypb.el b/hypb.el
index 175ed74d73..a292bd96f3 100644
--- a/hypb.el
+++ b/hypb.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date: 6-Oct-91 at 03:42:38
-;; Last-Mod: 31-Oct-22 at 03:08:23 by Bob Weiner
+;; Last-Mod:  5-Nov-22 at 10:36:08 by Bob Weiner
 ;;
 ;; Copyright (C) 1991-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -51,15 +51,18 @@ It must end with a space."
 ;;; Public functions
 ;;; 
 
+;;;###autoload
 (defun hypb:activate-interaction-log-mode ()
   "Configure and enable the interaction-log package for use with Hyperbole.
 This displays a clean log of Emacs keys used and commands executed."
   (interactive)
   ;; Ensure package is installed
-  (unless (package-installed-p 'keypression) (package-install 'keypression))
+  (unless (package-installed-p 'interaction-log)
+(package-install 'interaction-log))
 
   ;; Ensure interaction-log-mode is disabled to removes its command
   ;; hooks which are replaced below.
+  (require 'interaction-log)
   (interaction-log-mode 0)
 
   ;; Optional binding you can enable to display the ilog buffer
@@ -738,8 +741,8 @@ Removes any trailing newline at the end of the output."
 (defun hypb:rgrep (pattern &optional prefx-arg)
   "Recursively grep with symbol at point or PATTERN.
 Grep over all non-backup and non-autosave files in the current
-directory tree.  If in an Emacs Lisp mode buffer and no PREFX-ARG

[elpa] externals/hyperbole updated (ff2a482666 -> 7478fec33a)

[ELPA Syncer]

elpasync pushed a change to branch externals/hyperbole.

  from  ff2a482666 Make Hyperbole minibuffer menus yield clean Emacs key 
and cmd logs
   new  ed8a8e05de HY-TALK/HYPB - Move all interaction log setup code to 
hypb.el
   new  127a5c8212 kimport.el - Allow for indented start outline headings
   new  9f3f40c8ca hbdata:to-entry-buf and ebut:delete - Fix button 
deletion issue
   new  7478fec33a hycontrol-windows-grid-by-file-pattern - add 
windows-grid size arg


Summary of changes:
 ChangeLog   | 20 ++
 HY-TALK/HYPB| 60 
 hbdata.el   | 32 ++--
 hbut.el |  4 ++--
 hycontrol.el| 65 +++--
 hypb.el | 11 ++
 kotl/kimport.el | 13 ++--
 7 files changed, 96 insertions(+), 109 deletions(-)

[elpa] externals/hyperbole 7478fec33a 4/4: hycontrol-windows-grid-by-file-pattern - add windows-grid size arg

[ELPA Syncer]

branch: externals/hyperbole
commit 7478fec33af2c38df92e30b13f1a7387bfcac746
Author: Bob Weiner 
Commit: Bob Weiner 

hycontrol-windows-grid-by-file-pattern - add windows-grid size arg

Also, save frame config for all uses of hycontrol-make-windows-grid.
Restore with {C-h h h}.
---
 ChangeLog| 11 ++
 hycontrol.el | 65 +---
 2 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e4ab489d57..360d932243 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2022-11-05  Bob Weiner  
+
+* hycontrol.el (hycontrol-windows-grid-by-file-pattern): Update
+to use prefix arg as grid size or to autosize when not given
+or given an invalid valude.
+   (hycontrol-windows-grid): Don't nullify prefix arg
+when calling above function.
+   (hycontrol-make-windows-grid): Move 'hhist:add' call
+here and remove from 'hycontrol-windows-grid' so it covers all
+variants of windows-grid display.
+
 * hbdata.el (hbdata:to-entry-buf): Fix bug that set 'rtn' non-nil
 at times when 'key-src' file was not found.  This could lead
 to the wrong error, 'hui:ebut-delete', saying that you cannot
diff --git a/hycontrol.el b/hycontrol.el
index 27499157fe..6f6e34b425 100644
--- a/hycontrol.el
+++ b/hycontrol.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date: 1-Jun-16 at 15:35:36
-;; Last-Mod: 30-Oct-22 at 09:16:51 by Bob Weiner
+;; Last-Mod:  5-Nov-22 at 17:04:04 by Bob Weiner
 ;;
 ;; Copyright (C) 2016-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -1565,7 +1565,8 @@ If ARG is 0, prompt for a major mode whose buffers should 
be
 displayed in the grid windows, then prompt for the grid size.
 
 If ARG is < 0, prompt for a glob-type file pattern and display
-files that match the pattern in an auto-sized windows grid.
+files that match the pattern in an abs(ARG) sized windows grid
+or an autosized one if the ARG value is invalid.
 
 Otherwise, prompt for the grid size if ARG is an invalid size
 (positive and more than two digits).
@@ -1603,17 +1604,15 @@ argument."
   (call-interactively (lookup-key outline-minor-mode-map key)))
  ;;
  ;; No key conflicts, display window grid
- (t (let ((hist-elt (hhist:element)))
-  (setq arg (prefix-numeric-value (or arg current-prefix-arg)))
-  (cond ((> arg 0)
- (hycontrol-make-windows-grid arg))
-((< arg 0)
- (setq current-prefix-arg nil)
- (call-interactively 
#'hycontrol-windows-grid-by-file-pattern))
-(t
- (setq current-prefix-arg 0)
- (call-interactively 
#'hycontrol-windows-grid-by-major-mode)))
-  (hhist:add hist-elt)) ;; Save prior frame configuration for 
easy return
+ (t (setq arg (prefix-numeric-value (or arg current-prefix-arg)))
+(cond ((> arg 0)
+   (hycontrol-make-windows-grid arg))
+  ((< arg 0)
+   (call-interactively 
#'hycontrol-windows-grid-by-file-pattern))
+  (t
+   (setq current-prefix-arg 0)
+   (call-interactively 
#'hycontrol-windows-grid-by-major-mode)))
+
 
 (defun hycontrol-windows-grid-minimum-size (num-buffers)
   "Return the minimum integer window grid size to display NUM-BUFFERS.
@@ -1644,22 +1643,35 @@ number of columns of windows."
   (hycontrol-make-windows-grid grid-size buffers
 
 ;;;###autoload
-(defun hycontrol-windows-grid-by-file-pattern (pattern &optional full)
-  "Display an automatically sized window grid with files found from glob 
PATTERN.
-Use absolute file paths if called interactively or optional FULL is non-nil."
+(defun hycontrol-windows-grid-by-file-pattern (arg pattern &optional full)
+  "Display a prefix ARG-sized window grid with files found from glob PATTERN.
+Use absolute file paths if called interactively or optional FULL is non-nil.
+
+Left digit of ARG is the number of grid rows and the right digit
+is the number of grid columns.  If ARG is less than 11 or greater
+than 99, then autosize the grid to fit the number of files
+matched by PATTERN."
   (interactive
-   (list (read-string "Pattern of files to display in windows grid: ")
+   (list current-prefix-arg
+(read-string "Pattern of files to display in windows grid: ")
 t))
   (let* ((find-file-wildcards t)
-(files (file-expand-wildcards pattern full)))
+(files (file-expand-wildcards pattern full))
+(num-files (length files))
+(grid-size (abs (prefix-numeric-value current-prefix-arg)))
+(max-files (if (or (<= grid-size 10) (> grid-size 99)) 99 grid-size)))
+(when (zerop num-files)
+  (error "(HyControl): '%s' pattern did not match any files"))
+(when (> n

[elpa] externals/hyperbole 127a5c8212 2/4: kimport.el - Allow for indented start outline headings

[ELPA Syncer]

branch: externals/hyperbole
commit 127a5c82123ff9c0043d08495f3ad27239616e38
Author: Bob Weiner 
Commit: Bob Weiner 

kimport.el - Allow for indented start outline headings
---
 ChangeLog   |  4 
 kotl/kimport.el | 13 +++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5a2a60ca0a..bbdaade5cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2022-10-31  Bob Weiner  
+
+* kotl/kimport.el (kimport:star-heading): Allow for indented headings.
+
 2022-10-30  Bob Weiner  
 
 * hypb.el (hypb:activate-interaction-log-mode): Add to configure and
diff --git a/kotl/kimport.el b/kotl/kimport.el
index 6ec9b06497..b61b4531f1 100644
--- a/kotl/kimport.el
+++ b/kotl/kimport.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date:15-Nov-93 at 11:57:05
-;; Last-Mod: 28-Aug-22 at 14:07:09 by Bob Weiner
+;; Last-Mod:  5-Nov-22 at 10:24:36 by Bob Weiner
 ;;
 ;; Copyright (C) 1993-2022  Free Software Foundation, Inc.
 ;; See the "../HY-COPY" file for license information.
@@ -67,9 +67,9 @@ imported cells as the initial set of children of the current 
cell, if any.
.aug  - import format is an Augment post-numbered outline
(see https://dougengelbart.org/content/view/148/).")
 
-(defconst kimport:star-heading "^\\(\\*+\\)"
+(defconst kimport:star-heading "^[ \t]*\\(\\*+\\)"
   "Regular expression matching a star outline heading.
-The number of stars is given by groupoing 1.")
+The number of stars is given by grouping 1.")
 
 ;;; 
 ;;; Public functions
@@ -247,9 +247,10 @@ on."
 ;;;###autoload
 (defun kimport:star-outline (import-from output-to &optional children-p)
   "Insert star outline nodes from IMPORT-FROM into koutline OUTPUT-TO.
-Displays and leaves point in OUTPUT-TO.  See documentation for
-`kimport:initialize' for valid values of IMPORT-FROM and OUTPUT-TO and for
-an explanation of where imported cells are placed.
+Display and leave point in OUTPUT-TO.  See documentation for
+`kimport:initialize' for valid values of IMPORT-FROM and
+OUTPUT-TO and for an explanation of where imported cells are
+placed.
 
 \"* \" = level 1, \"** \" = level 2 in outline and so on."
   (interactive "FImport from star delimited cells buffer/file: \nFBuffer/file 
to insert cells into: \nP")

[elpa] externals/hyperbole 9f3f40c8ca 3/4: hbdata:to-entry-buf and ebut:delete - Fix button deletion issue

[ELPA Syncer]

branch: externals/hyperbole
commit 9f3f40c8ca42a331eb4bb3ef9598c23a458dae0b
Author: Bob Weiner 
Commit: Bob Weiner 

hbdata:to-entry-buf and ebut:delete - Fix button deletion issue
---
 ChangeLog |  5 +
 hbdata.el | 32 
 hbut.el   |  4 ++--
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bbdaade5cf..e4ab489d57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+* hbdata.el (hbdata:to-entry-buf): Fix bug that set 'rtn' non-nil
+at times when 'key-src' file was not found.  This could lead
+to the wrong error, 'hui:ebut-delete', saying that you cannot
+delete buttons in this buffer.
+
 2022-10-31  Bob Weiner  
 
 * kotl/kimport.el (kimport:star-heading): Allow for indented headings.
diff --git a/hbdata.el b/hbdata.el
index 77c90bef4c..aa750e 100644
--- a/hbdata.el
+++ b/hbdata.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date: 2-Apr-91
-;; Last-Mod:  7-Oct-22 at 23:17:52 by Mats Lidell
+;; Last-Mod:  5-Nov-22 at 14:24:56 by Bob Weiner
 ;;
 ;; Copyright (C) 1991-2021  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -409,13 +409,14 @@ beginning of the hbdata file (which is created if 
necessary).
 Return non-nil if KEY-SRC is found or created, else nil."
   (let ((rtn) (ln-dir))
 (if (and (get-buffer key-src)
-(setq rtn (set-buffer key-src))
+(set-buffer key-src)
 (not buffer-file-name))
;; Button buffer has no file attached
(progn (setq buffer-read-only nil)
   (unless (hmail:hbdata-to-p)
 (insert "\n" hmail:hbdata-sep "\n"))
-  (backward-char 1))
+  (backward-char 1)
+  (setq rtn t))
   (setq directory (or (file-name-directory key-src) directory))
   (let ((ln-file) (link-p key-src))
(while (setq link-p (file-symlink-p link-p))
@@ -424,19 +425,18 @@ Return non-nil if KEY-SRC is found or created, else nil."
(setq ln-dir (file-name-directory ln-file)
  key-src (file-name-nondirectory ln-file))
  (setq key-src (file-name-nondirectory key-src
-  (if (or (hbdata:to-hbdata-buffer directory create)
- (and ln-dir (hbdata:to-hbdata-buffer ln-dir nil)
-  (setq create nil
-directory ln-dir)))
- (progn
-   (goto-char 1)
-   (cond ((search-forward (concat "\^L\n\"" key-src "\"")
-  nil t)
-  (setq rtn t))
- (create
-  (setq rtn t)
-  (insert "\^L\n\"" key-src "\"\n")
-  (backward-char 1))
+  (when (or (hbdata:to-hbdata-buffer directory create)
+   (and ln-dir (hbdata:to-hbdata-buffer ln-dir nil)
+(setq create nil
+  directory ln-dir)))
+   (goto-char 1)
+   (cond ((search-forward (concat "\^L\n\"" key-src "\"")
+  nil t)
+  (setq rtn t))
+ (create
+  (setq rtn t)
+  (insert "\^L\n\"" key-src "\"\n")
+  (backward-char 1)
 rtn))
 
 (defun hbdata:write (&optional orig-lbl-key but-sym)
diff --git a/hbut.el b/hbut.el
index a4854dbac9..a34d81ab77 100644
--- a/hbut.el
+++ b/hbut.el
@@ -3,7 +3,7 @@
 ;; Author:   Bob Weiner
 ;;
 ;; Orig-Date:18-Sep-91 at 02:57:09
-;; Last-Mod: 23-Oct-22 at 12:12:32 by Bob Weiner
+;; Last-Mod:  5-Nov-22 at 14:05:18 by Bob Weiner
 ;;
 ;; Copyright (C) 1991-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -91,7 +91,7 @@ If successful, leave point in button data buffer, so caller 
should use
 Default is `hbut:current'.
 Return entry deleted (a list of attribute values) or nil."
   (unless but-sym
-(setq but-sym 'hbut:current))
+(setq but-sym (ebut:at-p)))
   (when (ebut:is-p but-sym)
 (let* ((but-key (hattr:get but-sym 'lbl-key))
   (loc (hattr:get but-sym 'loc))

[elpa] externals/leaf 442435d517 1/2: fix typo

[ELPA Syncer]

branch: externals/leaf
commit 442435d517223386ab95a965f972c099a671aeb8
Author: strangepr0gram 
Commit: strangepr0gram 

fix typo
---
 README.md  | 2 +-
 README.org | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index cd30d84f47..e02975c6e8 100644
--- a/README.md
+++ b/README.md
@@ -977,7 +977,7 @@ Now that the proper Elisp packaging practices have become 
widely known, it is a
 
 You can of course set multiple variables and set the evaluation result of the 
S expression to a variable.
 
-The value set to `custom-face` should also be quoed to emphasize uniformity as 
`leaf`.
+The value set to `custom-face` should also be quoted to emphasize uniformity 
as `leaf`.
 
 ```emacs-lisp
 (cort-deftest-with-macroexpand leaf/custom
diff --git a/README.org b/README.org
index 5bd46aff6a..ca11f4bec6 100644
--- a/README.org
+++ b/README.org
@@ -1096,7 +1096,7 @@ it is a best practice to use ~custom-set-variables~ to 
customize packages.
 You can of course set multiple variables and set the evaluation result
 of the S expression to a variable.
 
-The value set to ~custom-face~ should also be quoed to emphasize uniformity as 
~leaf~.
+The value set to ~custom-face~ should also be quoted to emphasize uniformity 
as ~leaf~.
 
 #+begin_src emacs-lisp
   (cort-deftest-with-macroexpand leaf/custom

[elpa] externals/leaf c37b31cc1f 2/2: Merge pull request #531 from strangepr0gram/master

[ELPA Syncer]

branch: externals/leaf
commit c37b31cc1f2bf2b3ae31fa9eac234e879fefc29f
Merge: 9eb18e8c9c 442435d517
Author: Naoya Yamashita 
Commit: GitHub 

Merge pull request #531 from strangepr0gram/master

fix typo
---
 README.md  | 2 +-
 README.org | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index cd30d84f47..e02975c6e8 100644
--- a/README.md
+++ b/README.md
@@ -977,7 +977,7 @@ Now that the proper Elisp packaging practices have become 
widely known, it is a
 
 You can of course set multiple variables and set the evaluation result of the 
S expression to a variable.
 
-The value set to `custom-face` should also be quoed to emphasize uniformity as 
`leaf`.
+The value set to `custom-face` should also be quoted to emphasize uniformity 
as `leaf`.
 
 ```emacs-lisp
 (cort-deftest-with-macroexpand leaf/custom
diff --git a/README.org b/README.org
index 5bd46aff6a..ca11f4bec6 100644
--- a/README.org
+++ b/README.org
@@ -1096,7 +1096,7 @@ it is a best practice to use ~custom-set-variables~ to 
customize packages.
 You can of course set multiple variables and set the evaluation result
 of the S expression to a variable.
 
-The value set to ~custom-face~ should also be quoed to emphasize uniformity as 
~leaf~.
+The value set to ~custom-face~ should also be quoted to emphasize uniformity 
as ~leaf~.
 
 #+begin_src emacs-lisp
   (cort-deftest-with-macroexpand leaf/custom

[elpa] externals/pyim 93fab3c9e8: v5.2.8

[ELPA Syncer]

branch: externals/pyim
commit 93fab3c9e8c2490687781d45c1cecead0bd3ecf2
Author: Feng Shu 
Commit: Feng Shu 

v5.2.8
---
 pyim.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyim.el b/pyim.el
index 67b95a53fe..c3e5fcff8c 100644
--- a/pyim.el
+++ b/pyim.el
@@ -7,7 +7,7 @@
 ;; Feng Shu 
 ;; Maintainer: Feng Shu 
 ;; URL: https://github.com/tumashu/pyim
-;; Version: 5.2.7
+;; Version: 5.2.8
 ;; Keywords: convenience, Chinese, pinyin, input-method
 ;; Package-Requires: ((emacs "25.1") (async "1.6") (xr "1.13"))
 

[elpa] externals/org 5e0c5c186d: org-babel: Add new "strip-tangle" :noweb argument value

[ELPA Syncer]

branch: externals/org
commit 5e0c5c186dc151a2a2447a52c57f0db5b501a17b
Author: Daniel Ziltener 
Commit: Ihor Radchenko 

org-babel: Add new "strip-tangle" :noweb argument value

* lisp/ob-tangle.el (org-babel-tangle-single-block): Strip noweb tags
from block if :noweb has been set to "strip-tangle".
* lisp/ob-core.el (org-babel-common-header-args-w-values): Add
"strip-tangle" as new allowed value.
* lisp/ob-core.el (org-babel-noweb-p): Add "strip-tangle" at the
appropriate positions.
* testing/lisp/test-ob-tangle.el (ob-tangle/strip-tangle): Add new test
case for "strip-tangle".
* doc/org-manual.org (Noweb Reference Syntax): Adjust documentation for
the noweb header argument.
* etc/ORG-NEWS: Add entry for new header argument value.

This patch adds the "strip-tangle" option for the :noweb header
argument.  This strips the noweb tags before tangling the block.  This can
be useful for e.g. testing purposes where one wants to use a block as
test case that can be both run inline as well as tangled into a file for
automated testing.

TINYCHANGE
---
 doc/org-manual.org |  6 ++
 etc/ORG-NEWS   |  5 +
 lisp/ob-core.el|  8 
 lisp/ob-tangle.el  |  4 +++-
 testing/lisp/test-ob-tangle.el | 26 ++
 5 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/doc/org-manual.org b/doc/org-manual.org
index b3071ec6dc..90fd950dc3 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -18998,6 +18998,12 @@ tangled, or exported.
   Expansion of noweb syntax references in the body of the code block
   when tangling.  No expansion when evaluating or exporting.
 
+- =strip-tangle= ::
+
+  Expansion of noweb syntax references in the body of the code block
+  when evaluating or exporting.  Removes noweb syntax references
+  when exporting.
+
 - =no-export= ::
 
   Expansion of noweb syntax references in the body of the code block
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index b542da34be..ca19446147 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -228,6 +228,11 @@ commands.
 =:noweb-prefix= can be set to =no= to prevent the prefix characters
 from being repeated when expanding a multiline noweb reference.
 
+*** New =:noweb= babel header argument value =strip-tangle=
+
+=:noweb= can be set to =strip-tangle= to strip the noweb syntax references
+before tangling.
+
 *** New LaTeX source block backend using =engraved-faces-latex=
 
 When ~org-latex-src-block-backend~ is set to ~engraved~,
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index a1c11e6ca1..22d60cfe60 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -415,7 +415,7 @@ then run `org-babel-switch-to-session'."
 (mkdirp. ((yes no)))
 (no-expand)
 (noeval)
-(noweb . ((yes no tangle no-export strip-export)))
+(noweb . ((yes no tangle strip-tangle no-export strip-export)))
 (noweb-ref . :any)
 (noweb-sep  . :any)
 (noweb-prefix . ((no yes)))
@@ -2885,9 +2885,9 @@ parameters when merging lists."
   "Check if PARAMS require expansion in CONTEXT.
 CONTEXT may be one of :tangle, :export or :eval."
   (let ((allowed-values (cl-case context
- (:tangle '("yes" "tangle" "no-export" "strip-export"))
- (:eval   '("yes" "no-export" "strip-export" "eval"))
- (:export '("yes")
+ (:tangle '("yes" "tangle" "no-export" "strip-export" 
"strip-tangle"))
+ (:eval   '("yes" "no-export" "strip-export" "eval" 
"strip-tangle"))
+ (:export '("yes" "strip-tangle")
 (cl-some (lambda (v) (member v allowed-values))
 (split-string (or (cdr (assq :noweb params)) "")
 
diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el
index 2da92efaf2..ad027ccd06 100644
--- a/lisp/ob-tangle.el
+++ b/lisp/ob-tangle.el
@@ -536,7 +536,9 @@ non-nil, return the full association list to be used by
 (body
  ;; Run the tangle-body-hook.
   (let ((body (if (org-babel-noweb-p params :tangle)
- (org-babel-expand-noweb-references info)
+  (if (string= "strip-tangle" (cdr (assq :noweb (nth 2 
info
+(replace-regexp-in-string (org-babel-noweb-wrap) 
"" (nth 1 info))
+   (org-babel-expand-noweb-references info))
(nth 1 info
(with-temp-buffer
  (insert
diff --git a/testing/lisp/test-ob-tangle.el b/testing/lisp/test-ob-tangle.el
index a0003ee408..2a6e4b1dd1 100644
--- a/testing/lisp/test-ob-tangle.el
+++ b/testing/lisp/test-ob-tangle.el
@@ -510,6 +510,32 @@ another block
(org-split-string (buffer-string
  (delete-file file))
 
+(ert-deftest ob-tangle/strip-tangle ()
+  "Test if strip-tangle works correctly when tangling noweb co

[elpa] externals/pyim 16f7c3cf07: Update README

[ELPA Syncer]

branch: externals/pyim
commit 16f7c3cf0736a65d8af0c8ba8396343dbd17e368
Author: Feng Shu 
Commit: Feng Shu 

Update README
---
 README.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.org b/README.org
index 58897999a1..c31cc105fe 100644
--- a/README.org
+++ b/README.org
@@ -608,7 +608,7 @@ pyim 安装后，可以通过下面的设置开启拼音搜索功能：
 #+end_src
 
 #+RESULTS:
-: 
\(?:.*\(?:nihao\|[乜伲佞你倪凝匿呢咛啮嗫坭埝妞妮娘嬲孽宁尼尿嵲年廿念忸怩恁您慝扭拈拗拟拧捏捻摄撵旎昵杻柠氽泞泥涅溺牛狃狞猊甯疒睨碾祢粘糵纽聂聍脲腻臬苧茑菍蔫薿蘖蚴袅蹑辇辗逆酿钮铌镊镍陧霓颞鲇鲵鲶鸟鸮鹝鹢麑黏][号嗥嚆嚎壕好昊毫浩淏濠灏皓皞耗蒿薅蚝诐豪貉郝鄗镐颢鸮]\).*\)
+: 
\(?:.*\(?:nihao\|[㒟㖏㖕㖖㖻㘈㘝㘨㘿㙞㚔㜤㜦㜵㜸㝕㞋㞙㞾㟧㠜㠡㡪㣇㣷㤛㥾㦐㧱㩘㩶㪒㭤㮆㮏㮞㮟㲡㲰㲻㲽㳮㴪㵫㸎㹸㺲㼭㽱㿦䀑䀔䁥䂇䂼䃵䄒䄭䄹䆨䇣䋴䋻䌜䌰䍲䏔䐁䒜䔭䕥䖆䗿䘌䘦䘽䙚䚓䚾䛏䛘䜆䜓䝚䞕䟢䡾䤔䦊䦵䧇䧔䩞䬯䭃䭢䭲䮍䮗䮘䯀䯅䯵䰯䳖䴴䵑䵒乜伱伲佞你侫倪儗儜儞兒凝匿卄呢咛唸啮喦嗫噛嚀嚙囁囐囓囜圼坭埝埿堄妞妮妳姩娘婗嫋嫟嬝嬢嬣嬲嬺孃孨孴孼孽宁寍寕寗寜寧尼尿屔屰峊嵲嶭巕帇年廿念忸怓怩恁您惄惗愵慝懝扭抐抝抳拈拗拟拧拰捏捻掜揑摂摄摰撚撵擜擬擰攆敜旎昵晲暱杻枿柅柠棿榐槷樢橣檷檸櫱氼氽汼沑泞泥涅涊淣淰湼溓溺濘炄牛牜狃狋狔狞猊獰甯疌疒痆眤睨矃碾祢禰秊秜秥篞簐籋籾粘糱糵紐縌纽聂聍聶聹聻胒脲腝腻膩臡臬臲艌苧苨苶茑茮莥菍蔦蔫薴薿蘖蘗蚭蚴蛪蜺蠥衂衵袅裊褭褹觬誽諗譺讘貎跈跜踂踗蹍蹑蹨躎躡輗�
 
�輾辇辗迡逆郳酿醸釀鈕鈢鈮鉨鉩銸鋷錜鎳鑈鑏鑷钀钮铌镊镍闑陧隉隬霓靵顳颞馜鬡鬤鮎鯓鯢鯰鲇鲵鲶鳥鶂鷊鸋鸟鸮鹝鹢麑黏鼰齞齧齯][㕺㘪㙱㚪㝀㞻㠙㩝㬔㬶㵆䒵䚽䝞䝥䧚䧫䪽䬉䯫侾傐儫勂号呺哠嗥嘷噑嚆嚎壕好峼恏悎昊昦晧暠暤暭曍椃毫浩淏滈澔濠瀥灏灝狢獆獋獔皓皜皞皡皥秏竓籇耗聕茠蒿薃薅薧藃號虠蚝蠔諕譹诐豪貉郝鄗鎬
 [...]
 
 ** 让 ivy 支持拼音搜索候选项功能
 

[elpa] externals/triples e91514ddd7: Bump the version to 0.1.

[ELPA Syncer]

branch: externals/triples
commit e91514ddd71fff76f8f92934a2c1d8cb7da789cc
Author: Andrew Hyatt 
Commit: Andrew Hyatt 

Bump the version to 0.1.

This will cause this package to release on GNU ELPA, making 0.1 the first
published version.
---
 triples.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/triples.el b/triples.el
index 638da56e72..44b528d63a 100644
--- a/triples.el
+++ b/triples.el
@@ -6,7 +6,7 @@
 ;; Homepage: https://github.com/ahyatt/triples
 ;; Package-Requires: ((seq "2.0") (emacs "25"))
 ;; Keywords: triples, kg, data, sqlite
-;; Version: 0.0
+;; Version: 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 the Free Software Foundation; either version 2 of the

[elpa] externals/org 155dc778e8: * lisp/org.el: (org-get-indirect-buffer) Allow indirect base buffers

[ELPA Syncer]

branch: externals/org
commit 155dc778e8cd12bdfb4c7cac7e03f166ece1059c
Author: Adam Porter 
Commit: Ihor Radchenko 

* lisp/org.el: (org-get-indirect-buffer) Allow indirect base buffers

Previously, calling this function on an indirect buffer would fail,
preventing the user from making a new indirect buffer based on an
indirect buffer (e.g. imagine the user makes an indirect buffer for a
large subtree, then wants to make another one for a subtree of that).
Now, the base buffer of the buffer is used, when applicable.

Also, the function is partially rewritten to be clearer, and a
docstring is added.

Link: 
https://orgmode.org/list/8b2c1814-2c6f-fdca-8ba7-63c415bfc...@alphapapa.net
---
 lisp/org.el | 35 ---
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index d8708f8f25..6c39f351fa 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -6160,25 +6160,22 @@ frame is not changed."
 (run-hook-with-args 'org-cycle-hook 'all)
 (and (window-live-p cwin) (select-window cwin
 
-(defun org-get-indirect-buffer (&optional buffer heading)
-  (setq buffer (or buffer (current-buffer)))
-  (let ((n 1) (base (buffer-name buffer)) bname)
-(while (buffer-live-p
-   (get-buffer
-(setq bname
-  (concat base "-"
-  (if heading (concat heading "-" (number-to-string n))
-(number-to-string n))
-  (setq n (1+ n)))
-(condition-case nil
-(let ((indirect-buffer (make-indirect-buffer buffer bname 'clone)))
-  ;; Decouple folding state.  We need to do it manually since
-  ;; `make-indirect-buffer' does not run
-  ;; `clone-indirect-buffer-hook'.
-  (org-fold-core-decouple-indirect-buffer-folds)
-  ;; Return the buffer.
-  indirect-buffer)
-  (error (make-indirect-buffer buffer bname)
+(cl-defun org-get-indirect-buffer (&optional (buffer (current-buffer)) heading)
+  "Return an indirect buffer based on BUFFER.
+If HEADING, append it to the name of the new buffer."
+  (let* ((base-buffer (or (buffer-base-buffer buffer) buffer))
+ (buffer-name (generate-new-buffer-name
+   (format "%s%s"
+   (buffer-name base-buffer)
+   (if heading
+   (concat "::" heading)
+ ""
+ (indirect-buffer (make-indirect-buffer base-buffer buffer-name 
'clone)))
+;; Decouple folding state.  We need to do it manually since
+;; `make-indirect-buffer' does not run
+;; `clone-indirect-buffer-hook'.
+(org-fold-core-decouple-indirect-buffer-folds)
+indirect-buffer))
 
 (defun org-set-frame-title (title)
   "Set the title of the current frame to the string TITLE."

[nongnu] elpa/editorconfig 3352e48780: Prepare v0.9.1 (#281)

[ELPA Syncer]

branch: elpa/editorconfig
commit 3352e487809dda4a0366314e30c9efa431b61f79
Author: 10sr <8.slas...@gmail.com>
Commit: GitHub 

Prepare v0.9.1 (#281)
---
 CHANGELOG.md| 11 ++-
 editorconfig.el |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3d6114a66..57dd2f0653 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,13 @@ and this project adheres to [Semantic 
Versioning](https://semver.org/spec/v2.0.0
 ### Security
 
 
+## [0.9.1] - 2022-11-07
+
+### Fixed
+
+-  Check filename rather than buffer-file-name for consistency ([#280])
+
+
 ## [0.9.0] - 2022-10-23
 
 ### Changed
@@ -234,7 +241,8 @@ and this project adheres to [Semantic 
Versioning](https://semver.org/spec/v2.0.0
 *Undocumented*
 
 
-[Unreleased]: 
https://github.com/editorconfig/editorconfig-emacs/compare/v0.9.0...HEAD
+[Unreleased]: 
https://github.com/editorconfig/editorconfig-emacs/compare/v0.9.1...HEAD
+[0.9.1]: 
https://github.com/editorconfig/editorconfig-emacs/compare/v0.9.0...v0.9.1
 [0.9.0]: 
https://github.com/editorconfig/editorconfig-emacs/compare/v0.8.2...v0.9.0
 [0.8.2]: 
https://github.com/editorconfig/editorconfig-emacs/compare/v0.8.1...v0.8.2
 [0.8.1]: 
https://github.com/editorconfig/editorconfig-emacs/compare/v0.8.0...v0.8.1
@@ -262,6 +270,7 @@ and this project adheres to [Semantic 
Versioning](https://semver.org/spec/v2.0.0
 [0.3]: https://github.com/editorconfig/editorconfig-emacs/compare/v0.2...v0.3
 [0.2]: https://github.com/editorconfig/editorconfig-emacs/compare/v0.1...v0.2
 [0.1]: https://github.com/editorconfig/editorconfig-emacs/releases/tag/v0.1
+[#280]: https://github.com/editorconfig/editorconfig-emacs/issues/280
 [#263]: https://github.com/editorconfig/editorconfig-emacs/issues/263
 [#260]: https://github.com/editorconfig/editorconfig-emacs/issues/260
 [#258]: https://github.com/editorconfig/editorconfig-emacs/issues/258
diff --git a/editorconfig.el b/editorconfig.el
index d8146b0e71..8438be611d 100644
--- a/editorconfig.el
+++ b/editorconfig.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2011-2021 EditorConfig Team
 
 ;; Author: EditorConfig Team 
-;; Version: 0.9.0
+;; Version: 0.9.1
 ;; URL: https://github.com/editorconfig/editorconfig-emacs#readme
 ;; Package-Requires: ((cl-lib "0.5") (nadvice "0.3") (emacs "24"))
 

[nongnu] elpa/moe-theme b7960f079e: Fix magit-section-highlight

[ELPA Syncer]

branch: elpa/moe-theme
commit b7960f079e6f2b82468b4ca2afd4edf8bbdb6fdb
Author: ono ono 
Commit: ono ono 

Fix magit-section-highlight
---
 moe-dark-theme.el  | 2 +-
 moe-light-theme.el | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/moe-dark-theme.el b/moe-dark-theme.el
index dcc9165dad..1c4c1a4cfd 100644
--- a/moe-dark-theme.el
+++ b/moe-dark-theme.el
@@ -504,7 +504,7 @@ Moe, moe, kyun!")
`(magit-reflog-reset ((,class (:foreground ,red-3 :background ,red-00
`(magit-section-heading ((,class (:foreground ,orange-3 :background nil 
:bold t :underline t
`(magit-section-heading-selection ((,class (:foreground ,white-0 
:background ,blue-3
-   `(magit-section-highlight ((,class (:background ,black-3
+   `(magit-section-highlight ((,class (:background ,black-3 :foreground 
,white-0
`(magit-sequence-done ((,class (:foreground ,green-3
`(magit-sequence-drop ((,class (:foreground ,orange-2
`(magit-sequence-head ((,class (:foreground ,blue-2
diff --git a/moe-light-theme.el b/moe-light-theme.el
index 0c1deb902a..1d6860c0d0 100644
--- a/moe-light-theme.el
+++ b/moe-light-theme.el
@@ -503,7 +503,7 @@ Moe, moe, kyun!")
`(magit-reflog-reset ((,class (:foreground ,red-3 :background ,red-00
`(magit-section-heading ((,class (:foreground ,orange-3 :background nil 
:bold t :underline t
`(magit-section-heading-selection ((,class (:foreground ,black-6 
:background ,blue-0
-   `(magit-section-highlight ((,class (:background ,yellow-00
+   `(magit-section-highlight ((,class (:background ,yellow-0, :foreground 
,black-5
`(magit-sequence-done ((,class (:foreground ,green-3
`(magit-sequence-drop ((,class (:foreground ,orange-2
`(magit-sequence-head ((,class (:foreground ,blue-2

[elpa] externals/org updated (155dc778e8 -> 0de063a521)

[ELPA Syncer]

elpasync pushed a change to branch externals/org.

  from  155dc778e8 * lisp/org.el: (org-get-indirect-buffer) Allow indirect 
base buffers
   new  e3a7c01874 Refactor `org-time-stamp-custom-formats' and 
`org-time-stamp-formats'
   new  0de063a521 org-babel-interpret-haskell: Don't remove outputs that 
match inputs


Summary of changes:
 etc/ORG-NEWS |  30 ++
 lisp/ob-haskell.el   |   2 +-
 lisp/ol.el   |   3 +-
 lisp/org-agenda.el   |   4 +-
 lisp/org-archive.el  |   4 +-
 lisp/org-clock.el|   3 +-
 lisp/org-colview.el  |   3 +-
 lisp/org-compat.el   |   2 +
 lisp/org-element.el  |   4 +-
 lisp/org-macro.el|   2 +-
 lisp/org-pcomplete.el|   3 +-
 lisp/org.el  | 100 ++-
 lisp/ox-odt.el   |  18 -
 lisp/ox.el   |   2 +-
 testing/lisp/test-org.el |   6 +--
 15 files changed, 119 insertions(+), 67 deletions(-)

[elpa] externals/org 0de063a521 2/2: org-babel-interpret-haskell: Don't remove outputs that match inputs

[ELPA Syncer]

branch: externals/org
commit 0de063a52181bd96ac9bf023454781f07c3353b3
Author: Bruno BARBIER 
Commit: Ihor Radchenko 

org-babel-interpret-haskell: Don't remove outputs that match inputs

* lisp/ob-haskell.el (org-babel-interpret-haskell): Change the call to
`org-babel-comint-with-output'.
---
 lisp/ob-haskell.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/ob-haskell.el b/lisp/ob-haskell.el
index d195dcf873..99e590bfb3 100644
--- a/lisp/ob-haskell.el
+++ b/lisp/ob-haskell.el
@@ -136,7 +136,7 @@ a parameter, such as \"ghc -v\"."
 (comint-preoutput-filter-functions
  (cons 'ansi-color-filter-apply comint-preoutput-filter-functions))
  (raw (org-babel-comint-with-output
- (session org-babel-haskell-eoe t full-body)
+ (session org-babel-haskell-eoe nil full-body)
 (insert (org-trim full-body))
 (comint-send-input nil t)
 (insert org-babel-haskell-eoe)

[elpa] externals/org e3a7c01874 1/2: Refactor `org-time-stamp-custom-formats' and `org-time-stamp-formats'

[ELPA Syncer]

branch: externals/org
commit e3a7c01874c9bb80e04ffa58c578619faf09e7f0
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

Refactor `org-time-stamp-custom-formats' and `org-time-stamp-formats'

* lisp/org.el (org-time-stamp-formats):
* lisp/org.el (org-time-stamp-custom-formats): Change the default
values stripping leading "<" and trailing ">".  Update the docstring
explaining the format and that leading and trailing brackets are now
ignored.  Update the :type specification to more precise.
(org-time-stamp-format): Update the argument list and docstring
allowing to use the function more flexibly to find the time stamp
format for both `org-time-stamp-formats' and
`org-time-stamp-custom-formats'.  Rename `long' argument to more
accurate `with-time'.  Ignore brackets in the `org-time-stamp-formats'
and `org-time-stamp-custom-formats'.  Allow `inactive' argument to be
`no-brackets'
(org-format-timestamp):
(org-read-date-display):
(org-insert-time-stamp):
(org-display-custom-time):
(org-timestamp-translate):
* lisp/org-compat.el (org-timestamp-format): Rename
`org-timestamp-format' to `org-format-timestamp'.  The old variant is
too similar with other `org-time-stamp-format' function.  Also, use
`org-time-stamp-format' to determine the timestamp format instead of
using `org-time-stamp-formats' directly.
* lisp/ol.el (org-store-link):
* lisp/org-agenda.el (org-agenda-get-timestamps):
(org-agenda-get-progress):
* lisp/org-archive.el (org-archive-subtree):
(org-archive-to-archive-sibling):
* lisp/org-clock.el (org-clock-special-range):
* lisp/org-colview.el (org-colview-construct-allowed-dates):
* lisp/org-element.el (org-element-timestamp-interpreter):
* lisp/org-macro.el (org-macro--find-date):
* lisp/org-pcomplete.el (pcomplete/org-mode/file-option/date):
* lisp/ox-odt.el (org-odt--format-timestamp):
(org-odt-template):
* lisp/ox.el (org-export-get-date):
* testing/lisp/test-org.el (test-org/timestamp-format): Use
`org-time-stamp-format' instead of directly examining
`org-time-stamp-custom-formats' and `org-time-stamp-formats'.  Use the
new function name `org-format-timestamp'.
* etc/ORG-NEWS (Default values and interpretations of 
~org-time-stamp-formats~ and ~org-time-stamp-custom-formats~ are changed):
(~org-timestamp-format~ is renamed to ~org-format-timestamp~):
(Updated argument list in ~org-time-stamp-format~): Document the
user-facing changes.

This commit documents and unifies previously undocumented assumptions
about the values of `org-time-stamp-formats' and
`org-time-stamp-custom-formats'.  Instead of fiddling with
leading/trailing brackets in the values, expedite the time format
calculation to `org-time-stamp-format'.  The undocumented assumption
about brackets in user option `org-time-stamp-custom-formats' is not
relaxed making the docstring correct.

Reported-by: Uwe Brauer 
Link: https://orgmode.org/list/87k04ppp1t.fsf@localhost
---
 etc/ORG-NEWS |  30 ++
 lisp/ol.el   |   3 +-
 lisp/org-agenda.el   |   4 +-
 lisp/org-archive.el  |   4 +-
 lisp/org-clock.el|   3 +-
 lisp/org-colview.el  |   3 +-
 lisp/org-compat.el   |   2 +
 lisp/org-element.el  |   4 +-
 lisp/org-macro.el|   2 +-
 lisp/org-pcomplete.el|   3 +-
 lisp/org.el  | 100 ++-
 lisp/ox-odt.el   |  18 -
 lisp/ox.el   |   2 +-
 testing/lisp/test-org.el |   6 +--
 14 files changed, 118 insertions(+), 66 deletions(-)

diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index ca19446147..b84a689a7c 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -460,6 +460,36 @@ exported and an ASCII graph will be inserted below the src 
block.
 
 The new variable name is =org-plantuml-args=.  It now applies to both
 jar PlantUML file and executable.
+*** Default values and interpretations of ~org-time-stamp-formats~ and 
~org-time-stamp-custom-formats~ are changed
+
+Leading =<= and trailing =>= in the default values of
+~org-time-stamp-formats~ and ~org-time-stamp-custom-formats~ are
+stripped.
+
+The Org functions that are using these variables also ignore leading
+and trailing brackets (=<...>= and =[...]=, if present).
+
+This change makes the Org code more consistent and also makes the
+docstring for ~org-time-stamp-custom-formats~ accurate.
+
+No changes on the user side are needed if
+~org-time-stamp-custom-formats~ was customized.
+*** ~org-timestamp-format~ is renamed to ~org-format-timestamp~
+
+The old function name is similar to other ~org-time-stamp-format~
+function.  The new name emphasizes that ~org-format-timestamp~ works
+on =timestamp= objects.
+
+*** Updated argument list in ~org-time-stamp-format~
+
+New =custom= argument in ~org-time-stamp-format~ makes the function
+use ~o