]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-27
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 2 Jun 2020 05:26:32 +0000 (22:26 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 2 Jun 2020 05:26:32 +0000 (22:26 -0700)
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

1  2 
lisp/emacs-lisp/bytecomp.el
lisp/progmodes/cc-mode.el
lisp/tab-bar.el
src/alloc.c
src/xdisp.c

Simple merge
index b3b2374805db45caf8d754b19859231be51aa913,066bec60091341b74053509d87fcea59da501099..4869f5c596dae79106136f4d21fbc6f885b06662
@@@ -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 d24d59cb7e811e3a95dce2ffc6195ebf1f35d3f4,5c237e7130e8c1b6b2ced1e4310c206bc5877e5b..76e7f8c33a228e0ff9622397fa53ff0aa8fb9e1a
@@@ -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)
diff --cc src/alloc.c
Simple merge
diff --cc src/xdisp.c
Simple merge