mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-07 06:50:23 -08:00
Merge from origin/emacs-29
94e70ed426; * lisp/emacs-lisp/eldoc.el (eldoc-display-in-echo-area)...1841299a11Eglot: implement inlay hints (bug#61412, bug#61066)28ed0d1840Eglot: run eglot-managed-mode-hook after LSP didOpen7ad5d9babeEglot: restore eldoc-documentation-functions on shutdown711a775ba7Eglot: simplify capability-checking codeea7251ad6dEglot: go back to setting eldoc-documentation-strategy again6016f1982d; * etc/NEWS: Fix typo againd411b4d1fd; * etc/NEWS (C-x v !): Additional text.a0b6725234; * doc/emacs/vc1-xtra.texi (Preparing Patches): Wording ...43c4dd6f96; * doc/emacs/anti.texi (Antinews): Adjust to latest chan...20c654b6f8Merge branch 'emacs-29' of git.sv.gnu.org:/srv/git/emacs ...177d0cf2a9; * etc/NEWS: Fix typos.db7096a532Yield to erc-move-to-prompt before unhiding promptdb21c84bc9; Improve doc string of 'C-q'a6be0be1db; Clarify "kill files" in Gnus manuald816429e2f* lisp/progmodes/python.el (python--import-sources): Fix ...1f4886fdb0Do not error out on non image file (bug#61639)003759a6dcExplain effect of variable-pitch fonts on fill-columnba91a76659Avoid division by zero in get_narrowed_* functionsfb5dbf6de7; Fix documentation of 'icon-title-format'.48c9a50771* etc/NEWS: Mention new buffer display action alist entries4dc1f2b9a0; * src/xterm.c (x_update_end): Condition on HAVE_XDBEf1c8389806Fix build --without-xdbeef38774c02Improve dnd-direct-save-remote-files docstringcf53e62a79Add 'process-status' to process shortdoc68df9e5953* lisp/emacs-lisp/comp.el (comp--trampoline-abs-filename)...06ba948416Improve text about deleting windows1976ca1634Make 'emacs-news-cycle-tag' work at all levels # Conflicts: # etc/NEWS
This commit is contained in:
commit
fad3665069
25 changed files with 406 additions and 103 deletions
|
|
@ -3812,10 +3812,8 @@ Return the trampoline if found or nil otherwise."
|
|||
;; Default to some temporary directory if no better option was
|
||||
;; found.
|
||||
finally (cl-return
|
||||
(expand-file-name
|
||||
(make-temp-file (file-name-sans-extension rel-filename) 0 ".eln"
|
||||
nil)
|
||||
temporary-file-directory))))
|
||||
(make-temp-file (file-name-sans-extension rel-filename) nil ".eln"
|
||||
nil))))
|
||||
|
||||
(defun comp-trampoline-compile (subr-name)
|
||||
"Synthesize compile and return a trampoline for SUBR-NAME."
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue