Merge from origin/emacs-29
6f6071c526
Avoid duplicate load-path entry when generating package a...117b29c6f6
; Improve documentation of Isearch command propertiesa347b26cba
Disable loading SQLite3 extensions when SQLite3 version i...fe22bf503f
; * lisp/progmodes/project.el (project-switch-use-entire-...64dbbde3b7
Fix visiting HTML files encoded in iso-2022 variants5c95239aca
; Fix markup of some treesit vars in Elisp manual.6ad041939b
Support 'isearch-allow-scroll' in 'pixel-scroll-precision...ecccdc07a0
shr: allow moving between adjacent anchors504ef25ef3
; * etc/NEWS: Fix typos.d6fb868cdd
Fix multihop file name expansion in Trampdd3e4e14fd
Remove obsolete information from Gnus manual2a5c946f87
Preserve mark in comint-history-isearch6b60c8142e
Fix systemd unit completion for old versions of systemd8c56557cd9
Fix Skeletons menu-bar menu in Python modes58eb38cfb4
; * etc/NEWS: missing definite articlecf40362869
; * etc/NEWS: PGTK cannot switch to -new automatically (b...ead3a2abbf
Fix loading SQLite extensionsa6bddd1765
; * etc/NEWS: Fix typos.f49fe936ab
* etc/NEWS: Note dotimes loop variable scoping change (bu...cec9333dc5
Fix c-ts-mode--top-level-declaratorf571e8f1bb
Improve c-ts-mode font-lock for function names (bug#63390)42a28ffdc2
* lisp/tab-bar.el: Don't use 'minibuffer-selected-window'...8e61d23f71
Split windows horizontally in places that use split to cr...459d08c7fe
Fix tree-sitter test (bug#63481)3bc5efb87e
; * lisp/emacs-lisp/benchmark.el (benchmark-progn): Fix d... # Conflicts: # etc/NEWS
This commit is contained in:
commit
eacee3e536
22 changed files with 206 additions and 109 deletions
|
@ -152,7 +152,7 @@ to call it without any argument."
|
|||
(defmacro benchmark-progn (&rest body)
|
||||
"Evaluate BODY and message the time taken.
|
||||
The return value is the value of the final form in BODY."
|
||||
(declare (debug body) (indent 0))
|
||||
(declare (debug t) (indent 0))
|
||||
(let ((value (make-symbol "value"))
|
||||
(start (make-symbol "start"))
|
||||
(gcs (make-symbol "gcs"))
|
||||
|
|
|
@ -1106,8 +1106,12 @@ untar into a directory named DIR; otherwise, signal an error."
|
|||
;; Add the directory that will contain the autoload file to
|
||||
;; the load path. We don't hard-code `pkg-dir', to avoid
|
||||
;; issues if the package directory is moved around.
|
||||
(or (and load-file-name (file-name-directory load-file-name))
|
||||
(car load-path)))))
|
||||
;; `loaddefs-generate' has code to do this for us, but it's
|
||||
;; not currently exposed. (Bug#63625)
|
||||
(or (and load-file-name
|
||||
(directory-file-name
|
||||
(file-name-directory load-file-name)))
|
||||
(car load-path)))))
|
||||
(let ((buf (find-buffer-visiting output-file)))
|
||||
(when buf (kill-buffer buf)))
|
||||
auto-name))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue