From 16dfe04be2c57fc82ccdd56cad97b39d559a5afe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerd=20M=C3=B6llmann?= Date: Fri, 19 Aug 2022 10:52:52 +0200 Subject: [PATCH 1/3] Find libgccjit on macOS with Homebrew differently * configure.ac (MAC_LIBS): Find libgccjit's directory slightly differently for brew installations. --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 57b86e85423..bc7485b81c8 100644 --- a/configure.ac +++ b/configure.ac @@ -3843,8 +3843,8 @@ if test "${with_native_compilation}" != "no"; then if test -n "`$BREW --prefix --installed libgccjit 2>/dev/null`"; then MAC_CFLAGS="-I$(dirname $($BREW ls -v libgccjit | \ grep libgccjit.h))" - MAC_LIBS="-L$(dirname $($BREW ls -v libgccjit| \ - grep -E 'libgccjit\.(so|dylib)$'))" + MAC_LIBS="-L$(dirname $($BREW ls -v libgccjit \ + | grep -m1 -E 'libgccjit\.(so|dylib)$'))" fi fi From 9c0eec4ed86713519819b2e33dc3fff23f0e5f3d Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Fri, 19 Aug 2022 15:06:38 +0000 Subject: [PATCH 2/3] * src/window.c (select_window): Fix assert for buffer = non-active minibuffer --- src/window.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/window.c b/src/window.c index 2576b66a181..35ec2a1f908 100644 --- a/src/window.c +++ b/src/window.c @@ -554,7 +554,9 @@ select_window (Lisp_Object window, Lisp_Object norecord, frame is active. */ Fselect_frame (frame, norecord); /* 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; } else From f2c0fb2615f4c1140f5eef52b19cb77b4e86cbb4 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Fri, 19 Aug 2022 17:29:05 +0200 Subject: [PATCH 3/3] Resurrect obsoletion warning for two functions These were supposed to have been deleted, but never were. Resurrect their obsoletion warning and let's delete them in Emacs 29 instead. * lisp/subr.el (process-filter-multibyte-p) (set-process-filter-multibyte): Resurrect obsoletion warning. * etc/NEWS: Don't announce their deletion. --- etc/NEWS | 12 ++++++------ lisp/subr.el | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 1aa16a4c059..aeddb071705 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -3168,9 +3168,9 @@ ledit.el, lmenu.el, lucid.el and old-whitespace.el. 'nnmail-fix-eudora-headers', 'non-iso-charset-alist', 'nonascii-insert-offset', 'nonascii-translation-table', 'password-read-and-add', 'pre-abbrev-expand-hook', 'princ-list', -'print-help-return-message', 'process-filter-multibyte-p', -'read-file-name-predicate', 'remember-buffer', 'rmail-highlight-face', -'rmail-message-filter', 'semantic-after-idle-scheduler-reparse-hooks', +'print-help-return-message', 'read-file-name-predicate', +'remember-buffer', 'rmail-highlight-face', 'rmail-message-filter', +'semantic-after-idle-scheduler-reparse-hooks', 'semantic-after-toplevel-bovinate-hook', 'semantic-before-idle-scheduler-reparse-hooks', '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-token-type-parent', 'semantic-toplevel-bovine-cache', 'semantic-toplevel-bovine-table', 'semanticdb-mode-hooks', -'set-coding-priority', 'set-process-filter-multibyte', -'shadows-compare-text-p', 'shell-dirtrack-toggle', -'speedbar-navigating-speed', 'speedbar-update-speed', 't-mouse-mode', +'set-coding-priority', 'shadows-compare-text-p', +'shell-dirtrack-toggle', 'speedbar-navigating-speed', +'speedbar-update-speed', 't-mouse-mode', 'term-dynamic-simple-complete', 'tooltip-hook', 'tpu-have-ispell', 'url-generate-unique-filename', 'url-temporary-directory', 'vc-arch-command', 'vc-default-working-revision' (variable), diff --git a/lisp/subr.el b/lisp/subr.el index 921853de607..edd4e339622 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1754,6 +1754,8 @@ be a list of the form returned by `event-start' and `event-end'." (make-obsolete-variable 'operating-system-release nil "28.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 "expect it to be removed in a future version." "25.2")