mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00
Code Issues Releases Activity

Merge from origin/emacs-28

Browse Source 
f2c0fb2615 Resurrect obsoletion warning for two functions
9c0eec4ed8 * src/window.c (select_window): Fix assert for buffer = no...
16dfe04be2 Find libgccjit on macOS with Homebrew differently

# Conflicts:
#	etc/NEWS
This commit is contained in:
Stefan Kangas 2022-08-19 17:30:18 +02:00
commit d0bb333efc
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -4240,8 +4240,8 @@ if test "${with_native_compilation}" != "no"; then
if test -n "`$BREW --prefix --installed libgccjit 2>/dev/null`"; then if test -n "`$BREW --prefix --installed libgccjit 2>/dev/null`"; then
MAC_CFLAGS="-I$(dirname $($BREW ls -v libgccjit | \ MAC_CFLAGS="-I$(dirname $($BREW ls -v libgccjit | \
grep libgccjit.h))" grep libgccjit.h))"
MAC_LIBS="-L$(dirname $($BREW ls -v libgccjit| \ MAC_LIBS="-L$(dirname $($BREW ls -v libgccjit \
grep -E 'libgccjit\.(so|dylib)$'))" | grep -m1 -E 'libgccjit\.(so|dylib)$'))"
fi fi
fi fi

12
etc/NEWS.28
View File

@ -3168,9 +3168,9 @@ ledit.el, lmenu.el, lucid.el and old-whitespace.el.
'nnmail-fix-eudora-headers', 'non-iso-charset-alist', 'nnmail-fix-eudora-headers', 'non-iso-charset-alist',
'nonascii-insert-offset', 'nonascii-translation-table', 'nonascii-insert-offset', 'nonascii-translation-table',
'password-read-and-add', 'pre-abbrev-expand-hook', 'princ-list', 'password-read-and-add', 'pre-abbrev-expand-hook', 'princ-list',
'print-help-return-message', 'process-filter-multibyte-p', 'print-help-return-message', 'read-file-name-predicate',
'read-file-name-predicate', 'remember-buffer', 'rmail-highlight-face', 'remember-buffer', 'rmail-highlight-face', 'rmail-message-filter',
'rmail-message-filter', 'semantic-after-idle-scheduler-reparse-hooks', 'semantic-after-idle-scheduler-reparse-hooks',
'semantic-after-toplevel-bovinate-hook', 'semantic-after-toplevel-bovinate-hook',
'semantic-before-idle-scheduler-reparse-hooks', 'semantic-before-idle-scheduler-reparse-hooks',
'semantic-before-toplevel-bovination-hook', 'semantic-before-toplevel-bovination-hook',
@ -3196,9 +3196,9 @@ ledit.el, lmenu.el, lucid.el and old-whitespace.el.
'semantic-something-to-stream', 'semantic-tag-make-assoc-list', 'semantic-something-to-stream', 'semantic-tag-make-assoc-list',
'semantic-token-type-parent', 'semantic-toplevel-bovine-cache', 'semantic-token-type-parent', 'semantic-toplevel-bovine-cache',
'semantic-toplevel-bovine-table', 'semanticdb-mode-hooks', 'semantic-toplevel-bovine-table', 'semanticdb-mode-hooks',
'set-coding-priority', 'set-process-filter-multibyte', 'set-coding-priority', 'shadows-compare-text-p',
'shadows-compare-text-p', 'shell-dirtrack-toggle', 'shell-dirtrack-toggle', 'speedbar-navigating-speed',
'speedbar-navigating-speed', 'speedbar-update-speed', 't-mouse-mode', 'speedbar-update-speed', 't-mouse-mode',
'term-dynamic-simple-complete', 'tooltip-hook', 'tpu-have-ispell', 'term-dynamic-simple-complete', 'tooltip-hook', 'tpu-have-ispell',
'url-generate-unique-filename', 'url-temporary-directory', 'url-generate-unique-filename', 'url-temporary-directory',
'vc-arch-command', 'vc-default-working-revision' (variable), 'vc-arch-command', 'vc-default-working-revision' (variable),

2
lisp/subr.el
View File

@ -1866,6 +1866,8 @@ be a list of the form returned by `event-start' and `event-end'."
(make-obsolete-variable 'inhibit-changing-match-data 'save-match-data "29.1") (make-obsolete-variable 'inhibit-changing-match-data 'save-match-data "29.1")
(make-obsolete 'run-window-configuration-change-hook nil "27.1") (make-obsolete 'run-window-configuration-change-hook nil "27.1")
(make-obsolete 'process-filter-multibyte-p nil "23.1")
(make-obsolete 'set-process-filter-multibyte nil "23.1")
(make-obsolete-variable 'command-debug-status (make-obsolete-variable 'command-debug-status
"expect it to be removed in a future version." "25.2") "expect it to be removed in a future version." "25.2")

4
src/window.c
View File

@ -556,7 +556,9 @@ select_window (Lisp_Object window, Lisp_Object norecord,
frame is active. */ frame is active. */
Fselect_frame (frame, norecord); Fselect_frame (frame, norecord);
/* Fselect_frame called us back so we've done all the work already. */ /* Fselect_frame called us back so we've done all the work already. */
eassert (EQ (window, selected_window)); eassert (EQ (window, selected_window)
|| (EQ (window, f->minibuffer_window)
&& NILP (Fminibufferp (XWINDOW (window)->contents, Qt))));
return window; return window;
} }
else else