Merge from origin/emacs-28

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

4 files changed, 13 insertions, 9 deletions

diff --git a/configure.ac b/configure.ac
index 1a264275bd4..7616e450d0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4240,8 +4240,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
 
diff --git a/etc/NEWS.28 b/etc/NEWS.28
index 136084e419f..01e8ac112f9 100644
--- a/etc/NEWS.28
+++ b/etc/NEWS.28
@@ -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 cd6a9be099c..de8a0f70864 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -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 '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")
diff --git a/src/window.c b/src/window.c
index c8fcb3a607f..2bce4c9723d 100644
--- a/src/window.c
+++ b/src/window.c
@@ -556,7 +556,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