[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 0ceb5d0 1/4: Merge from origin/emacs-27
From: |
Glenn Morris |
Subject: |
master 0ceb5d0 1/4: Merge from origin/emacs-27 |
Date: |
Sat, 1 Feb 2020 10:54:52 -0500 (EST) |
branch: master
commit 0ceb5d0b23e64712d5a2c29b642489524cdbd6d4
Merge: fcac8fc 5bf2ef3
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
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.
---
ChangeLog.3 | 2 +-
admin/authors.el | 27 +++++++++++++++++++++++++++
lisp/cus-start.el | 2 +-
lisp/desktop.el | 7 ++++++-
lisp/leim/quail/latin-ltx.el | 28 ++++++++++++++++++++++++++--
lisp/progmodes/gdb-mi.el | 11 ++++++++---
lisp/tab-bar.el | 12 ++++++++----
src/minibuf.c | 8 ++++----
8 files changed, 81 insertions(+), 16 deletions(-)
diff --git a/ChangeLog.3 b/ChangeLog.3
index d2a1d51..9d171bf 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -1427,7 +1427,7 @@
* lisp/startup.el (command-line): Allow XDG-style as well as old
style paths.
- * doc/startup.texi: Document the above change.
+ * doc/emacs/custom.texi: Document the above change.
2019-04-11 Eli Zaretskii <address@hidden>
diff --git a/admin/authors.el b/admin/authors.el
index cc0adb0..f8f7287 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -206,6 +206,7 @@ files.")
("Yoni Rabkin" "Yoni Rabkin Katzenell")
("Yoshinori Koseki" "KOSEKI Yoshinori" "小関 吉則")
("Yutaka NIIBE" "NIIBE Yutaka")
+ (nil "stardiviner")
)
"Alist of author aliases.
@@ -440,6 +441,24 @@ Changes to files matching one of the regexps in this list
are not listed.")
"nt/subdirs.el"
"config.nt"
"nextstep/WISHLIST"
+ ;; Removed, replaced by gitmerge.el
+ "admin/bzrmerge.el"
+ ;; Removed in commit f5090b91299
+ "lib/fdatasync.c"
+ ;; Removed as obsolete
+ "nt/README-ftp-server"
+ "admin/notes/font-backend"
+ "gnus-overrides.texi"
+ "CENSORSHIP"
+ "GNU"
+ "LINUX-GNU"
+ "THE-GNU-PROJECT"
+ "WHY-FREE"
+ "MORE.STUFF"
+ "notes/font-backend"
+ ;; ada-mode has been deleted, now in GNU ELPA
+ "ada-mode.texi"
+ "GNUS-NEWS"
)
"List of files and directories to ignore.
Changes to files in this list are not listed.")
@@ -752,6 +771,9 @@ Changes to files in this list are not listed.")
"org-mac-message.el" "org-mew.el" "org-w3m.el" "org-vm.el" "org-wl.el"
"org-mks.el" "org-remember.el" "org-xoxo.el" "org-docbook.el"
"org-freemind.el" "ox-jsinfo.el"
+ "org-irc.el" "org-rmail.el" "org-docview.el" "org-keys.el" "org-mhe.el"
+ "org-gnus.el" "org-bibtex.el" "org-bbdb.el" "org-info.el" "org-eshell.el"
+ "ob-keys.el"
"org-exp-blocks.el" ; maybe this is ob-exp now? dunno
"org-lparse.el"
"org-special-blocks.el" "org-taskjuggler.el"
@@ -1076,6 +1098,11 @@ in the repository.")
("src/module.c" . "src/emacs-module.c")
;; gnulib
("lib/strftime.c" . "lib/nstrftime.c")
+ ("test/src/regex-tests.el" . "test/src/regex-emacs-tests.el")
+ ("test/lisp/emacs-lisp/cl-tests.el" . "test/lisp/obsolete/cl-tests.el")
+ ("lisp/net/starttls.el" . "lisp/obsolete/starttls.el")
+ ("url-ns.el" . "lisp/obsolete/url-ns.el")
+ ("gnus-news.texi" . "doc/misc/gnus.texi")
)
"Alist of files which have been renamed during their lifetime.
Elements are (OLDNAME . NEWNAME).")
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index e3dc6f0..dff4d9a 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
;; FIXME?
;; :initialize custom-initialize-default
:set custom-set-minor-mode)
- (tab-bar-mode (frames mouse) boolean nil
+ (tab-bar-mode tab-bar boolean nil
;; :initialize custom-initialize-default
:set custom-set-minor-mode)
(tool-bar-mode (frames mouse) boolean nil
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 9538bb4..de601a4 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
")\n"))))
;; ----------------------------------------------------------------------------
-(defvar desktop-buffers-not-to-save-function nil)
+(defvar desktop-buffers-not-to-save-function nil
+ "Function identifying buffers that are to be excluded from saving.
+Like `desktop-buffers-not-to-save' it can be used to check whether
+a given buffer should not be saved. It takes the same arguments as
+`desktop-save-buffer-p' and should return nil if buffer should not
+have its state saved in the desktop file.")
(defun desktop-save-buffer-p (filename bufname mode &rest rest)
"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 ea9cafe..78ffca9 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:
("\\wp" ?℘)
("\\wr" ?≀)
- ("\\Bbb{N}" ?ℕ) ; AMS commands for blackboard bold
- ("\\Bbb{P}" ?ℙ) ; Also sometimes \mathbb.
+ ("\\Bbb{A}" ?𝔸) ; AMS commands for blackboard bold
+ ("\\Bbb{B}" ?𝔹) ; Also sometimes \mathbb.
+ ("\\Bbb{C}" ?ℂ)
+ ("\\Bbb{D}" ?𝔻)
+ ("\\Bbb{E}" ?𝔼)
+ ("\\Bbb{F}" ?𝔽)
+ ("\\Bbb{G}" ?𝔾)
+ ("\\Bbb{H}" ?ℍ)
+ ("\\Bbb{I}" ?𝕀)
+ ("\\Bbb{J}" ?𝕁)
+ ("\\Bbb{K}" ?𝕂)
+ ("\\Bbb{L}" ?𝕃)
+ ("\\Bbb{M}" ?𝕄)
+ ("\\Bbb{N}" ?ℕ)
+ ("\\Bbb{O}" ?𝕆)
+ ("\\Bbb{P}" ?ℙ)
+ ("\\Bbb{Q}" ?ℚ)
("\\Bbb{R}" ?ℝ)
+ ("\\Bbb{S}" ?𝕊)
+ ("\\Bbb{T}" ?𝕋)
+ ("\\Bbb{U}" ?𝕌)
+ ("\\Bbb{V}" ?𝕍)
+ ("\\Bbb{W}" ?𝕎)
+ ("\\Bbb{X}" ?𝕏)
+ ("\\Bbb{Y}" ?𝕐)
("\\Bbb{Z}" ?ℤ)
+ ("\\Bbb{1}" ?𝟙)
+ ("\\Bbb{2}" ?𝟚)
("--" ?–)
("---" ?—)
;; 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 e4233da..e785acd 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
by the reception of this reply."
(let ((handler-function (gdb-get-handler-function token-number)))
(when handler-function
- (funcall handler-function)
+ ;; Protect against errors in handler-function.
+ (condition-case err
+ (funcall handler-function)
+ (error (message (error-message-string err))))
(gdb-delete-handler token-number))))
(defun gdb-remove-all-pending-triggers ()
@@ -1001,8 +1004,10 @@ no input, and GDB is waiting for input."
;; Sending an EOF does not work with GDB-MI; submit an
;; explicit quit command.
(progn
- (insert "quit")
- (comint-send-input t t))
+ (if (> gdb-control-level 0)
+ (process-send-eof proc)
+ (insert "quit")
+ (comint-send-input t t)))
(delete-char arg))))
(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 eccab26..ebb0c56 100644
--- a/lisp/tab-bar.el
+++ b/lisp/tab-bar.el
@@ -1123,7 +1123,7 @@ function `tab-bar-tab-name-function'."
(define-minor-mode tab-bar-history-mode
"Toggle tab history mode for the tab bar."
- :global t
+ :global t :group 'tab-bar
(if tab-bar-history-mode
(progn
(when (and tab-bar-mode (not (get-text-property 0 'display
tab-bar-back-button)))
@@ -1400,7 +1400,7 @@ in the selected frame."
((framep all-frames) (list all-frames))
(t (list (selected-frame)))))
-(defun tab-bar-get-buffer-tab (buffer-or-name &optional all-frames)
+(defun tab-bar-get-buffer-tab (buffer-or-name &optional all-frames
ignore-current-tab)
"Return a tab owning a window whose buffer is BUFFER-OR-NAME.
BUFFER-OR-NAME may be a buffer or a buffer name and defaults to
the current buffer.
@@ -1414,7 +1414,10 @@ The optional argument ALL-FRAMES specifies the frames to
consider:
- A frame means consider all tabs on that frame only.
Any other value of ALL-FRAMES means consider all tabs on the
-selected frame and no others."
+selected frame and no others.
+
+When the optional argument IGNORE-CURRENT-TAB is non-nil,
+don't take into account the buffers in the currently selected tab."
(let ((buffer (if buffer-or-name
(get-buffer buffer-or-name)
(current-buffer))))
@@ -1424,7 +1427,8 @@ selected frame and no others."
(seq-some
(lambda (tab)
(when (if (eq (car tab) 'current-tab)
- (get-buffer-window buffer frame)
+ (unless ignore-current-tab
+ (get-buffer-window buffer frame))
(let* ((state (alist-get 'ws tab))
(buffers (when state
(window-state-buffers state))))
diff --git a/src/minibuf.c b/src/minibuf.c
index 8ebdff1..9d870ce 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -697,10 +697,6 @@ read_minibuf (Lisp_Object map, Lisp_Object initial,
Lisp_Object prompt,
else
histstring = Qnil;
- /* If Lisp form desired instead of string, parse it. */
- if (expflag)
- val = string_to_object (val, defalt);
-
/* The appropriate frame will get selected
in set-window-configuration. */
unbind_to (count, Qnil);
@@ -711,6 +707,10 @@ read_minibuf (Lisp_Object map, Lisp_Object initial,
Lisp_Object prompt,
if (! (NILP (Vhistory_add_new_input) || NILP (histstring)))
call2 (intern ("add-to-history"), histvar, histstring);
+ /* If Lisp form desired instead of string, parse it. */
+ if (expflag)
+ val = string_to_object (val, defalt);
+
return val;
}