Merge from origin/emacs-29

db96b1282f * lisp/help.el: Use 'C-h C-q' to toggle 'help-quick' wind... 489865c21e ; Improve markup of long key sequences d42c2668cf ; * etc/NEWS: Fix wording of a recently edited entry. 7a0eaee198 * lisp/isearch.el: Small fixes. b69bffeec0 * lisp/vc/diff-mode.el (diff-minor-mode-prefix): Replace ... 9263847ab7 ; * etc/NEWS: Move the paragraph with 'C-u RET' closer to... 62fb2dc37d * doc/emacs/display.texi (Text Scale): Improve section ab... 70480d3b6b * lisp/repeat.el (repeat-echo-function): Suggest 'add-fun... fd48201ffe * lisp/tab-line.el (tab-line-cache-key-default): More cac... b164660260 * etc/package-keyring.gpg: Update with new key c0be51389e ; Yet another declare-function to avoid treesit-related w... 8676bec51d ; * lisp/treesit.el (treesit--simple-imenu-1): Doc fix; w... 2ddc480f44 Warn of absent networks module in ERC 19d00fab9a Avoid "already compiled" warning in erc-compat 2d8f7b66bc ; Fix one more treesit byte-compilation warning. 2d0a921486 ; Avoid treesit-related byte-compiler warnings 8503b370be (python--treesit-settings): Remove duplicate matcher b464e6c490 Make last change of w32 GUI dialogs conditional and rever... eedc9d79ae Fix tree-sitter typos 248c13dcfe Update tree-sitter major modes to use the new Imenu facility b39dc7ab27 Add tree-sitter helper functions for Imenu ba1ddea9da Fix treesit--things-around (bug#60355) 7512b9025a ; * lisp/treesit.el (treesit-traverse-parent): Remove alias. 5326b04198 Improve treesit-node-top-level and treesit-parent-until 637f5b164f ; Add "src" to the heuristic sub-directory heuristic 8ab6df0c9f ; * lisp/epa-ks.el (epa-ks-do-key-to-fetch): Fix 'when' u... 2b55a48d3e * src/w32menu.c (simple_dialog_show): Use MB_YESNOCANCEL ... 8b8b791567 ; Improve documentation of TAB/SPC indentation 624e382211 ; Improve doc strings of some new faces 41f12e1019 ; * lisp/elide-head.el (elide-head): Doc fix to silence c... e3b4cd0ac1 ; * lisp/htmlfontify.el (hfy-text-p): Fix whitespace. 1b4dc4691c Fix htmlfontify.el command injection vulnerability. 1fe4b98b4d Improve support for Scheme R6RS and R7RS libraries (bug#5... 2347f37f67 ; * test/src/treesit-tests.el: remove dead store (bytecom... a6d961ae2f Add a new tree-sitter query predicate 'pred' 835a80dcc4 ; Fix tree-sitter defun tests a14821d615 Improve gnutls-min-prime-bits docstring b14bbd108e Improve handling of tab-bar height. 669160d47b ; * nt/INSTALL.W64: More fixes and updates. 26b2ec7cb8 Simplify last change (bug#60311) 082fc6e308 Fix 'json-available-p' on MS-Windows 6c86faec29 loaddefs-gen: Group results by absolute file name d90d7d15f2 ; Fix vindexes in parsing.texi eb26872837 Fix imenu for c-ts-mode (bug#60296) 8f68b6497e Clean up python-ts-mode font-lock features 28f26b11a1 Add comment indent and filling to other tree-sitter major... c6b0282645 ; Remove unused function in c-ts-mode 6e52a9fcad ; * doc/lispref/modes.texi (Parser-based Font Lock): Mino... 2bcd1e9a99 ; * doc/lispref/parsing.texi (Retrieving Nodes): Add notice. 7c7950fe00 Add maintainer stub for tree-sitter files cf32776622 ; * doc/lispref/parsing.texi (Using Parser): Remove delet... # Conflicts: # etc/NEWS # lisp/progmodes/c-ts-mode.el # lisp/progmodes/typescript-ts-mode.el # lisp/treesit.el
2022-12-28 21:40:59 +01:00 · 2022-12-28 21:40:59 +01:00 · dce6791e99
commit dce6791e99
parent 7e98b8a0fa db96b1282f
50 changed files with 945 additions and 813 deletions
--- a/lisp/emacs-lisp/loaddefs-gen.el
+++ b/lisp/emacs-lisp/loaddefs-gen.el
@ -608,7 +608,8 @@ instead of just updating them with the new/changed autoloads."
          (write-region (point-min) (point-max) output-file nil 'silent))
      ;; We have some data, so generate the loaddef files.  First
      ;; group per output file.
-      (dolist (fdefs (seq-group-by #'car defs))
+      (dolist (fdefs (seq-group-by (lambda (x) (expand-file-name (car x)))
+                                   defs))
        (let ((loaddefs-file (car fdefs))
              hash)
          (with-temp-buffer
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@ -613,18 +613,21 @@ checkout.  This overrides the `:branch' attribute in PKG-SPEC."

    ;; When nothing is specified about a `lisp-dir', then should
    ;; heuristically check if there is a sub-directory with lisp
-    ;; files.  These are conventionally just called "lisp".  If this
-    ;; directory exists and contains non-zero number of lisp files, we
-    ;; will use that instead of `pkg-dir'.
-    (when-let* (((null lisp-dir))
-                (dir (expand-file-name "lisp" pkg-dir))
-                ((file-directory-p dir))
-                ((directory-files dir nil "\\`[^.].+\\.el\\'" t 1)))
-      ;; We won't use `dir', since dir is an absolute path and we
-      ;; don't want `lisp-dir' to depend on the current location of
-      ;; the package installation, ie. to break if moved around the
-      ;; file system or between installations.
-      (setq lisp-dir "lisp"))
+    ;; files.  These are conventionally just called "lisp" or "src".
+    ;; If this directory exists and contains non-zero number of lisp
+    ;; files, we will use that instead of `pkg-dir'.
+    (catch 'done
+      (dolist (name '("lisp" "src"))
+        (when-let* (((null lisp-dir))
+                    (dir (expand-file-name name pkg-dir))
+                    ((file-directory-p dir))
+                    ((directory-files dir nil "\\`[^.].+\\.el\\'" t 1)))
+          ;; We won't use `dir', since dir is an absolute path and we
+          ;; don't want `lisp-dir' to depend on the current location of
+          ;; the package installation, ie. to break if moved around the
+          ;; file system or between installations.
+          (throw 'done (setq lisp-dir name)))))
+
    (when lisp-dir
      (push (cons :lisp-dir lisp-dir)
            (package-desc-extras pkg-desc)))