From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 2 Jun 2020 05:26:32 +0000 (-0700)
Subject: Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~7236
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e10bd9e249bf70d0165a0cc050656ad94f34197d;p=emacs.git

Merge from origin/emacs-27

44c0e074f7 * doc/emacs/buffers.texi (Icomplete): Mention icomplete-mi...
68b6dad1d8 Be more aggressive in marking objects during GC
36f508f589 ; * src/xdisp.c (find_last_unchanged_at_beg_row): Fix a typo.
cc340da1fe Fix bug #41618 "(byte-compile 'foo) errors when foo is a m...
41232e6797 Avoid crashes due to bidi cache being reset during redisplay
f72bb4ce36 * lisp/tab-bar.el (switch-to-buffer-other-tab): Normalize ...
d3e0023aaa ; * etc/TODO: Fix formatting.  (Bug#41497)
a8ad94cd2f Fix mingw.org's MinGW GCC 9 warning about 'execve'

# Conflicts:
#	lisp/tab-bar.el
#	nt/inc/ms-w32.h
#	src/alloc.c
---

e10bd9e249bf70d0165a0cc050656ad94f34197d
diff --cc lisp/progmodes/cc-mode.el
index b3b2374805d,066bec60091..4869f5c596d
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@@ -1620,8 -1595,8 +1620,8 @@@ Note that the style variables are alway
  		   (c-beginning-of-macro))))
        (goto-char (1+ end))		; After the \
        ;; Search forward for EOLL
 -      (setq lim (re-search-forward "\\(\\\\\\(.\\|\n\\)\\|[^\\\n\r]\\)*"
 +      (setq lim (re-search-forward "\\(?:\\\\\\(?:.\\|\n\\)\\|[^\\\n\r]\\)*"
-        				   nil t))
+ 				   nil t))
        (goto-char (1+ end))
        (when (c-search-forward-char-property-with-value-on-char
  	     'syntax-table '(15) ?\" lim)
diff --cc lisp/tab-bar.el
index d24d59cb7e8,5c237e7130e..76e7f8c33a2
--- a/lisp/tab-bar.el
+++ b/lisp/tab-bar.el
@@@ -1554,9 -1526,10 +1554,10 @@@ indirectly called by the latter.
  Like \\[switch-to-buffer-other-frame] (which see), but creates a new tab."
    (interactive
     (list (read-buffer-to-switch "Switch to buffer in other tab: ")))
-   (display-buffer buffer-or-name '((display-buffer-in-tab)
-                                    (inhibit-same-window . nil)
-                                    (reusable-frames . t))
+   (display-buffer (window-normalize-buffer-to-switch-to buffer-or-name)
 -                  '((display-buffer-in-tab
 -                     display-buffer-same-window)
 -                    (inhibit-same-window . nil))
++                  '((display-buffer-in-tab)
++                    (inhibit-same-window . nil)
++                    (reusable-frames . t))
                    norecord))
  
  (defun find-file-other-tab (filename &optional wildcards)