diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2024-01-27 08:13:22 -0500 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2024-01-27 08:13:22 -0500 |
| commit | 58e2569bd300ba16363b5a86b95864b9673a47e7 (patch) | |
| tree | f9b69ce8184c7e32a0922f774abeb398d8b8197f | |
| parent | 3b091c4af87aba1d14410251dcae65890e1a3311 (diff) | |
| parent | 20125ad97b4592d7f9ae815aff2ca68cda7a4c31 (diff) | |
| download | emacs-58e2569bd300ba16363b5a86b95864b9673a47e7.tar.gz | |
Merge from origin/emacs-29
20125ad97b4 ; admin/authors.el (authors-aliases): Update for Emacs 29.2.
92a7132bd6c ; * etc/NEWS: Clean up for Emacs 29.2.
314ac2e4317 ; * lisp/mail/rmail.el (rmail-show-message-verbose-min): ...
2cb1b76696b diff-mode: Support committing diff with file deletions
b96aa528f64 * lisp/net/eww.el (eww-retrieve): Fix args of eww-render ...
| -rw-r--r-- | admin/authors.el | 2 | ||||
| -rw-r--r-- | etc/NEWS | 6 | ||||
| -rw-r--r-- | lisp/mail/rmail.el | 4 | ||||
| -rw-r--r-- | lisp/net/eww.el | 2 | ||||
| -rw-r--r-- | lisp/vc/diff-mode.el | 2 |
5 files changed, 7 insertions, 9 deletions
diff --git a/admin/authors.el b/admin/authors.el index 9fa8036ff23..6c74f4dd7a1 100644 --- a/admin/authors.el +++ b/admin/authors.el @@ -218,6 +218,8 @@ files.") ("Simen Heggestøyl" "simenheg@gmail.com") (nil "prime.wizard") ("Shun-ichi Goto" "Shun-ichi GOTO") + ;; The trailing dash is a kludge, so this contributor is not ignored. + ("skykanin-" "skykanin@users\\.noreply\\.github\\.com") ;; There are other Stefans. ;;; ("Stefan Monnier" "Stefan") ("Steven L. Baur" "SL Baur" "Steven L Baur") @@ -15,12 +15,6 @@ in older Emacs versions. You can narrow news to a specific version by calling 'view-emacs-news' with a prefix argument or by typing 'C-u C-h C-n'. -Temporary note: -+++ indicates that all relevant manuals in doc/ have been updated. ---- means no change in the manuals is needed. -When you add a new item, use the appropriate mark if you are sure it -applies, and please also update docstrings as needed. - * Installation Changes in Emacs 30.1 diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index fb504055f1d..85eaec33660 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -2712,7 +2712,9 @@ N defaults to the current message." (and (string-match text-regexp content-type-header) t))))) (defcustom rmail-show-message-verbose-min 200000 - "Message size at which to show progress messages for displaying it." + "Message size at which to show progress messages for displaying it. +Messages longer than this (in characters) will produce echo-area +messages when Rmail processes such a message for display." :type 'integer :group 'rmail :version "23.1") diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 6c46ef0fedb..6ae1e6d3d0a 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -437,7 +437,7 @@ For more information, see Info node `(eww) Top'." ((eq eww-retrieve-command 'sync) (let ((data-buffer (url-retrieve-synchronously url))) (with-current-buffer data-buffer - (apply #'eww-render nil url cbargs)))) + (apply #'eww-render nil cbargs)))) (t (let ((buffer (generate-new-buffer " *eww retrieve*")) (error-buffer (generate-new-buffer " *eww error*"))) diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 03efe0fdb31..83d580d98dd 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -3014,7 +3014,7 @@ hunk text is not found in the source file." (goto-char (point-min)) (while (progn (diff-file-next) (not (eobp))) (push (diff-find-file-name nil t) files))) - (list backend (nreverse files) nil nil 'patch))) + (list backend (delete nil (nreverse files)) nil nil 'patch))) (defun diff--filter-substring (str) (when diff-font-lock-prettify |