aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2020-02-01 07:50:10 -0800
committerGlenn Morris2020-02-01 07:50:10 -0800
commit0ceb5d0b23e64712d5a2c29b642489524cdbd6d4 (patch)
treee6180c252e0dab1f8992bac997c361a39426ba8c
parentfcac8fcf17ddfef218bb97db4322083077ec7306 (diff)
parent5bf2ef3871b0f42266f6bde7c0d2d607e9625770 (diff)
downloademacs-0ceb5d0b23e64712d5a2c29b642489524cdbd6d4.tar.gz
emacs-0ceb5d0b23e64712d5a2c29b642489524cdbd6d4.zip
Merge from origin/emacs-27
5bf2ef3871 Add more blackboard bold characters to TeX input method c362a624d8 ; * lisp/progmodes/gdb-mi.el (gdb-handle-reply): Fix comme... 2b1e18ae85 Protect against errors in gdb-mi.el handlers baceb8e84d Allow exiting the Python interpreter of a GDB session 2e66013dcf Ensure minibuffer input is added to history in read_minibuf de41161534 Tab-bar related fixes. 247f2cfa02 ; ChangeLog.3 fixes. e1a712bb3f * admin/authors.el: Add missing entries.
-rw-r--r--ChangeLog.32
-rw-r--r--admin/authors.el27
-rw-r--r--lisp/cus-start.el2
-rw-r--r--lisp/desktop.el7
-rw-r--r--lisp/leim/quail/latin-ltx.el28
-rw-r--r--lisp/progmodes/gdb-mi.el11
-rw-r--r--lisp/tab-bar.el12
-rw-r--r--src/minibuf.c8
8 files changed, 81 insertions, 16 deletions
diff --git a/ChangeLog.3 b/ChangeLog.3
index d2a1d51e8b3..9d171bfc979 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -1427,7 +1427,7 @@
1427 1427
1428 * lisp/startup.el (command-line): Allow XDG-style as well as old 1428 * lisp/startup.el (command-line): Allow XDG-style as well as old
1429 style paths. 1429 style paths.
1430 * doc/startup.texi: Document the above change. 1430 * doc/emacs/custom.texi: Document the above change.
1431 1431
14322019-04-11 Eli Zaretskii <eliz@gnu.org> 14322019-04-11 Eli Zaretskii <eliz@gnu.org>
1433 1433
diff --git a/admin/authors.el b/admin/authors.el
index cc0adb040f5..f8f72878d28 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -206,6 +206,7 @@ files.")
206 ("Yoni Rabkin" "Yoni Rabkin Katzenell") 206 ("Yoni Rabkin" "Yoni Rabkin Katzenell")
207 ("Yoshinori Koseki" "KOSEKI Yoshinori" "小関 吉則") 207 ("Yoshinori Koseki" "KOSEKI Yoshinori" "小関 吉則")
208 ("Yutaka NIIBE" "NIIBE Yutaka") 208 ("Yutaka NIIBE" "NIIBE Yutaka")
209 (nil "stardiviner")
209 ) 210 )
210 "Alist of author aliases. 211 "Alist of author aliases.
211 212
@@ -440,6 +441,24 @@ Changes to files matching one of the regexps in this list are not listed.")
440 "nt/subdirs.el" 441 "nt/subdirs.el"
441 "config.nt" 442 "config.nt"
442 "nextstep/WISHLIST" 443 "nextstep/WISHLIST"
444 ;; Removed, replaced by gitmerge.el
445 "admin/bzrmerge.el"
446 ;; Removed in commit f5090b91299
447 "lib/fdatasync.c"
448 ;; Removed as obsolete
449 "nt/README-ftp-server"
450 "admin/notes/font-backend"
451 "gnus-overrides.texi"
452 "CENSORSHIP"
453 "GNU"
454 "LINUX-GNU"
455 "THE-GNU-PROJECT"
456 "WHY-FREE"
457 "MORE.STUFF"
458 "notes/font-backend"
459 ;; ada-mode has been deleted, now in GNU ELPA
460 "ada-mode.texi"
461 "GNUS-NEWS"
443 ) 462 )
444 "List of files and directories to ignore. 463 "List of files and directories to ignore.
445Changes to files in this list are not listed.") 464Changes to files in this list are not listed.")
@@ -752,6 +771,9 @@ Changes to files in this list are not listed.")
752 "org-mac-message.el" "org-mew.el" "org-w3m.el" "org-vm.el" "org-wl.el" 771 "org-mac-message.el" "org-mew.el" "org-w3m.el" "org-vm.el" "org-wl.el"
753 "org-mks.el" "org-remember.el" "org-xoxo.el" "org-docbook.el" 772 "org-mks.el" "org-remember.el" "org-xoxo.el" "org-docbook.el"
754 "org-freemind.el" "ox-jsinfo.el" 773 "org-freemind.el" "ox-jsinfo.el"
774 "org-irc.el" "org-rmail.el" "org-docview.el" "org-keys.el" "org-mhe.el"
775 "org-gnus.el" "org-bibtex.el" "org-bbdb.el" "org-info.el" "org-eshell.el"
776 "ob-keys.el"
755 "org-exp-blocks.el" ; maybe this is ob-exp now? dunno 777 "org-exp-blocks.el" ; maybe this is ob-exp now? dunno
756 "org-lparse.el" 778 "org-lparse.el"
757 "org-special-blocks.el" "org-taskjuggler.el" 779 "org-special-blocks.el" "org-taskjuggler.el"
@@ -1076,6 +1098,11 @@ in the repository.")
1076 ("src/module.c" . "src/emacs-module.c") 1098 ("src/module.c" . "src/emacs-module.c")
1077 ;; gnulib 1099 ;; gnulib
1078 ("lib/strftime.c" . "lib/nstrftime.c") 1100 ("lib/strftime.c" . "lib/nstrftime.c")
1101 ("test/src/regex-tests.el" . "test/src/regex-emacs-tests.el")
1102 ("test/lisp/emacs-lisp/cl-tests.el" . "test/lisp/obsolete/cl-tests.el")
1103 ("lisp/net/starttls.el" . "lisp/obsolete/starttls.el")
1104 ("url-ns.el" . "lisp/obsolete/url-ns.el")
1105 ("gnus-news.texi" . "doc/misc/gnus.texi")
1079 ) 1106 )
1080 "Alist of files which have been renamed during their lifetime. 1107 "Alist of files which have been renamed during their lifetime.
1081Elements are (OLDNAME . NEWNAME).") 1108Elements are (OLDNAME . NEWNAME).")
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index e3dc6f03c4b..dff4d9a6060 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -324,7 +324,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
324 ;; FIXME? 324 ;; FIXME?
325 ;; :initialize custom-initialize-default 325 ;; :initialize custom-initialize-default
326 :set custom-set-minor-mode) 326 :set custom-set-minor-mode)
327 (tab-bar-mode (frames mouse) boolean nil 327 (tab-bar-mode tab-bar boolean nil
328 ;; :initialize custom-initialize-default 328 ;; :initialize custom-initialize-default
329 :set custom-set-minor-mode) 329 :set custom-set-minor-mode)
330 (tool-bar-mode (frames mouse) boolean nil 330 (tool-bar-mode (frames mouse) boolean nil
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 9538bb4a34f..de601a4de8c 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -946,7 +946,12 @@ which means to truncate VAR's value to at most MAX-SIZE elements
946 ")\n")))) 946 ")\n"))))
947 947
948;; ---------------------------------------------------------------------------- 948;; ----------------------------------------------------------------------------
949(defvar desktop-buffers-not-to-save-function nil) 949(defvar desktop-buffers-not-to-save-function nil
950 "Function identifying buffers that are to be excluded from saving.
951Like `desktop-buffers-not-to-save' it can be used to check whether
952a given buffer should not be saved. It takes the same arguments as
953`desktop-save-buffer-p' and should return nil if buffer should not
954have its state saved in the desktop file.")
950 955
951(defun desktop-save-buffer-p (filename bufname mode &rest rest) 956(defun desktop-save-buffer-p (filename bufname mode &rest rest)
952 "Return t if buffer should have its state saved in the desktop file. 957 "Return t if buffer should have its state saved in the desktop file.
diff --git a/lisp/leim/quail/latin-ltx.el b/lisp/leim/quail/latin-ltx.el
index ea9cafe62d2..78ffca9e2fa 100644
--- a/lisp/leim/quail/latin-ltx.el
+++ b/lisp/leim/quail/latin-ltx.el
@@ -656,10 +656,34 @@ system, including many technical ones. Examples:
656 ("\\wp" ?℘) 656 ("\\wp" ?℘)
657 ("\\wr" ?≀) 657 ("\\wr" ?≀)
658 658
659 ("\\Bbb{N}" ?ℕ) ; AMS commands for blackboard bold 659 ("\\Bbb{A}" ?𝔸) ; AMS commands for blackboard bold
660 ("\\Bbb{P}" ?ℙ) ; Also sometimes \mathbb. 660 ("\\Bbb{B}" ?𝔹) ; Also sometimes \mathbb.
661 ("\\Bbb{C}" ?ℂ)
662 ("\\Bbb{D}" ?𝔻)
663 ("\\Bbb{E}" ?𝔼)
664 ("\\Bbb{F}" ?𝔽)
665 ("\\Bbb{G}" ?𝔾)
666 ("\\Bbb{H}" ?ℍ)
667 ("\\Bbb{I}" ?𝕀)
668 ("\\Bbb{J}" ?𝕁)
669 ("\\Bbb{K}" ?𝕂)
670 ("\\Bbb{L}" ?𝕃)
671 ("\\Bbb{M}" ?𝕄)
672 ("\\Bbb{N}" ?ℕ)
673 ("\\Bbb{O}" ?𝕆)
674 ("\\Bbb{P}" ?ℙ)
675 ("\\Bbb{Q}" ?ℚ)
661 ("\\Bbb{R}" ?ℝ) 676 ("\\Bbb{R}" ?ℝ)
677 ("\\Bbb{S}" ?𝕊)
678 ("\\Bbb{T}" ?𝕋)
679 ("\\Bbb{U}" ?𝕌)
680 ("\\Bbb{V}" ?𝕍)
681 ("\\Bbb{W}" ?𝕎)
682 ("\\Bbb{X}" ?𝕏)
683 ("\\Bbb{Y}" ?𝕐)
662 ("\\Bbb{Z}" ?ℤ) 684 ("\\Bbb{Z}" ?ℤ)
685 ("\\Bbb{1}" ?𝟙)
686 ("\\Bbb{2}" ?𝟚)
663 ("--" ?–) 687 ("--" ?–)
664 ("---" ?—) 688 ("---" ?—)
665 ;; We used to use ~ for NBSP but that's inconvenient and may even look like 689 ;; We used to use ~ for NBSP but that's inconvenient and may even look like
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index e4233dacaf6..e785acd2840 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -324,7 +324,10 @@ in `gdb-handler-list' and clears all pending handlers invalidated
324by the reception of this reply." 324by the reception of this reply."
325 (let ((handler-function (gdb-get-handler-function token-number))) 325 (let ((handler-function (gdb-get-handler-function token-number)))
326 (when handler-function 326 (when handler-function
327 (funcall handler-function) 327 ;; Protect against errors in handler-function.
328 (condition-case err
329 (funcall handler-function)
330 (error (message (error-message-string err))))
328 (gdb-delete-handler token-number)))) 331 (gdb-delete-handler token-number))))
329 332
330(defun gdb-remove-all-pending-triggers () 333(defun gdb-remove-all-pending-triggers ()
@@ -1001,8 +1004,10 @@ no input, and GDB is waiting for input."
1001 ;; Sending an EOF does not work with GDB-MI; submit an 1004 ;; Sending an EOF does not work with GDB-MI; submit an
1002 ;; explicit quit command. 1005 ;; explicit quit command.
1003 (progn 1006 (progn
1004 (insert "quit") 1007 (if (> gdb-control-level 0)
1005 (comint-send-input t t)) 1008 (process-send-eof proc)
1009 (insert "quit")
1010 (comint-send-input t t)))
1006 (delete-char arg)))) 1011 (delete-char arg))))
1007 1012
1008(defvar gdb-define-alist nil "Alist of #define directives for GUD tooltips.") 1013(defvar gdb-define-alist nil "Alist of #define directives for GUD tooltips.")
diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el
index eccab268dc9..ebb0c566ad1 100644
--- a/lisp/tab-bar.el
+++ b/lisp/tab-bar.el
@@ -1123,7 +1123,7 @@ function `tab-bar-tab-name-function'."
1123 1123
1124(define-minor-mode tab-bar-history-mode 1124(define-minor-mode tab-bar-history-mode
1125 "Toggle tab history mode for the tab bar." 1125 "Toggle tab history mode for the tab bar."
1126 :global t 1126 :global t :group 'tab-bar
1127 (if tab-bar-history-mode 1127 (if tab-bar-history-mode
1128 (progn 1128 (progn
1129 (when (and tab-bar-mode (not (get-text-property 0 'display tab-bar-back-button))) 1129 (when (and tab-bar-mode (not (get-text-property 0 'display tab-bar-back-button)))
@@ -1400,7 +1400,7 @@ in the selected frame."
1400 ((framep all-frames) (list all-frames)) 1400 ((framep all-frames) (list all-frames))
1401 (t (list (selected-frame))))) 1401 (t (list (selected-frame)))))
1402 1402
1403(defun tab-bar-get-buffer-tab (buffer-or-name &optional all-frames) 1403(defun tab-bar-get-buffer-tab (buffer-or-name &optional all-frames ignore-current-tab)
1404 "Return a tab owning a window whose buffer is BUFFER-OR-NAME. 1404 "Return a tab owning a window whose buffer is BUFFER-OR-NAME.
1405BUFFER-OR-NAME may be a buffer or a buffer name and defaults to 1405BUFFER-OR-NAME may be a buffer or a buffer name and defaults to
1406the current buffer. 1406the current buffer.
@@ -1414,7 +1414,10 @@ The optional argument ALL-FRAMES specifies the frames to consider:
1414- A frame means consider all tabs on that frame only. 1414- A frame means consider all tabs on that frame only.
1415 1415
1416Any other value of ALL-FRAMES means consider all tabs on the 1416Any other value of ALL-FRAMES means consider all tabs on the
1417selected frame and no others." 1417selected frame and no others.
1418
1419When the optional argument IGNORE-CURRENT-TAB is non-nil,
1420don't take into account the buffers in the currently selected tab."
1418 (let ((buffer (if buffer-or-name 1421 (let ((buffer (if buffer-or-name
1419 (get-buffer buffer-or-name) 1422 (get-buffer buffer-or-name)
1420 (current-buffer)))) 1423 (current-buffer))))
@@ -1424,7 +1427,8 @@ selected frame and no others."
1424 (seq-some 1427 (seq-some
1425 (lambda (tab) 1428 (lambda (tab)
1426 (when (if (eq (car tab) 'current-tab) 1429 (when (if (eq (car tab) 'current-tab)
1427 (get-buffer-window buffer frame) 1430 (unless ignore-current-tab
1431 (get-buffer-window buffer frame))
1428 (let* ((state (alist-get 'ws tab)) 1432 (let* ((state (alist-get 'ws tab))
1429 (buffers (when state 1433 (buffers (when state
1430 (window-state-buffers state)))) 1434 (window-state-buffers state))))
diff --git a/src/minibuf.c b/src/minibuf.c
index 8ebdff12527..9d870ce3640 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -697,10 +697,6 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
697 else 697 else
698 histstring = Qnil; 698 histstring = Qnil;
699 699
700 /* If Lisp form desired instead of string, parse it. */
701 if (expflag)
702 val = string_to_object (val, defalt);
703
704 /* The appropriate frame will get selected 700 /* The appropriate frame will get selected
705 in set-window-configuration. */ 701 in set-window-configuration. */
706 unbind_to (count, Qnil); 702 unbind_to (count, Qnil);
@@ -711,6 +707,10 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
711 if (! (NILP (Vhistory_add_new_input) || NILP (histstring))) 707 if (! (NILP (Vhistory_add_new_input) || NILP (histstring)))
712 call2 (intern ("add-to-history"), histvar, histstring); 708 call2 (intern ("add-to-history"), histvar, histstring);
713 709
710 /* If Lisp form desired instead of string, parse it. */
711 if (expflag)
712 val = string_to_object (val, defalt);
713
714 return val; 714 return val;
715} 715}
716 716