[elpa] externals/org updated (210630e546 -> 17425599cf)

2022-11-03 Thread ELPA Syncer 
elpasync pushed a change to branch externals/org.

  from  210630e546 org-odt-link: Fix relative file links
   new  aaccbb2f98 ob-latex: Export the full area of the drawing
   new  17425599cf ob-latex: Call Inkscape with descriptive arguments


Summary of changes:
 lisp/ob-latex.el | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

[elpa] externals/org aaccbb2f98 1/2: ob-latex: Export the full area of the drawing

2022-11-03 Thread ELPA Syncer 
branch: externals/org
commit aaccbb2f987e80190cfb7ca0cb87d2546455a468
Author: Rudolf Adamkovič 
Commit: Ihor Radchenko 

ob-latex: Export the full area of the drawing

* lisp/ob-latex.el (org-babel-latex-pdf-svg-process): Add the argument
-D (--export-area-drawing) to avoid sub-point cuts on hi-DPI screens,
where Inkscape sometimes cuts off a single physical pixel from the
exported drawing.
---
 lisp/ob-latex.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/ob-latex.el b/lisp/ob-latex.el
index a86699e229..c39c9c5d3b 100644
--- a/lisp/ob-latex.el
+++ b/lisp/ob-latex.el
@@ -110,7 +110,7 @@ exporting the literal LaTeX source."
   :type 'function)
 
 (defcustom org-babel-latex-pdf-svg-process
-  "inkscape --pdf-poppler %f -T -l -o %O"
+  "inkscape --pdf-poppler %f -D -T -l -o %O"
   "Command to convert a PDF file to an SVG file."
   :group 'org-babel
   :type 'string)

[elpa] externals/org 17425599cf 2/2: ob-latex: Call Inkscape with descriptive arguments

2022-11-03 Thread ELPA Syncer 
branch: externals/org
commit 17425599cf7e7a7ec311204851005e141f5ce89b
Author: Rudolf Adamkovič 
Commit: Ihor Radchenko 

ob-latex: Call Inkscape with descriptive arguments

* lisp/ob-latex.el (org-babel-latex-pdf-svg-process): Use descriptive
arguments, such as '--export-area-drawing' instead of '-D', to
optimize for readability and not brevity (which makes sense for
interactive use, which does not apply here).
---
 lisp/ob-latex.el | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lisp/ob-latex.el b/lisp/ob-latex.el
index c39c9c5d3b..69124a36c1 100644
--- a/lisp/ob-latex.el
+++ b/lisp/ob-latex.el
@@ -110,7 +110,13 @@ exporting the literal LaTeX source."
   :type 'function)
 
 (defcustom org-babel-latex-pdf-svg-process
-  "inkscape --pdf-poppler %f -D -T -l -o %O"
+  "inkscape \
+--pdf-poppler \
+--export-area-drawing \
+--export-text-to-path \
+--export-plain-svg \
+--export-filename=%O \
+%f"
   "Command to convert a PDF file to an SVG file."
   :group 'org-babel
   :type 'string)

[elpa] externals/org bd468136dd: lisp/ob-sql.el: Add Daniel Kraus as the maintainer

2022-11-03 Thread ELPA Syncer 
branch: externals/org
commit bd468136dd1a2172302b3ec980c5e6b6e327d683
Author: Bastien 
Commit: Bastien 

lisp/ob-sql.el: Add Daniel Kraus as the maintainer
---
 lisp/ob-sql.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lisp/ob-sql.el b/lisp/ob-sql.el
index 626d595c9f..9f4fa1d786 100644
--- a/lisp/ob-sql.el
+++ b/lisp/ob-sql.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2009-2022 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
+;; Maintainer: Daniel Kraus 
 ;; Keywords: literate programming, reproducible research
 ;; URL: https://orgmode.org

[nongnu] elpa/php-mode updated (c3c442a3fa -> 3321d49099)

2022-11-03 Thread ELPA Syncer 
elpasync pushed a change to branch elpa/php-mode.

  from  c3c442a3fa Merge pull request #711 from 
emacs-php/feature/emacs28-font-lock-doc-markup-face
   new  235c9a0fd9 Add @phpstan-self-out and @phpstan-this-out keywords 
(#714)
   new  3321d49099 Add @param-out keyword in php-phpdoc-type-tags (#715)


Summary of changes:
 lisp/php-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[nongnu] elpa/php-mode 235c9a0fd9 1/2: Add @phpstan-self-out and @phpstan-this-out keywords (#714)

2022-11-03 Thread ELPA Syncer 
branch: elpa/php-mode
commit 235c9a0fd9ad488cf1c9ddc86fbf6b5100015121
Author: take 
Commit: GitHub 

Add @phpstan-self-out and @phpstan-this-out keywords (#714)
---
 lisp/php-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/php-mode.el b/lisp/php-mode.el
index e1ee50d8b9..9f9af9e2d4 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -1291,7 +1291,7 @@ for \\[find-tag] (which see)."
 
 (defconst php-phpdoc-type-tags
   (list "package" "param" "property" "property-read" "property-write"
-"return" "throws" "var"))
+"return" "throws" "var" "self-out" "this-out"))
 
 (defconst php-phpdoc-font-lock-doc-comments
   `(("{@[-[:alpha:]]+\\s-*\\([^}]*\\)}" ; "{@foo ...}" markup.

[nongnu] elpa/php-mode 3321d49099 2/2: Add @param-out keyword in php-phpdoc-type-tags (#715)

2022-11-03 Thread ELPA Syncer 
branch: elpa/php-mode
commit 3321d490991ec26e32dac6e10b09ae6c1dfe799b
Author: take 
Commit: GitHub 

Add @param-out keyword in php-phpdoc-type-tags (#715)
---
 lisp/php-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/php-mode.el b/lisp/php-mode.el
index 9f9af9e2d4..d90cad28d9 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -1291,7 +1291,7 @@ for \\[find-tag] (which see)."
 
 (defconst php-phpdoc-type-tags
   (list "package" "param" "property" "property-read" "property-write"
-"return" "throws" "var" "self-out" "this-out"))
+"return" "throws" "var" "self-out" "this-out" "param-out"))
 
 (defconst php-phpdoc-font-lock-doc-comments
   `(("{@[-[:alpha:]]+\\s-*\\([^}]*\\)}" ; "{@foo ...}" markup.

[elpa] main fa3dd57f9f: * README (=:branch BRANCH=): Doc that this is ignored when :url is nil

2022-11-03 Thread Stephen Leake 
branch: main
commit fa3dd57f9f95cb1acc65582bebc9ac3c5858a095
Author: Stephen Leake 
Commit: Stephen Leake 

* README (=:branch BRANCH=): Doc that this is ignored when :url is nil
---
 README | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README b/README
index 2ac0eedde8..b151cf77f3 100644
--- a/README
+++ b/README
@@ -144,6 +144,8 @@ It can be a single file name or a list of file names.
 Specifies the branch to follow in the upstream Git repository, in case
 it should be different from the default branch.
 
+If there is no upstream (=:url= is nil), this is simply ignored.
+
 ** =:lisp-dir=
 Subdirectory in which the main ELisp found are found.
 Defaults to the top-level directory.
@@ -162,7 +164,7 @@ and only if the version number in the development branch 
indicates that it
 contains development code (i.e. a "snapshot" version, according to
 `version-to-list`).
 
-If there is no upstream (:url is nil), the presence of :release-branch
+If there is no upstream (=:url= is nil), the presence of :release-branch
 just indicates that release and devel branches in elpa.git are desired
 (the name given in :release-branch is ignored). The release branch is
 named `externals-release/' for GNU ELPA and

[elpa] elpa-admin beea0601c0: * README (=:branch BRANCH=): Doc that this is ignored if :url is nil

2022-11-03 Thread Stephen Leake 
branch: elpa-admin
commit beea0601c0eacdca77226c5f715d3dbd4ff27b00
Author: Stephen Leake 
Commit: Stephen Leake 

* README (=:branch BRANCH=): Doc that this is ignored if :url is nil
---
 README | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README b/README
index 7f583563e2..0d7dc48a39 100644
--- a/README
+++ b/README
@@ -123,6 +123,8 @@ It can be a single file name or a list of file names.
 Specifies the branch to follow in the upstream Git repository, in case
 it should be different from the default branch.
 
+If there is no upstream (=:url= is nil), this is simply ignored.
+
 ** =:lisp-dir=
 Subdirectory in which the main ELisp found are found.
 Defaults to the top-level directory.
@@ -141,7 +143,7 @@ and only if the version number in the development branch 
indicates that it
 contains development code (i.e. a "snapshot" version, according to
 `version-to-list`).
 
-If there is no upstream (:url is nil), the presence of :release-branch
+If there is no upstream (=:url= is nil), the presence of :release-branch
 just indicates that release and devel branches in elpa.git are desired
 (the name given in :release-branch is ignored). The release branch is
 named `externals-release/' for GNU ELPA and

[nongnu] elpa/php-mode fe8ab0903c: Add key-of and value-of type (#716)

2022-11-03 Thread ELPA Syncer 
branch: elpa/php-mode
commit fe8ab0903c7d552df31900fef46c011df3dbbeea
Author: USAMI Kenta 
Commit: GitHub 

Add key-of and value-of type (#716)
---
 lisp/php-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/php-mode.el b/lisp/php-mode.el
index d90cad28d9..37f2ba602b 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -1287,7 +1287,7 @@ for \\[find-tag] (which see)."
 "never" "never-return" "never-returns" "no-return" "non-empty-array"
 "non-empty-list" "non-empty-string" "non-falsy-string"
 "numeric" "numeric-string" "positive-int" "scalar"
-"trait-string" "truthy-string"))
+"trait-string" "truthy-string" "key-of" "value-of"))
 
 (defconst php-phpdoc-type-tags
   (list "package" "param" "property" "property-read" "property-write"

[nongnu] elpa/spacemacs-theme 7105b42bf7 1/2: Fix solaire-hl-line-face background

2022-11-03 Thread ELPA Syncer 
branch: elpa/spacemacs-theme
commit 7105b42bf708887c2d993a8443ed2706fcf772ed
Author: Elliott Shugerman 
Commit: GitHub 

Fix solaire-hl-line-face background

Not much of a highlight when it's the same as `solaire-default-face`
---
 spacemacs-common.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spacemacs-common.el b/spacemacs-common.el
index bda37b4abf..591e782ef3 100644
--- a/spacemacs-common.el
+++ b/spacemacs-common.el
@@ -887,7 +887,7 @@ to 'auto, tags may not be properly aligned. "
 ; solaire
  `(solaire-default-face ((,class (:inherit default :background ,bg2
  `(solaire-minibuffer-face ((,class (:inherit default :background ,bg2
- `(solaire-hl-line-face ((,class (:inherit hl-line :background ,bg2
+ `(solaire-hl-line-face ((,class (:inherit hl-line :background ,bg1
  `(solaire-org-hide-face ((,class (:inherit org-hide :background ,bg2
 
 ; spaceline

[nongnu] elpa/spacemacs-theme 1ec73d68b0 2/2: Merge pull request #198 from eeshugerman/patch-1

2022-11-03 Thread ELPA Syncer 
branch: elpa/spacemacs-theme
commit 1ec73d68b0f120f92538d9a329a3a46e32f74510
Merge: e04d1f2110 7105b42bf7
Author: Nasser Alshammari 
Commit: GitHub 

Merge pull request #198 from eeshugerman/patch-1

Fix solaire-hl-line-face background
---
 spacemacs-common.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spacemacs-common.el b/spacemacs-common.el
index bda37b4abf..591e782ef3 100644
--- a/spacemacs-common.el
+++ b/spacemacs-common.el
@@ -887,7 +887,7 @@ to 'auto, tags may not be properly aligned. "
 ; solaire
  `(solaire-default-face ((,class (:inherit default :background ,bg2
  `(solaire-minibuffer-face ((,class (:inherit default :background ,bg2
- `(solaire-hl-line-face ((,class (:inherit hl-line :background ,bg2
+ `(solaire-hl-line-face ((,class (:inherit hl-line :background ,bg1
  `(solaire-org-hide-face ((,class (:inherit org-hide :background ,bg2
 
 ; spaceline

[nongnu] elpa/php-mode 0bbdc46e01 03/12: Add "type" to php-phpdoc-type-tags as "phpstan-type"

2022-11-03 Thread ELPA Syncer 
branch: elpa/php-mode
commit 0bbdc46e01abb9243421e9cf1af2675ba5a11519
Author: USAMI Kenta 
Commit: USAMI Kenta 

Add "type" to php-phpdoc-type-tags as "phpstan-type"
---
 lisp/php-mode.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/php-mode.el b/lisp/php-mode.el
index ee747b05be..effe99e661 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -1294,7 +1294,9 @@ for \\[find-tag] (which see)."
 
 (defconst php-phpdoc-type-tags
   (list "package" "param" "property" "property-read" "property-write"
-"return" "throws" "var" "self-out" "this-out" "param-out"))
+"return" "throws" "var" "self-out" "this-out" "param-out"
+"type")
+  "A list of tags specifying type names.")
 
 (defconst php-phpdoc-font-lock-doc-comments
   `(("{@[-[:alpha:]]+\\s-*\\([^}]*\\)}" ; "{@foo ...}" markup.

[nongnu] elpa/php-mode 865bc847f8 06/12: Merge pull request #717 from emacs-php/refactor/phpdoc-type-variables

2022-11-03 Thread ELPA Syncer 
branch: elpa/php-mode
commit 865bc847f8be1e0b3c9d50f737e817df61911975
Merge: fe8ab0903c 7853345918
Author: USAMI Kenta 
Commit: GitHub 

Merge pull request #717 from emacs-php/refactor/phpdoc-type-variables

Add PHPDoc types and rename variable name
---
 CHANGELOG.md | 12 +++-
 lisp/php-mode.el | 17 -
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd522ba1bd..1cccfd1309 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,13 +8,20 @@ All notable changes of the PHP Mode 1.19.1 release series are 
documented in this
 
  * **New feature: `php-complete`**
* Add `php-complete-complete-function` to autocomplete function names 
([#708])
- * Supports PHPDoc tags and types for static analysis tools ([#710])
+ * Supports PHPDoc tags and types for static analysis tools ([#710], [#715], 
[#716], [#717], thanks to [@takeokunn])
+ * Please refer to the article below
+   * PHPStan: [PHPDoc 
Types](https://phpstan.org/writing-php-code/phpdoc-types)
+   * PHPStan: [PHPDocs 
Basics](https://phpstan.org/writing-php-code/phpdocs-basics)
+   * Psalm: [Atomic Type 
Reference](https://psalm.dev/docs/annotating_code/type_syntax/atomic_types/)
+   * Psalm: [Supported 
Annotations](https://psalm.dev/docs/annotating_code/supported_annotations/)
+   * Psalm: [Template 
Annotations](https://psalm.dev/docs/annotating_code/templated_annotations/)
 
 ### Changed
 
  * Make continued expressions inside lists (arguments and arrays, etc.) have 
the same indent width as outside the list ([#703])
  * (internal) Improved readability of test failures about indentation ([#707])
  * `php-doc-annotation-tag` inherits `font-lock-doc-markup-face` if defined in 
Emacs 28 ([#711])
+ * Change `php-phpdoc-type-keywords` to `php-phpdoc-type-names` to avoid 
confusion ([#717])
 
 ### Fixed
 
@@ -26,6 +33,9 @@ All notable changes of the PHP Mode 1.19.1 release series are 
documented in this
 [#708]: https://github.com/emacs-php/php-mode/pull/708
 [#710]: https://github.com/emacs-php/php-mode/pull/710
 [#711]: https://github.com/emacs-php/php-mode/pull/711
+[#715]: https://github.com/emacs-php/php-mode/pull/715
+[#716]: https://github.com/emacs-php/php-mode/pull/716
+[#717]: https://github.com/emacs-php/php-mode/pull/717
 
 ## [1.24.1] - 2022-10-08
 
diff --git a/lisp/php-mode.el b/lisp/php-mode.el
index 37f2ba602b..5e5b66e790 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -1275,7 +1275,7 @@ for \\[find-tag] (which see)."
   (message "Unknown function: %s" tagname
 
 ;; Font Lock
-(defconst php-phpdoc-type-keywords
+(defconst php-phpdoc-type-names
   (list "string" "integer" "int" "boolean" "bool" "float"
 "double" "object" "mixed" "array" "resource"
 "void" "null" "false" "true" "self" "static"
@@ -1287,11 +1287,18 @@ for \\[find-tag] (which see)."
 "never" "never-return" "never-returns" "no-return" "non-empty-array"
 "non-empty-list" "non-empty-string" "non-falsy-string"
 "numeric" "numeric-string" "positive-int" "scalar"
-"trait-string" "truthy-string" "key-of" "value-of"))
+"trait-string" "truthy-string" "key-of" "value-of")
+  "A list of type and pseudotype names that can be used in PHPDoc.")
+
+(make-obsolete-variable 'php-phpdoc-type-keywords 'php-phpdoc-type-names 
"1.24.2")
 
 (defconst php-phpdoc-type-tags
   (list "package" "param" "property" "property-read" "property-write"
-"return" "throws" "var" "self-out" "this-out" "param-out"))
+"return" "throws" "var" "self-out" "this-out" "param-out"
+"type" "extends" "require-extends" "implemtents" "require-implements"
+"template" "template-covariant" "template-extends" 
"template-implements"
+"assert" "assert-if-true" "assert-if-false" "if-this-is")
+  "A list of tags specifying type names.")
 
 (defconst php-phpdoc-font-lock-doc-comments
   `(("{@[-[:alpha:]]+\\s-*\\([^}]*\\)}" ; "{@foo ...}" markup.
@@ -1301,11 +1308,11 @@ for \\[find-tag] (which see)."
  (1 'php-doc-variable-sigil prepend nil)
  (2 'php-variable-name prepend nil))
 ("\\(\\$\\)\\(this\\)\\>" (1 'php-doc-$this-sigil prepend nil) (2 
'php-doc-$this prepend nil))
-(,(concat "\\s-@" (rx (? (or "phpstan" "psalm") "-")) (regexp-opt 
php-phpdoc-type-tags) "\\s-+"
+(,(concat "\\s-@" (rx (? (or "phan" "phpstan" "psalm") "-")) (regexp-opt 
php-phpdoc-type-tags) "\\s-+"
   "\\(" (rx (+ (? "?") (? "\\") (+ (in "0-9A-Z_a-z")) (? "[]") (? 
"|"))) "\\)+")
  1 'php-string prepend nil)
 (,(concat "\\(?:|\\|\\?\\|\\s-\\)\\("
-  (regexp-opt php-phpdoc-type-keywords 'words)
+  (regexp-opt php-phpdoc-type-names 'words)
   "\\)")
  1 font-lock-type-face prepend nil)
 ("https?://[^\n\t ]+"

[nongnu] elpa/php-mode f5c4016bb6 12/12: Update AUTHORS

2022-11-03 Thread ELPA Syncer 
branch: elpa/php-mode
commit f5c4016bb6f8eab75133a6b306e1c57c7d8bd0af
Author: USAMI Kenta 
Commit: USAMI Kenta 

Update AUTHORS
---
 AUTHORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index 34ea83727a..ab8da75ca9 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -109,6 +109,7 @@ Names Sorted Alphabetically:
 - l3msh0
 - phil-s
 - ppercot
+- take
 - takeokunn
 - tangxinfa
 - tetsujin

[nongnu] elpa/php-mode updated (fe8ab0903c -> f5c4016bb6)

2022-11-03 Thread ELPA Syncer 
elpasync pushed a change to branch elpa/php-mode.

  from  fe8ab0903c Add key-of and value-of type (#716)
   new  08776c1b50 Changed variable name to php-phpdoc-type-names to avoid 
confusion
   new  44601ab2df Add "phan" to type tag vendor prefix
   new  0bbdc46e01 Add "type" to php-phpdoc-type-tags as "phpstan-type"
   new  258d6c5460 Add Psalm template annotations to php-phpdoc-type-tags
   new  7853345918 Update CHANGELOG
   new  865bc847f8 Merge pull request #717 from 
emacs-php/refactor/phpdoc-type-variables
   new  f35bf9a28c Add php-mode-version-id and make obsolete 
php-mode-version-number
   new  cf10f7c217 Use compat-string-trim-* functions for compatibility
   new  08ef915dc3 Revert "Use compat-string-trim-* functions for 
compatibility"
   new  9603a4f54f Revert string-trim-right
   new  b559c80a1e Merge pull request #713 from 
emacs-php/feature/php-mode-version
   new  f5c4016bb6 Update AUTHORS


Summary of changes:
 AUTHORS.md   |  1 +
 CHANGELOG.md | 20 -
 lisp/php-mode.el | 65 ++--
 3 files changed, 69 insertions(+), 17 deletions(-)

[nongnu] elpa/php-mode cf10f7c217 08/12: Use compat-string-trim-* functions for compatibility

2022-11-03 Thread ELPA Syncer 
branch: elpa/php-mode
commit cf10f7c217bcf876c67957df852a10d2293fffae
Author: USAMI Kenta 
Commit: USAMI Kenta 

Use compat-string-trim-* functions for compatibility
---
 Cask | 1 +
 Makefile | 5 -
 lisp/php-mode.el | 9 +++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Cask b/Cask
index e847468562..527f7eddb8 100644
--- a/Cask
+++ b/Cask
@@ -1,4 +1,5 @@
 (package "php-mode" "1.24.1" "Major mode for editing PHP code")
+(source gnu)
 (source melpa)
 
 (package-file "lisp/php-mode.el")
diff --git a/Makefile b/Makefile
index 97922d2a50..883ec9f8f2 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,10 @@ AUTOLOADS = php-mode-autoloads.el
 ELCS = $(ELS:.el=.elc)
 
 %.elc: %.el
-   $(EMACS) --batch -L lisp/ -f batch-byte-compile $<
+   $(EMACS) --batch -L lisp/ --eval \
+   "(let ((default-directory (expand-file-name \".cask\" 
default-directory))) \
+  (normal-top-level-add-subdirs-to-load-path))" \
+   -f batch-byte-compile $<
 
 all: autoloads $(ELCS) authors
 
diff --git a/lisp/php-mode.el b/lisp/php-mode.el
index 24932bf25a..461b73ce34 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -10,7 +10,7 @@
 ;; URL: https://github.com/emacs-php/php-mode
 ;; Keywords: languages php
 ;; Version: 1.24.1
-;; Package-Requires: ((emacs "25.2"))
+;; Package-Requires: ((emacs "25.2") (compat "28.1.1.0"))
 ;; License: GPL-3.0-or-later
 
 (eval-and-compile
@@ -82,6 +82,7 @@
   (require 'rx)
   (require 'cl-lib)
   (require 'regexp-opt)
+  (require 'compat-26 nil t)
   (defvar add-log-current-defun-header-regexp)
   (defvar add-log-current-defun-function)
   (defvar c-syntactic-context)
@@ -92,7 +93,11 @@
   (eval-when-compile
 (let* ((fallback-version (format "%s-non-vcs" (with-no-warnings 
php-mode-version-number
   (if (locate-dominating-file default-directory ".git")
-  (string-trim-left (string-trim-right (shell-command-to-string "git 
describe --tags")) "v")
+  (funcall
+   (if (and (boundp 'string-trim-left) (boundp 'string-trim-right))
+   (lambda (s) (string-trim-left (string-trim-right s) "v"))
+ (lambda (s) (compat-string-trim-left (compat-string-trim-right s) 
"v")))
+   (shell-command-to-string "git describe --tags"))
 fallback-version)))
   "PHP Mode build ID.

[nongnu] elpa/php-mode 7853345918 05/12: Update CHANGELOG

2022-11-03 Thread ELPA Syncer 
branch: elpa/php-mode
commit 7853345918b8dd96992e6af97676ffb3aad16cb7
Author: USAMI Kenta 
Commit: USAMI Kenta 

Update CHANGELOG
---
 CHANGELOG.md | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd522ba1bd..1cccfd1309 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,13 +8,20 @@ All notable changes of the PHP Mode 1.19.1 release series are 
documented in this
 
  * **New feature: `php-complete`**
* Add `php-complete-complete-function` to autocomplete function names 
([#708])
- * Supports PHPDoc tags and types for static analysis tools ([#710])
+ * Supports PHPDoc tags and types for static analysis tools ([#710], [#715], 
[#716], [#717], thanks to [@takeokunn])
+ * Please refer to the article below
+   * PHPStan: [PHPDoc 
Types](https://phpstan.org/writing-php-code/phpdoc-types)
+   * PHPStan: [PHPDocs 
Basics](https://phpstan.org/writing-php-code/phpdocs-basics)
+   * Psalm: [Atomic Type 
Reference](https://psalm.dev/docs/annotating_code/type_syntax/atomic_types/)
+   * Psalm: [Supported 
Annotations](https://psalm.dev/docs/annotating_code/supported_annotations/)
+   * Psalm: [Template 
Annotations](https://psalm.dev/docs/annotating_code/templated_annotations/)
 
 ### Changed
 
  * Make continued expressions inside lists (arguments and arrays, etc.) have 
the same indent width as outside the list ([#703])
  * (internal) Improved readability of test failures about indentation ([#707])
  * `php-doc-annotation-tag` inherits `font-lock-doc-markup-face` if defined in 
Emacs 28 ([#711])
+ * Change `php-phpdoc-type-keywords` to `php-phpdoc-type-names` to avoid 
confusion ([#717])
 
 ### Fixed
 
@@ -26,6 +33,9 @@ All notable changes of the PHP Mode 1.19.1 release series are 
documented in this
 [#708]: https://github.com/emacs-php/php-mode/pull/708
 [#710]: https://github.com/emacs-php/php-mode/pull/710
 [#711]: https://github.com/emacs-php/php-mode/pull/711
+[#715]: https://github.com/emacs-php/php-mode/pull/715
+[#716]: https://github.com/emacs-php/php-mode/pull/716
+[#717]: https://github.com/emacs-php/php-mode/pull/717
 
 ## [1.24.1] - 2022-10-08

[nongnu] elpa/php-mode f35bf9a28c 07/12: Add php-mode-version-id and make obsolete php-mode-version-number

2022-11-03 Thread ELPA Syncer 
branch: elpa/php-mode
commit f35bf9a28cd1353595d9149427ba33ef4201cbc1
Author: USAMI Kenta 
Commit: USAMI Kenta 

Add php-mode-version-id and make obsolete php-mode-version-number
---
 CHANGELOG.md |  8 
 lisp/php-mode.el | 41 ++---
 2 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1cccfd1309..3276c010e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,8 +21,15 @@ All notable changes of the PHP Mode 1.19.1 release series 
are documented in this
  * Make continued expressions inside lists (arguments and arrays, etc.) have 
the same indent width as outside the list ([#703])
  * (internal) Improved readability of test failures about indentation ([#707])
  * `php-doc-annotation-tag` inherits `font-lock-doc-markup-face` if defined in 
Emacs 28 ([#711])
+ * Make `php-mode-version` function include a Git tag and revision ([#713])
+   * Like `"1.23.4-56-xx"` for example.
  * Change `php-phpdoc-type-keywords` to `php-phpdoc-type-names` to avoid 
confusion ([#717])
 
+### Deprecated
+
+ * Make obsolete `php-mode-version-number` contstant variable ([#712])
+   * `(php-mode-version :as-number t)` is provided for use cases comparing as 
versions, but generally SHOULD NOT be dependent on the PHP Mode version.
+
 ### Fixed
 
  * Removed invalid definitions that caused errors in some expressions ([#704])
@@ -33,6 +40,7 @@ All notable changes of the PHP Mode 1.19.1 release series are 
documented in this
 [#708]: https://github.com/emacs-php/php-mode/pull/708
 [#710]: https://github.com/emacs-php/php-mode/pull/710
 [#711]: https://github.com/emacs-php/php-mode/pull/711
+[#713]: https://github.com/emacs-php/php-mode/pull/713
 [#715]: https://github.com/emacs-php/php-mode/pull/715
 [#716]: https://github.com/emacs-php/php-mode/pull/716
 [#717]: https://github.com/emacs-php/php-mode/pull/717
diff --git a/lisp/php-mode.el b/lisp/php-mode.el
index 5e5b66e790..24932bf25a 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -13,8 +13,10 @@
 ;; Package-Requires: ((emacs "25.2"))
 ;; License: GPL-3.0-or-later
 
-(defconst php-mode-version-number "1.24.1"
-  "PHP Mode version number.")
+(eval-and-compile
+  (make-obsolete-variable
+   (defconst php-mode-version-number "1.24.1" "PHP Mode version number.")
+   "Please call (php-mode-version :as-number t) for compatibility." "1.24.2"))
 
 ;; 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
@@ -86,6 +88,20 @@
   (defvar c-vsemi-status-unknown-p)
   (defvar syntax-propertize-via-font-lock))
 
+(defconst php-mode-version-id
+  (eval-when-compile
+(let* ((fallback-version (format "%s-non-vcs" (with-no-warnings 
php-mode-version-number
+  (if (locate-dominating-file default-directory ".git")
+  (string-trim-left (string-trim-right (shell-command-to-string "git 
describe --tags")) "v")
+fallback-version)))
+  "PHP Mode build ID.
+
+The format is follows:
+
+\"1.23.4\": Tagged revision, compiled under Git VCS.
+\"1.23.4-56-xx\": 56 commits after the last tag release, compiled under 
Git.
+\"1.23.4-non-vcs\": Compiled in an environment not managed by Git VCS.")
+
 (autoload 'php-mode-debug "php-mode-debug"
   "Display informations useful for debugging PHP Mode." t)
 
@@ -288,17 +304,20 @@ In that case set to `NIL'."
 (defconst php-mode-cc-vertion
   (eval-when-compile c-version))
 
-(defun php-mode-version ()
-  "Display string describing the version of PHP Mode."
-  (interactive)
-  (let ((fmt (eval-when-compile (let ((id "$Id$"))
-  (concat "PHP Mode %s"
-  (if (string= id (concat [?$ ?I ?d 
?$]))
-  ""
-(concat " " id)))
+(cl-defun php-mode-version (&key as-number)
+  "Display string describing the version of PHP Mode.
+
+Although this is an interactive command, it returns a string when called
+as a function.  Call with AS-NUMBER keyword to compare by `version<'.
+
+\(version<= \"1.24.1\" (php-mode-version :as-number t))"
+  (interactive (list :as-number nil))
+  (if as-number
+  (save-match-data (and (string-match (rx (group (+ (in ".0-9" 
php-mode-version-id)
+(match-string 0 php-mode-version-id)))
 (funcall
  (if (called-interactively-p 'interactive) #'message #'format)
- fmt php-mode-version-number)))
+ "PHP Mode v%s" php-mode-version-id)))
 
 ;;;###autoload
 (define-obsolete-variable-alias 'php-available-project-root-files 
'php-project-available-root-files "1.19.0")

[nongnu] elpa/php-mode 08776c1b50 01/12: Changed variable name to php-phpdoc-type-names to avoid confusion

2022-11-03 Thread ELPA Syncer 
branch: elpa/php-mode
commit 08776c1b50dc58622ff8da732bbbd6c1d99d78f3
Author: USAMI Kenta 
Commit: USAMI Kenta 

Changed variable name to php-phpdoc-type-names to avoid confusion
---
 lisp/php-mode.el | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lisp/php-mode.el b/lisp/php-mode.el
index 37f2ba602b..0336e8efa5 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -1275,7 +1275,7 @@ for \\[find-tag] (which see)."
   (message "Unknown function: %s" tagname
 
 ;; Font Lock
-(defconst php-phpdoc-type-keywords
+(defconst php-phpdoc-type-names
   (list "string" "integer" "int" "boolean" "bool" "float"
 "double" "object" "mixed" "array" "resource"
 "void" "null" "false" "true" "self" "static"
@@ -1287,7 +1287,10 @@ for \\[find-tag] (which see)."
 "never" "never-return" "never-returns" "no-return" "non-empty-array"
 "non-empty-list" "non-empty-string" "non-falsy-string"
 "numeric" "numeric-string" "positive-int" "scalar"
-"trait-string" "truthy-string" "key-of" "value-of"))
+"trait-string" "truthy-string" "key-of" "value-of")
+  "A list of type and pseudotype names that can be used in PHPDoc.")
+
+(make-obsolete-variable 'php-phpdoc-type-keywords 'php-phpdoc-type-names 
"1.24.2")
 
 (defconst php-phpdoc-type-tags
   (list "package" "param" "property" "property-read" "property-write"
@@ -1305,7 +1308,7 @@ for \\[find-tag] (which see)."
   "\\(" (rx (+ (? "?") (? "\\") (+ (in "0-9A-Z_a-z")) (? "[]") (? 
"|"))) "\\)+")
  1 'php-string prepend nil)
 (,(concat "\\(?:|\\|\\?\\|\\s-\\)\\("
-  (regexp-opt php-phpdoc-type-keywords 'words)
+  (regexp-opt php-phpdoc-type-names 'words)
   "\\)")
  1 font-lock-type-face prepend nil)
 ("https?://[^\n\t ]+"

[nongnu] elpa/php-mode 9603a4f54f 10/12: Revert string-trim-right

2022-11-03 Thread ELPA Syncer 
branch: elpa/php-mode
commit 9603a4f54f90fa5cde253e6c9fb9470aacaca33c
Author: USAMI Kenta 
Commit: USAMI Kenta 

Revert string-trim-right
---
 lisp/php-mode.el | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lisp/php-mode.el b/lisp/php-mode.el
index 24932bf25a..6843b3a720 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -90,9 +90,16 @@
 
 (defconst php-mode-version-id
   (eval-when-compile
-(let* ((fallback-version (format "%s-non-vcs" (with-no-warnings 
php-mode-version-number
+(let ((fallback-version (format "%s-non-vcs" (with-no-warnings 
php-mode-version-number
   (if (locate-dominating-file default-directory ".git")
-  (string-trim-left (string-trim-right (shell-command-to-string "git 
describe --tags")) "v")
+  (save-match-data
+(let ((tag (replace-regexp-in-string
+(rx bos "v") ""
+(shell-command-to-string "git describe --tags")))
+  (pattern (rx (group (+ any)) eol)))
+  (if (string-match pattern tag)
+  (match-string 0 tag)
+(error "Faild to obtain git tag"
 fallback-version)))
   "PHP Mode build ID.

[nongnu] elpa/php-mode 44601ab2df 02/12: Add "phan" to type tag vendor prefix

2022-11-03 Thread ELPA Syncer 
branch: elpa/php-mode
commit 44601ab2dfe329e52c2e186b3ba59c2a8ce3969c
Author: USAMI Kenta 
Commit: USAMI Kenta 

Add "phan" to type tag vendor prefix
---
 lisp/php-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/php-mode.el b/lisp/php-mode.el
index 0336e8efa5..ee747b05be 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -1304,7 +1304,7 @@ for \\[find-tag] (which see)."
  (1 'php-doc-variable-sigil prepend nil)
  (2 'php-variable-name prepend nil))
 ("\\(\\$\\)\\(this\\)\\>" (1 'php-doc-$this-sigil prepend nil) (2 
'php-doc-$this prepend nil))
-(,(concat "\\s-@" (rx (? (or "phpstan" "psalm") "-")) (regexp-opt 
php-phpdoc-type-tags) "\\s-+"
+(,(concat "\\s-@" (rx (? (or "phan" "phpstan" "psalm") "-")) (regexp-opt 
php-phpdoc-type-tags) "\\s-+"
   "\\(" (rx (+ (? "?") (? "\\") (+ (in "0-9A-Z_a-z")) (? "[]") (? 
"|"))) "\\)+")
  1 'php-string prepend nil)
 (,(concat "\\(?:|\\|\\?\\|\\s-\\)\\("

[nongnu] elpa/php-mode 258d6c5460 04/12: Add Psalm template annotations to php-phpdoc-type-tags

2022-11-03 Thread ELPA Syncer 
branch: elpa/php-mode
commit 258d6c5460bcb8b484a53ac8f628488fe5518908
Author: USAMI Kenta 
Commit: USAMI Kenta 

Add Psalm template annotations to php-phpdoc-type-tags
---
 lisp/php-mode.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/php-mode.el b/lisp/php-mode.el
index effe99e661..5e5b66e790 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -1295,7 +1295,9 @@ for \\[find-tag] (which see)."
 (defconst php-phpdoc-type-tags
   (list "package" "param" "property" "property-read" "property-write"
 "return" "throws" "var" "self-out" "this-out" "param-out"
-"type")
+"type" "extends" "require-extends" "implemtents" "require-implements"
+"template" "template-covariant" "template-extends" 
"template-implements"
+"assert" "assert-if-true" "assert-if-false" "if-this-is")
   "A list of tags specifying type names.")
 
 (defconst php-phpdoc-font-lock-doc-comments

[nongnu] elpa/php-mode b559c80a1e 11/12: Merge pull request #713 from emacs-php/feature/php-mode-version

2022-11-03 Thread ELPA Syncer 
branch: elpa/php-mode
commit b559c80a1eb271c94de4639a3a02c93eaf81c81b
Merge: 865bc847f8 9603a4f54f
Author: USAMI Kenta 
Commit: GitHub 

Merge pull request #713 from emacs-php/feature/php-mode-version

Add php-mode-version-id and make obsolete php-mode-version-number
---
 CHANGELOG.md |  8 
 lisp/php-mode.el | 48 +---
 2 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1cccfd1309..3276c010e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,8 +21,15 @@ All notable changes of the PHP Mode 1.19.1 release series 
are documented in this
  * Make continued expressions inside lists (arguments and arrays, etc.) have 
the same indent width as outside the list ([#703])
  * (internal) Improved readability of test failures about indentation ([#707])
  * `php-doc-annotation-tag` inherits `font-lock-doc-markup-face` if defined in 
Emacs 28 ([#711])
+ * Make `php-mode-version` function include a Git tag and revision ([#713])
+   * Like `"1.23.4-56-xx"` for example.
  * Change `php-phpdoc-type-keywords` to `php-phpdoc-type-names` to avoid 
confusion ([#717])
 
+### Deprecated
+
+ * Make obsolete `php-mode-version-number` contstant variable ([#712])
+   * `(php-mode-version :as-number t)` is provided for use cases comparing as 
versions, but generally SHOULD NOT be dependent on the PHP Mode version.
+
 ### Fixed
 
  * Removed invalid definitions that caused errors in some expressions ([#704])
@@ -33,6 +40,7 @@ All notable changes of the PHP Mode 1.19.1 release series are 
documented in this
 [#708]: https://github.com/emacs-php/php-mode/pull/708
 [#710]: https://github.com/emacs-php/php-mode/pull/710
 [#711]: https://github.com/emacs-php/php-mode/pull/711
+[#713]: https://github.com/emacs-php/php-mode/pull/713
 [#715]: https://github.com/emacs-php/php-mode/pull/715
 [#716]: https://github.com/emacs-php/php-mode/pull/716
 [#717]: https://github.com/emacs-php/php-mode/pull/717
diff --git a/lisp/php-mode.el b/lisp/php-mode.el
index 5e5b66e790..6843b3a720 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -13,8 +13,10 @@
 ;; Package-Requires: ((emacs "25.2"))
 ;; License: GPL-3.0-or-later
 
-(defconst php-mode-version-number "1.24.1"
-  "PHP Mode version number.")
+(eval-and-compile
+  (make-obsolete-variable
+   (defconst php-mode-version-number "1.24.1" "PHP Mode version number.")
+   "Please call (php-mode-version :as-number t) for compatibility." "1.24.2"))
 
 ;; 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
@@ -86,6 +88,27 @@
   (defvar c-vsemi-status-unknown-p)
   (defvar syntax-propertize-via-font-lock))
 
+(defconst php-mode-version-id
+  (eval-when-compile
+(let ((fallback-version (format "%s-non-vcs" (with-no-warnings 
php-mode-version-number
+  (if (locate-dominating-file default-directory ".git")
+  (save-match-data
+(let ((tag (replace-regexp-in-string
+(rx bos "v") ""
+(shell-command-to-string "git describe --tags")))
+  (pattern (rx (group (+ any)) eol)))
+  (if (string-match pattern tag)
+  (match-string 0 tag)
+(error "Faild to obtain git tag"
+fallback-version)))
+  "PHP Mode build ID.
+
+The format is follows:
+
+\"1.23.4\": Tagged revision, compiled under Git VCS.
+\"1.23.4-56-xx\": 56 commits after the last tag release, compiled under 
Git.
+\"1.23.4-non-vcs\": Compiled in an environment not managed by Git VCS.")
+
 (autoload 'php-mode-debug "php-mode-debug"
   "Display informations useful for debugging PHP Mode." t)
 
@@ -288,17 +311,20 @@ In that case set to `NIL'."
 (defconst php-mode-cc-vertion
   (eval-when-compile c-version))
 
-(defun php-mode-version ()
-  "Display string describing the version of PHP Mode."
-  (interactive)
-  (let ((fmt (eval-when-compile (let ((id "$Id$"))
-  (concat "PHP Mode %s"
-  (if (string= id (concat [?$ ?I ?d 
?$]))
-  ""
-(concat " " id)))
+(cl-defun php-mode-version (&key as-number)
+  "Display string describing the version of PHP Mode.
+
+Although this is an interactive command, it returns a string when called
+as a function.  Call with AS-NUMBER keyword to compare by `version<'.
+
+\(version<= \"1.24.1\" (php-mode-version :as-number t))"
+  (interactive (list :as-number nil))
+  (if as-number
+  (save-match-data (and (string-match (rx (group (+ (in ".0-9" 
php-mode-version-id)
+(match-string 0 php-mode-version-id)))
 (funcall
  (if (called-interactively-p 'interactive) #'message #'format)
- fmt php-mode-version-number)))
+ "PHP Mode v%s" php-mode-version-id)))
 
 ;;;###autoload
 (d

[nongnu] elpa/php-mode 08ef915dc3 09/12: Revert "Use compat-string-trim-* functions for compatibility"

2022-11-03 Thread ELPA Syncer 
branch: elpa/php-mode
commit 08ef915dc3b7567ea0994ca26097bdb866c42fdf
Author: USAMI Kenta 
Commit: USAMI Kenta 

Revert "Use compat-string-trim-* functions for compatibility"

This reverts commit b6382f414126536f46d7d9f976c79b7babec1460.
---
 Cask | 1 -
 Makefile | 5 +
 lisp/php-mode.el | 9 ++---
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/Cask b/Cask
index 527f7eddb8..e847468562 100644
--- a/Cask
+++ b/Cask
@@ -1,5 +1,4 @@
 (package "php-mode" "1.24.1" "Major mode for editing PHP code")
-(source gnu)
 (source melpa)
 
 (package-file "lisp/php-mode.el")
diff --git a/Makefile b/Makefile
index 883ec9f8f2..97922d2a50 100644
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,7 @@ AUTOLOADS = php-mode-autoloads.el
 ELCS = $(ELS:.el=.elc)
 
 %.elc: %.el
-   $(EMACS) --batch -L lisp/ --eval \
-   "(let ((default-directory (expand-file-name \".cask\" 
default-directory))) \
-  (normal-top-level-add-subdirs-to-load-path))" \
-   -f batch-byte-compile $<
+   $(EMACS) --batch -L lisp/ -f batch-byte-compile $<
 
 all: autoloads $(ELCS) authors
 
diff --git a/lisp/php-mode.el b/lisp/php-mode.el
index 461b73ce34..24932bf25a 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -10,7 +10,7 @@
 ;; URL: https://github.com/emacs-php/php-mode
 ;; Keywords: languages php
 ;; Version: 1.24.1
-;; Package-Requires: ((emacs "25.2") (compat "28.1.1.0"))
+;; Package-Requires: ((emacs "25.2"))
 ;; License: GPL-3.0-or-later
 
 (eval-and-compile
@@ -82,7 +82,6 @@
   (require 'rx)
   (require 'cl-lib)
   (require 'regexp-opt)
-  (require 'compat-26 nil t)
   (defvar add-log-current-defun-header-regexp)
   (defvar add-log-current-defun-function)
   (defvar c-syntactic-context)
@@ -93,11 +92,7 @@
   (eval-when-compile
 (let* ((fallback-version (format "%s-non-vcs" (with-no-warnings 
php-mode-version-number
   (if (locate-dominating-file default-directory ".git")
-  (funcall
-   (if (and (boundp 'string-trim-left) (boundp 'string-trim-right))
-   (lambda (s) (string-trim-left (string-trim-right s) "v"))
- (lambda (s) (compat-string-trim-left (compat-string-trim-right s) 
"v")))
-   (shell-command-to-string "git describe --tags"))
+  (string-trim-left (string-trim-right (shell-command-to-string "git 
describe --tags")) "v")
 fallback-version)))
   "PHP Mode build ID.

[elpa] externals/phps-mode 33931348fb 2/2: Updated version to 0.4.29

2022-11-03 Thread Christian Johansson 
branch: externals/phps-mode
commit 33931348fba3e8386965eac177cd81a2e564f4a8
Author: Christian Johansson 
Commit: Christian Johansson 

Updated version to 0.4.29
---
 phps-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phps-mode.el b/phps-mode.el
index a1ec257487..b4ced0961c 100644
--- a/phps-mode.el
+++ b/phps-mode.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Christian Johansson 
 ;; Created: 3 Mar 2018
 ;; Modified: 3 Nov 2022
-;; Version: 0.4.28
+;; Version: 0.4.29
 ;; Keywords: tools, convenience
 ;; URL: https://github.com/cjohansson/emacs-phps-mode

[elpa] externals/phps-mode be5d5e8127 1/2: Improved heredoc and nowdoc support of indented endings

2022-11-03 Thread Christian Johansson 
branch: externals/phps-mode
commit be5d5e8127397a620f3add9b2cfa0e47fb2d7eac
Author: Christian Johansson 
Commit: Christian Johansson 

Improved heredoc and nowdoc support of indented endings
---
 phps-mode-lexer.el   | 7 +--
 test/phps-mode-test-lexer.el | 8 
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/phps-mode-lexer.el b/phps-mode-lexer.el
index 637e906821..5b4a987d3e 100644
--- a/phps-mode-lexer.el
+++ b/phps-mode-lexer.el
@@ -125,9 +125,9 @@
 
]*("))) (lambda nil (phps-mode-lexer--yyless (length "readonly")) 
(phps-mode-lexer--return-token-with-str 'T_STRING 0))) ((lambda nil (looking-at 
"unset")) (lambda nil (phps-mode-lexer--return-token-with-indent 'T_UNSET))) 
((lambda nil (looking-at "=>")) (lambda nil (phps-mode-lexer--return-token 
'T_DOUBLE_ARROW))) ((lambda nil (looking-at "list")) (lambda nil 
(phps-mode-lexer--return-token-with-indent 'T_LIST))) ((lambda nil (looking-at 
"array")) (lambda nil (phps-mode-lexer--return-tok [...]
 ]*" "\\(\\$\\|\\.\\.\\.\\)"))) (lambda nil (phps-mode-lexer--yyless 1) 
(phps-mode-lexer--return-token 'T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG 
(match-beginning 0) (- (match-end 0) 1 ((lambda nil (looking-at "&")) 
(lambda nil (phps-mode-lexer--return-token 
'T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG))) ((lambda nil (looking-at (concat 
"\\(" "]" "\\|" ")" "\\)"))) (lambda nil 
(phps-mode-lexer--return-exit-nesting-token))) ((lambda nil (looking-at (concat 
"\\(" "\\[" "\\|" "(" "\\)"))) (la [...]
 [   ]*" phps-mode-lexer--heredoc-label "\\|\\$" phps-mode-lexer--label 
"\\|{\\$" phps-mode-lexer--label "\\|\\${" phps-mode-lexer--label "\\)") nil 
t))) (if string-start (let* ((start (match-beginning 0)) (end (match-end 0)) 
(data (buffer-substring-no-properties start end))) (cond ((string-match-p 
(concat "
-[   ]*" phps-mode-lexer--heredoc-label) data) 
(phps-mode-lexer--return-token-with-val 'T_ENCAPSED_AND_WHITESPACE old-end 
start) (phps-mode-lexer--begin 'ST_END_HEREDOC)) (t 
(phps-mode-lexer--return-token-with-val 'T_ENCAPSED_AND_WHITESPACE old-end 
start (progn (signal 'phps-lexer-error (list (format "Found no ending of 
heredoc starting at %d" old-start) old-start) ST_LOOKING_FOR_VARNAME 
(((lambda nil (looking-at (concat phps-mode-lexer--label "[\\[}]"))) (lambda 
nil (let* ((st [...]
+[   ]*" phps-mode-lexer--heredoc-label) data) (search-forward-regexp "[
 ]*") (phps-mode-lexer--return-token-with-val 'T_ENCAPSED_AND_WHITESPACE 
old-end start) (phps-mode-lexer--begin 'ST_END_HEREDOC)) (t 
(phps-mode-lexer--return-token-with-val 'T_ENCAPSED_AND_WHITESPACE old-end 
start (progn (signal 'phps-lexer-error (list (format "Found no ending of 
heredoc starting at %d" old-start) old-start) ST_LOOKING_FOR_VARNAME 
(((lambda nil (looking-at (concat phps-mode-lexer--label "[ [...]
 
'#]"))) (lambda nil (phps-mode-lexer--yyless 0) 
(phps-mode-lexer--yy-pop-state) (phps-mode-lexer--return-token-with-val 
'T_ENCAPSED_AND_WHITESPACE))) ((lambda nil (looking-at phps-mode-lexer--label)) 
(lambda nil (phps-mode-lexer--return-token-with-str 'T_STRING 0))) ((lambda nil 
(looking-at phps-mode-lexer--any-char)) (lambda nil (signal 'phps-lexer-error 
(list (format "Unexpected character at %d" (match-beginning 0)) 
(match-beginning 0)) quote (((lambda nil (looking-at (concat "#!.* [...]
-[   ]*" phps-mode-lexer--heredoc-label) nil t))) (if string-start (let* 
((start (match-beginning 0)) (end (match-end 0)) (_data 
(buffer-substring-no-properties start end))) 
(phps-mode-lexer--return-token-with-val 'T_ENCAPSED_AND_WHITESPACE 
phps-mode-lexer--generated-new-tokens-index start) (phps-mode-lexer--begin 
'ST_END_HEREDOC)) (progn (signal 'phps-lexer-error (list (format "Found no 
ending of nowdoc starting at %d" start) start)))
+[   ]*" phps-mode-lexer--heredoc-label) nil t))) (if string-start (let* 
((start (match-beginning 0)) (end (match-end 0)) (_data 
(buffer-substring-no-properties start end))) 
(phps-mode-lexer--return-token-with-val 'T_ENCAPSED_AND_WHITESPACE 
phps-mode-lexer--generated-new-tokens-index start) (search-forward-regexp "[
]*") (phps-mode-lexer--begin 'ST_END_HEREDOC)) (progn (signal 
'phps-lexer-error (list (format "Found no ending of nowdoc starting at %d" 
start) start)))
   "Hash-table of lex-analyzer rules organized by state.")
 
 (defvar-local phps-mode-lexer--generated-tokens nil
@@ -1912,6 +1912,8 @@
  phps-mode-lexer--heredoc-label
  )
 data)
+   ;; Skip possible white-spaces before label
+   (search-forward-regexp "[\t ]*")
;; (message "Found heredoc end at %s-%s" start end)
(phps-mode-lexer--return-token-with-val
 'T_ENCAPSED_AND_WHITESPACE
@@ -1956,6 +1958,7 @@
   'T_ENCAPSED_AND_WHITESPACE
   phps-mode-lexer--generated-new-tokens-index
   start)
+ (sear

[elpa] externals/phps-mode updated (244a31467c -> 33931348fb)

2022-11-03 Thread Christian Johansson 
cjohansson pushed a change to branch externals/phps-mode.

  from  244a31467c Updated version to 0.4.28
   new  be5d5e8127 Improved heredoc and nowdoc support of indented endings
   new  33931348fb Updated version to 0.4.29


Summary of changes:
 phps-mode-lexer.el   | 7 +--
 phps-mode.el | 2 +-
 test/phps-mode-test-lexer.el | 8 
 3 files changed, 14 insertions(+), 3 deletions(-)

[nongnu] elpa/sweeprolog 4d4bdc8600: FIXED: write_sweep_module_location/0 for Windows.

2022-11-03 Thread ELPA Syncer 
branch: elpa/sweeprolog
commit 4d4bdc86004b76413074e915d92380891a6e2587
Author: Jan Wielemaker 
Commit: Jan Wielemaker 

FIXED: write_sweep_module_location/0 for Windows.
---
 sweep_link.pl | 23 +--
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/sweep_link.pl b/sweep_link.pl
index 3c3d6791d5..31663248a9 100644
--- a/sweep_link.pl
+++ b/sweep_link.pl
@@ -31,8 +31,8 @@
 */
 
 :- module(sweep_link,
-  [ write_sweep_module_location/0
-  ]).
+ [ write_sweep_module_location/0
+ ]).
 
 /**  Information for dynamically linking to GNU Emacs
 */
@@ -40,14 +40,25 @@
 sweep_link_version(1).
 
 write_sweep_module_location :-
+sweep_module(Path),
 sweep_link_version(V),
 format('V ~w~n', [V]),
-absolute_file_name(foreign('sweep-module'),
-   Path,
-   [file_type(executable), access(read)]),
 (   current_prolog_flag(executable_format, elf)
 ->  current_prolog_flag(libswipl, Libpath),
-format('L ~w~n', [Libpath])
+   format('L ~w~n', [Libpath])
 ;   true
 ),
 format('M ~w~n', [Path]).
+
+sweep_module(Path) :-
+current_prolog_flag(windows, true),
+current_prolog_flag(executable, Exe),
+prolog_to_os_filename(PlExe, Exe),
+file_directory_name(PlExe, BinDir),
+atomic_concat(BinDir, '/sweep-module.dll', Path),
+exists_file(Path),
+!.
+sweep_module(Path) :-
+absolute_file_name(foreign('sweep-module'),
+  Path,
+  [file_type(executable), access(read)]).

[elpa] elpa-admin aa3879770f: * elpa-admin.el (elpaa--html-make-pkg): Fix last change

2022-11-03 Thread Stefan Monnier via 
branch: elpa-admin
commit aa3879770f34ac58be54673d480b02b2e53993f1
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-admin.el (elpaa--html-make-pkg): Fix last change

Keep the News section within the `div`.
---
 elpa-admin.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/elpa-admin.el b/elpa-admin.el
index e0149bac72..0e1289e268 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -1708,13 +1708,14 @@ arbitrary code."
   file (elpaa--html-quote file)
   (format-time-string "%Y-%b-%d" (nth 5 attrs))
   (elpaa--html-bytes-format (nth 7 attrs)))
-(insert "\n\n"))
+(insert "\n"))
   (let ((news (elpaa--get-NEWS pkg-spec srcdir)))
 (when news
   (insert "News\n"
   "\n"
   (elpaa--section-to-html news)
   "\n\n")))
+  (insert \n)
   (insert (elpaa--html-footer))
   (write-region (point-min) (point-max) (concat name ".html")

[elpa] elpa-admin 83968a31a6: * elpa-admin.el (elpaa--html-make-pkg): Fix typo

2022-11-03 Thread Stefan Monnier via 
branch: elpa-admin
commit 83968a31a6893f91cbe01754dd79cc7e96390194
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-admin.el (elpaa--html-make-pkg): Fix typo
---
 elpa-admin.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/elpa-admin.el b/elpa-admin.el
index 0e1289e268..f4a33a2e27 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -1715,7 +1715,7 @@ arbitrary code."
   "\n"
   (elpaa--section-to-html news)
   "\n\n")))
-  (insert \n)
+  (insert "\n")
   (insert (elpaa--html-footer))
   (write-region (point-min) (point-max) (concat name ".html")

[elpa] externals/ada-mode 6daaf0ccbe: Fix ada-mode.texi bug

2022-11-03 Thread Stephen Leake 
branch: externals/ada-mode
commit 6daaf0ccbe572ef1a9e7355d5c4bbf86a9e4ae75
Author: Stephen Leake 
Commit: Stephen Leake 

Fix ada-mode.texi bug

* ada-mode.el: Bump version for ada-mode.texi fix.

* ada-mode.texi: Update menus.
(Known versions): Fix @end.
---
 ada-mode.el   |  2 +-
 ada-mode.texi | 11 ---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/ada-mode.el b/ada-mode.el
index 6369cad9e8..7ac578612a 100644
--- a/ada-mode.el
+++ b/ada-mode.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Stephen Leake 
 ;; Keywords: languages
 ;;  ada
-;; Version: 8.0.2
+;; Version: 8.0.3
 ;; package-requires: ((uniquify-files "1.0.1") (wisi "4.1.1") (gnat-compiler 
"1.0.0") (emacs "25.3"))
 ;; url: http://www.nongnu.org/ada-mode/
 ;;
diff --git a/ada-mode.texi b/ada-mode.texi
index 73bf7cb1d9..f19895718f 100644
--- a/ada-mode.texi
+++ b/ada-mode.texi
@@ -62,7 +62,7 @@ Ada Mode Version 8.0.2
 
 Overview
 
-* wisi parser vs LSP::
+* wisi parser vs LSP vs ...::
 * Supported features::
 
 Installation
@@ -97,10 +97,6 @@ Project files
 * Project file overview::
 * Project file variables::
 
-Indentation
-
-* Ada-specific indent functions::
-
 Developer overview
 
 * Directory structure::
@@ -145,7 +141,7 @@ tools.
 information on debugging.
 
 @menu
-* wisi parser vs LSP::
+* wisi parser vs LSP vs ...::
 * Supported features::
 @end menu
 
@@ -316,11 +312,12 @@ Alire packages several recent versions of the FSF 
compiler. It is used
 by all Alire build commands. The versions available can be listed by:
 @example
 alr toolchain
-@end table
+@end example
 
 The compiler can be installed for external use by:
 @example
 alr toolchain --install  --install-dir 
+@end example
 @end table
 
 Sometimes compiler versions change what code they accept, particularly

[elpa] elpa-admin e8749f0ec9: * elpa-admin.el (elpaa--make-one-tarball): Save error in file

2022-11-03 Thread Stefan Monnier via 
branch: elpa-admin
commit e8749f0ec90c4c291b5791ce7c22dcbe0b6e5b22
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-admin.el (elpaa--make-one-tarball): Save error in file
---
 elpa-admin.el | 18 +++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/elpa-admin.el b/elpa-admin.el
index f4a33a2e27..496b6c8ba0 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -606,8 +606,9 @@ auxillary files unless TARBALL-ONLY is non-nil ."
   (progn
 (elpaa--message "Tarball %s already built!" tarball)
 nil)
-(message " Building tarball %s..." tarball)
-(let ((res nil))
+(let ((msg-start (with-current-buffer "*Messages*" (point-marker)))
+  (res nil))
+  (message " Building tarball %s..." tarball)
   (unwind-protect
   (condition-case-unless-debug err
   (setq res (elpaa--make-one-tarball-1
@@ -617,7 +618,18 @@ auxillary files unless TARBALL-ONLY is non-nil ."
nil))
 (message (if res " Built new package %s!"
" Build of package %s FAILED!!")
- tarball)
+ tarball)
+(let ((logfile (expand-file-name (concat (car pkg-spec)
+ "-build-failure.log")
+ (file-name-directory tarball
+  (if res
+  (delete-file logfile)
+;; FIXME: Add a link from .html to this log.
+;; Maybe also send an email notification to the maintainer
+;; if the file is new or is different (longer?) than before.
+(let ((msg (with-current-buffer (marker-buffer msg-start)
+ (buffer-substring msg-start (point-max)
+  (write-region msg nil logfile nil 'silent
 
 (defun elpaa--make-one-tarball-1 ( tarball dir pkg-spec metadata-or-version
  &optional revision-function tarball-only)

[elpa] externals/crdt 92a7c93a3b: fix coding issue

2022-11-03 Thread ELPA Syncer 
branch: externals/crdt
commit 92a7c93a3b4cb4b40f133acd22c89a5fda5cdd30
Author: Qiantan Hong 
Commit: Qiantan Hong 

fix coding issue
---
 crdt.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crdt.el b/crdt.el
index 6fcdf32321..1f62745f8c 100644
--- a/crdt.el
+++ b/crdt.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Qiantan Hong 
 ;; URL: https://code.librehq.com/qhong/crdt.el
 ;; Keywords: collaboration crdt
-;; Version: 0.3.3
+;; Version: 0.3.4
 
 ;; This file is part of GNU Emacs.
 
@@ -2362,6 +2362,7 @@ Each element should be one of
:host "0.0.0.0"
:service port
:filter #'crdt--network-filter
+   :filter-multibyte nil
:sentinel #'crdt--server-process-sentinel
:coding 'utf-8))
  (new-session
@@ -2532,6 +2533,7 @@ Join with DISPLAY-NAME."
:name "CRDT Client"
:buffer (generate-new-buffer " 
*crdt-client*")
:filter #'crdt--network-filter
+   :filter-multibyte nil
:sentinel 
#'crdt--client-process-sentinel
:coding 'utf-8
process-args)))

[elpa] externals/ef-themes 6bf14ecaae 1/4: Add ef-themes-region user option

2022-11-03 Thread ELPA Syncer 
branch: externals/ef-themes
commit 6bf14ecaaeca2d4e4f3a6c00e49b6dc9571c3cec
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Add ef-themes-region user option
---
 README.org | 41 ++
 ef-autumn-theme.el |  3 ++
 ef-bio-theme.el|  3 ++
 ef-cherie-theme.el |  3 ++
 ef-cyprus-theme.el |  3 ++
 ef-dark-theme.el   |  3 ++
 ef-day-theme.el|  3 ++
 ef-deuteranopia-dark-theme.el  |  3 ++
 ef-deuteranopia-light-theme.el |  3 ++
 ef-duo-dark-theme.el   |  3 ++
 ef-duo-light-theme.el  |  3 ++
 ef-frost-theme.el  |  3 ++
 ef-light-theme.el  |  3 ++
 ef-night-theme.el  |  3 ++
 ef-spring-theme.el |  3 ++
 ef-summer-theme.el |  3 ++
 ef-themes.el   | 80 +-
 ef-trio-dark-theme.el  |  3 ++
 ef-trio-light-theme.el |  3 ++
 ef-tritanopia-dark-theme.el|  3 ++
 ef-tritanopia-light-theme.el   |  3 ++
 ef-winter-theme.el |  3 ++
 22 files changed, 180 insertions(+), 1 deletion(-)

diff --git a/README.org b/README.org
index a9c0517bd7..b1963e8aef 100644
--- a/README.org
+++ b/README.org
@@ -368,6 +368,47 @@ will retain the original aesthetic for that level.  For 
example:
 (t . t))) ; default style for all other levels
 #+end_src
 
+** Style of region highlight
+:PROPERTIES:
+:CUSTOM_ID: h:1d5fa3d8-a769-455a-aac7-5c1b925bb10b
+:END:
+
+[ This user option is part of {{{development-version}}}. ]
+
+#+vindex: ef-themes-region
+The user option ~ef-themes-region~ controls the appearance of the
+~region~ face (the highlighted selection of an area).
+
+The value it accepts is a list of symbols.
+
+If ~nil~ or an empty list (the default), use a subtle background for
+the region and preserve the color of selected text.
+
+The ~no-extend~ symbol limits the highlighted area to the end of the
+line, so that it does not reach the edge of the window.
+
+The ~neutral~ symbol makes the highlighted area's background gray (or
+more gray, depending on the theme).
+
+The ~intense~ symbol amplifies the intensity of the highlighted area's
+background color.  It also overrides any text color to keep it
+legible.
+
+Combinations of those symbols are expressed in any order.
+
+In user configuration files the form may look like this:
+
+#+begin_src emacs-lisp
+(setq modus-themes-region '(intense no-extend))
+#+end_src
+
+Other examples:
+
+#+begin_src emacs-lisp
+(setq modus-themes-region '(intense))
+(setq modus-themes-region '(intense no-extend neutral))
+#+end_src
+
 * Loading a theme
 :PROPERTIES:
 :CUSTOM_ID: h:75d74aea-d17f-497f-a3b8-f0bf4c372de0
diff --git a/ef-autumn-theme.el b/ef-autumn-theme.el
index bd1ac9f1fb..8c8b88a60a 100644
--- a/ef-autumn-theme.el
+++ b/ef-autumn-theme.el
@@ -144,6 +144,9 @@
   (underline-warning "#c0b000")
   (underline-info"#22b022")
 
+  ;; Conditional hues
+  (bg-region-intense "#4f4400")
+
   ;; Mappings
   (err red-warmer)
   (warning yellow)
diff --git a/ef-bio-theme.el b/ef-bio-theme.el
index d79de33045..e172d1da70 100644
--- a/ef-bio-theme.el
+++ b/ef-bio-theme.el
@@ -144,6 +144,9 @@
   (underline-warning "#c0b000")
   (underline-info"#22b022")
 
+  ;; Conditional hues
+  (bg-region-intense "#0f5450")
+
   ;; Mappings
   (err red)
   (warning yellow-cooler)
diff --git a/ef-cherie-theme.el b/ef-cherie-theme.el
index 088dc1ee17..dcc3198f0c 100644
--- a/ef-cherie-theme.el
+++ b/ef-cherie-theme.el
@@ -144,6 +144,9 @@
   (underline-warning "#c0b000")
   (underline-info"#22b022")
 
+  ;; Conditional hues
+  (bg-region-intense "#3f3460")
+
   ;; Mappings
   (err red-warmer)
   (warning yellow-warmer)
diff --git a/ef-cyprus-theme.el b/ef-cyprus-theme.el
index b10da96b3a..83d9aaaf39 100644
--- a/ef-cyprus-theme.el
+++ b/ef-cyprus-theme.el
@@ -144,6 +144,9 @@
   (underline-warning "#bf5f00")
   (underline-info"#02af5f")
 
+  ;; Conditional hues
+  (bg-region-intense "#dcd09f")
+
   ;; Mappings
   (err red-warmer)
   (warning yellow)
diff --git a/ef-dark-theme.el b/ef-dark-theme.el
index 13ba89c439..0775bc112c 100644
--- a/ef-dark-theme.el
+++ b/ef-dark-theme.el
@@ -144,6 +144,9 @@
   (underline-warning "#c0b000")
   (underline-info"#22b022")
 
+  ;; Conditional hues
+  (bg-region-intense "#3a3465")
+
   ;; Mappings
   (err red-warmer)
   (warning yellow)
diff --git a/ef-day-theme.el b/ef-day-theme.el
index cf69ecefa1..50f8d0f9a9 100644
--- a/ef-day-theme.el
+++ b/ef-day-theme.el
@@ -144,6 +144,9 @@
   (underline-warning "#bf5f00")
   (underline-info"#02af52")
 
+  ;; Conditional hues
+  (bg-region-intense "#dfc39a")
+
   ;; Mappings
   (err red-warmer)
   (warning yellow)
diff --git a/ef-deuteranopia-dark-theme.el b/ef-deuteranopia-da

[elpa] externals/ef-themes 973b67ddd9 3/4: Tweak sample configuration

2022-11-03 Thread ELPA Syncer 
branch: externals/ef-themes
commit 973b67ddd96d3519a145e7d07497af66e064eced
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Tweak sample configuration
---
 README.org | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/README.org b/README.org
index 1174d1f71a..0453afe2ca 100644
--- a/README.org
+++ b/README.org
@@ -126,6 +126,8 @@ Everything is in place to set up the package.
 :END:
 
 #+begin_src emacs-lisp
+;; Make customisations that affect Emacs faces BEFORE loading a theme
+;; (any change needs a theme re-load to take effect).
 (require 'ef-themes)
 
 ;; If you like two specific themes and want to switch between them, you
@@ -134,9 +136,6 @@ Everything is in place to set up the package.
 ;; `ef-themes-collection'.
 (setq ef-themes-to-toggle '(ef-summer ef-winter))
 
-;; Make customisations that affect Emacs faces BEFORE loading a theme
-;; (any change needs a theme re-load to take effect).
-
 (setq ef-themes-headings ; read the manual's entry or the doc string
   '((0 . (variable-pitch light 1.9))
 (1 . (variable-pitch light 1.8))
@@ -152,6 +151,10 @@ Everything is in place to set up the package.
 (setq ef-themes-mixed-fonts t
   ef-themes-variable-pitch-ui t)
 
+;; Read the doc string or manual for this one.  The symbols can be
+;; combined in any order.
+(setq ef-themes-region '(intense no-extend neutral))
+
 ;; Disable all other themes to avoid awkward blending:
 (mapc #'disable-theme custom-enabled-themes)

[elpa] externals/ef-themes 67e6676199 4/4: Clarify statements in the manual

2022-11-03 Thread ELPA Syncer 
branch: externals/ef-themes
commit 67e6676199f0dfce35558c1176085add7f2b4ab5
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Clarify statements in the manual
---
 README.org | 32 ++--
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/README.org b/README.org
index 0453afe2ca..b29f38ea98 100644
--- a/README.org
+++ b/README.org
@@ -1161,11 +1161,13 @@ The above list is non-exhaustive though you get the 
idea.
 :END:
 
 + No customization options that affect the coloration of individual
-  components!  Either you like them or you don't.  To change the
-  attributes of individual faces, it is better to do it in user-level
-  configurations ([[#h:152326a3-9356-4158-8adb-83c42c2ef117][Do-It-Yourself 
customizations]]).  Report the issue and
-  we can help with the relevant code.  Providing customizations that
-  refashion a wide set of themes is not maintainable.
+  components like a heading or a construct in the code!  Either you
+  like them or you don't.  To change the attributes of individual
+  faces, it is better to do it in user-level configurations
+  ([[#h:152326a3-9356-4158-8adb-83c42c2ef117][Do-It-Yourself 
customizations]]).  Report the issue and I can help
+  with the relevant code.  Providing customizations that refashion a
+  wide set of themes is not maintainable due to the sheer magnitude of
+  all the possible combinations.
 
 + Curated list of supported faces 
([[#h:c8d80daf-d039-40c4-bb74-e7814a9b4c79][Supported packages or face 
groups]]).
   I will only cover what I use and/or know is in a well-maintained
@@ -1175,18 +1177,20 @@ The above list is non-exhaustive though you get the 
idea.
   the theme.
 
 + Minimum contrast ratio of 4.5:1 against the main background (WCAG AA
-  standard).  Use my =modus-themes= package (also built into Emacs 28 or
-  higher) if you need top-class accessibility.
+  standard).  Emphasis on "minimum" as themes can always have more
+  contrast.  Use my =modus-themes= package (also built into Emacs 28
+  or higher) if you need top-class accessibility in this regard.
 
-+ If two elements are functionally different, the theme must render this
-  fact conspicuous ([[#h:b59f315c-6d25-4225-b99b-c06594fa3bf0][Let Org tags 
inherit the heading color?]]).
++ If two elements are functionally distinct, the theme must render
+  this fact conspicuous ([[#h:b59f315c-6d25-4225-b99b-c06594fa3bf0][Let Org 
tags inherit the heading color?]]).
 
 + Respect the decisions of the upstream package provider or, else, do
-  not make weird things with faces.  We only override the design choice
-  of a package if it is necessary.
+  not make weird things with faces.  I only override the design choice
+  of a package if it is absolutely necessary and then still try to
+  conform with the principle of least surprise.
 
 + When there is an inescapable trade-off between usability and
-  aesthetics, we will always opt for the former, without prejudice to
+  aesthetics, I will always opt for the former, without prejudice to
   the aforementioned principles.
 
 ** Minimal VS maximal scope
@@ -1204,8 +1208,8 @@ necessity.  The =modus-themes= are such because:
day using FOO package, it needs to be perfectly legible, otherwise
the whole theme fails to deliver on its promise.
 
-The =ef-themes= can afford to be minimal because they do not have such a
-lofty accessibility target.
+The =ef-themes= can afford to be more minimal because they do not have
+such a lofty accessibility target.
 
 * FAQ
 :PROPERTIES:

[elpa] externals/ef-themes updated (f7f105be38 -> 67e6676199)

2022-11-03 Thread ELPA Syncer 
elpasync pushed a change to branch externals/ef-themes.

  from  f7f105be38 Refine 'variable' mapping for "trio" themes
   new  6bf14ecaae Add ef-themes-region user option
   new  69ca1de03c Fix typo in symbol
   new  973b67ddd9 Tweak sample configuration
   new  67e6676199 Clarify statements in the manual


Summary of changes:
 README.org | 82 +-
 ef-autumn-theme.el |  3 ++
 ef-bio-theme.el|  3 ++
 ef-cherie-theme.el |  3 ++
 ef-cyprus-theme.el |  3 ++
 ef-dark-theme.el   |  3 ++
 ef-day-theme.el|  3 ++
 ef-deuteranopia-dark-theme.el  |  3 ++
 ef-deuteranopia-light-theme.el |  3 ++
 ef-duo-dark-theme.el   |  3 ++
 ef-duo-light-theme.el  |  3 ++
 ef-frost-theme.el  |  3 ++
 ef-light-theme.el  |  3 ++
 ef-night-theme.el  |  3 ++
 ef-spring-theme.el |  3 ++
 ef-summer-theme.el |  3 ++
 ef-themes.el   | 80 -
 ef-trio-dark-theme.el  |  3 ++
 ef-trio-light-theme.el |  3 ++
 ef-tritanopia-dark-theme.el|  3 ++
 ef-tritanopia-light-theme.el   |  3 ++
 ef-winter-theme.el |  3 ++
 22 files changed, 204 insertions(+), 18 deletions(-)

[elpa] externals/ef-themes 69ca1de03c 2/4: Fix typo in symbol

2022-11-03 Thread ELPA Syncer 
branch: externals/ef-themes
commit 69ca1de03c1110e439a53e59b1549629892526bb
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Fix typo in symbol
---
 README.org   | 6 +++---
 ef-themes.el | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.org b/README.org
index b1963e8aef..1174d1f71a 100644
--- a/README.org
+++ b/README.org
@@ -399,14 +399,14 @@ Combinations of those symbols are expressed in any order.
 In user configuration files the form may look like this:
 
 #+begin_src emacs-lisp
-(setq modus-themes-region '(intense no-extend))
+(setq ef-themes-region '(intense no-extend))
 #+end_src
 
 Other examples:
 
 #+begin_src emacs-lisp
-(setq modus-themes-region '(intense))
-(setq modus-themes-region '(intense no-extend neutral))
+(setq ef-themes-region '(intense))
+(setq ef-themes-region '(intense no-extend neutral))
 #+end_src
 
 * Loading a theme
diff --git a/ef-themes.el b/ef-themes.el
index c6e5ac17b7..5033ca228f 100644
--- a/ef-themes.el
+++ b/ef-themes.el
@@ -278,12 +278,12 @@ Combinations of those symbols are expressed in any order.
 
 In user configuration files the form may look like this:
 
-(setq modus-themes-region \\='(intense no-extend))
+(setq ef-themes-region \\='(intense no-extend))
 
 Other examples:
 
-(setq modus-themes-region \\='(intense))
-(setq modus-themes-region \\='(intense no-extend neutral))"
+(setq ef-themes-region \\='(intense))
+(setq ef-themes-region \\='(intense no-extend neutral))"
   :group 'ef-themes
   :package-version '(ef-themes . "0.10.0")
   :type '(set :tag "Properties" :greedy t

[elpa] externals/org 2924c77848 1/2: org-compat: Add missing argument to `connection-local-get-profiles'

2022-11-03 Thread ELPA Syncer 
branch: externals/org
commit 2924c778482a2e62e3bc906fbd3ecd18beb1d11f
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

org-compat: Add missing argument to `connection-local-get-profiles'

* lisp/org-compat.el (with-connection-local-variables): Add missing
required argument to the `connection-local-get-profiles' call.

Reported-by: Max Nikulin 
Link: https://orgmode.org/list/tk0pjd$ebo$1...@ciao.gmane.io
---
 lisp/org-compat.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 975b360fb4..15ee9dac22 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -285,7 +285,7 @@ extension beyond end of line was not controllable."
 "Apply connection-local variables according to `default-directory'.
 Execute BODY, and unwind connection-local variables."
 (declare (debug t))
-`(with-connection-local-profiles (connection-local-get-profiles)
+`(with-connection-local-profiles (connection-local-get-profiles nil)
,@body)))

[elpa] externals/org updated (bd468136dd -> f7b16402e6)

2022-11-03 Thread ELPA Syncer 
elpasync pushed a change to branch externals/org.

  from  bd468136dd lisp/ob-sql.el: Add Daniel Kraus as the maintainer
   new  2924c77848 org-compat: Add missing argument to 
`connection-local-get-profiles'
   new  f7b16402e6 org-babel: Never throw away standard error


Summary of changes:
 lisp/ob-eval.el   | 47 ++---
 lisp/org-compat.el|  2 +-
 testing/lisp/test-ob-shell.el | 82 +++
 3 files changed, 109 insertions(+), 22 deletions(-)

[elpa] externals/org f7b16402e6 2/2: org-babel: Never throw away standard error

2022-11-03 Thread ELPA Syncer 
branch: externals/org
commit f7b16402e6a694d592210f766544f6114056b4b0
Author: Rudolf Adamkovič 
Commit: Ihor Radchenko 

org-babel: Never throw away standard error

* lisp/ob-eval.el (org-babel-eval-error-notify): Do not insert
superfluous whitespace.
* lisp/ob-eval.el (org-babel-eval): Show standard error even if the
command exits with a zero code.
* testing/lisp/test-ob-shell.el(
ob-shell/standard-output-after-success,
ob-shell/standard-output-after-failure,
ob-shell/error-output-after-success,
ob-shell/error-output-after-failure,
ob-shell/error-output-after-failure-multiple,
ob-shell/exit-code,
ob-shell/exit-code-multiple
): Add tests to avoid regressions.
---
 lisp/ob-eval.el   | 47 ++---
 testing/lisp/test-ob-shell.el | 82 +++
 2 files changed, 108 insertions(+), 21 deletions(-)

diff --git a/lisp/ob-eval.el b/lisp/ob-eval.el
index e1278bbadd..af9283c0a2 100644
--- a/lisp/ob-eval.el
+++ b/lisp/ob-eval.el
@@ -40,39 +40,44 @@
 (with-current-buffer buf
   (goto-char (point-max))
   (save-excursion
-(insert stderr)
 (unless (bolp) (insert "\n"))
-(insert (format "[ Babel evaluation exited with code %S ]\n" 
exit-code
+(insert stderr)
+(insert (format "[ Babel evaluation exited with code %S ]" 
exit-code
 (display-buffer buf))
   (message "Babel evaluation exited with code %S" exit-code))
 
 (defun org-babel-eval (command query)
   "Run COMMAND on QUERY.
+Return standard output produced by COMMAND.  If COMMAND exits
+with a non-zero code or produces error output, show it with
+`org-babel-eval-error-notify'.
+
 Writes QUERY into a temp-buffer that is processed with
-`org-babel--shell-command-on-region'.  If COMMAND succeeds then return
-its results, otherwise display STDERR with
-`org-babel-eval-error-notify'."
+`org-babel--shell-command-on-region'."
   (let ((error-buffer (get-buffer-create " *Org-Babel Error*")) exit-code)
 (with-current-buffer error-buffer (erase-buffer))
 (with-temp-buffer
   (insert query)
   (setq exit-code
-   (org-babel--shell-command-on-region
-command error-buffer))
-  (if (or (not (numberp exit-code)) (> exit-code 0))
- (progn
-   (with-current-buffer error-buffer
- (org-babel-eval-error-notify exit-code (buffer-string)))
-   (save-excursion
- (when (get-buffer org-babel-error-buffer-name)
-   (with-current-buffer org-babel-error-buffer-name
- (unless (derived-mode-p 'compilation-mode)
-   (compilation-mode))
- ;; Compilation-mode enforces read-only, but Babel expects the 
buffer modifiable.
- (setq buffer-read-only nil
-;; Return output, if any.
-   (buffer-string))
-   (buffer-string)
+(org-babel--shell-command-on-region
+ command error-buffer))
+  (let ((stderr (with-current-buffer error-buffer (buffer-string
+(if (or (not (numberp exit-code))
+(> exit-code 0)
+(not (string-empty-p stderr)))
+(progn
+  (org-babel-eval-error-notify exit-code stderr)
+  (save-excursion
+(when (get-buffer org-babel-error-buffer-name)
+  (with-current-buffer org-babel-error-buffer-name
+(unless (derived-mode-p 'compilation-mode)
+  (compilation-mode))
+;; Compilation-mode enforces read-only, but
+;; Babel expects the buffer modifiable.
+(setq buffer-read-only nil
+  ;; Return output, if any.
+  (buffer-string))
+  (buffer-string))
 
 (defun org-babel-eval-read-file (file)
   "Return the contents of FILE as a string."
diff --git a/testing/lisp/test-ob-shell.el b/testing/lisp/test-ob-shell.el
index 4c00faa498..7aa45cc8a2 100644
--- a/testing/lisp/test-ob-shell.el
+++ b/testing/lisp/test-ob-shell.el
@@ -170,6 +170,88 @@ ob-comint.el, which was not previously tested."
  "#+BEGIN_SRC sh :results table\necho 'I \"want\" it 
all'\n#+END_SRC"
(org-babel-execute-src-block)
 
+;;; Standard output
+
+(ert-deftest ob-shell/standard-output-after-success ()
+  "Test standard output after exiting with a zero code."
+  (should (= 1
+ (org-babel-execute:sh
+  "echo 1" nil
+
+(ert-deftest ob-shell/standard-output-after-failure ()
+  "Test standard output after exiting with a non-zero code."
+  (should (= 1
+ (org-babel-execute:sh
+  "echo 1; exit 2" nil
+
+;;; Standard error
+
+(ert-deftest ob-shell/error-output-after-success ()
+  "Test that standard error shows in the error buffer, alongside the
+exit code, after exiting with a zero code."
+  (should
+   (string= "1
+[ Ba

[nongnu] elpa/geiser 04dbdacfec: version bump

2022-11-03 Thread ELPA Syncer 
branch: elpa/geiser
commit 04dbdacfeca0190856abad859360da4bb873f9dd
Author: jao 
Commit: jao 

version bump
---
 elisp/geiser.el | 2 +-
 news.org| 6 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/elisp/geiser.el b/elisp/geiser.el
index 442c4c3401..e9864cd671 100644
--- a/elisp/geiser.el
+++ b/elisp/geiser.el
@@ -13,7 +13,7 @@
 ;; Homepage: https://gitlab.com/emacs-geiser/
 ;; Package-Requires: ((emacs "25.1") (project "0.8.1"))
 ;; SPDX-License-Identifier: BSD-3-Clause
-;; Version: 0.27
+;; Version: 0.28
 
 ;;; Commentary:
 
diff --git a/news.org b/news.org
index 4b5e361ed8..d35b6a894b 100644
--- a/news.org
+++ b/news.org
@@ -1,3 +1,9 @@
+* Version 0.28 (November 4 2022)
+
+  - Last-result local jumps and autodoc (without using imenu).
+  - Simplifications to the debugging support.
+  - Clean-ups and more libs under lexical binding.
+
 * Version 0.27 (October 13 2022)
 
   - Fallback to imenu for jumping to symbol definition, as a last resort.

[nongnu] elpa/geiser-guile f5e82dc0f5: version bump

2022-11-03 Thread ELPA Syncer 
branch: elpa/geiser-guile
commit f5e82dc0f5a076335f201885a7edbefaa1ad435f
Author: jao 
Commit: jao 

version bump
---
 geiser-guile.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/geiser-guile.el b/geiser-guile.el
index 98ab0df829..98192c7cd0 100644
--- a/geiser-guile.el
+++ b/geiser-guile.el
@@ -7,9 +7,9 @@
 ;; Maintainer: Jose Antonio Ortega Ruiz (j...@gnu.org)
 ;; Keywords: languages, guile, scheme, geiser
 ;; Homepage: https://gitlab.com/emacs-geiser/guile
-;; Package-Requires: ((emacs "25.1") (transient "0.3") (geiser "0.26.1"))
+;; Package-Requires: ((emacs "25.1") (transient "0.3") (geiser "0.28"))
 ;; SPDX-License-Identifier: BSD-3-Clause
-;; Version: 0.26.1
+;; Version: 0.28.0
 
 ;; This file is NOT part of GNU Emacs.