diff options
| author | Glenn Morris <rgm@gnu.org> | 2021-03-18 08:50:32 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2021-03-18 08:50:32 -0700 |
| commit | d92b725ffc95b72b595818216b92184446245e7e (patch) | |
| tree | ddf887ea97197c0c2a792ddd13c1fb9b23e9512c /lisp/mail | |
| parent | 843eb21573baaa7d050c65dfbc1a39546f6432d6 (diff) | |
| parent | f60eb988f6dfcd590d17dd6fd3f93ee71e830391 (diff) | |
Merge from origin/emacs-27
f60eb988f6 Fix typos and omissions for (elisp)Button Buffer Commands
876b95bf90 Teach Rmail about NBSP in "Re:"
# Conflicts:
# lisp/mail/rmail.el
Diffstat (limited to 'lisp/mail')
| -rw-r--r-- | lisp/mail/rmail.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 2bd3ffa2910..c7960f85043 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -551,7 +551,7 @@ Examples: (defvar rmail-reply-regexp (concat "\\`\\(" rmail-re-abbrevs - "\\(([0-9]+)\\|\\[[0-9]+\\]\\|\\^[0-9]+\\)?[:：] *\\)*") + "\\(([0-9]+)\\|\\[[0-9]+\\]\\|\\^[0-9]+\\)?\u00a0*[:：] *\\)*") "Regexp to delete from Subject line before inserting `rmail-reply-prefix'.") (defcustom rmail-display-summary nil @@ -3356,7 +3356,7 @@ whitespace, replacing whitespace runs with a single space and removing prefixes such as Re:, Fwd: and so on and mailing list tags such as [tag]." (let ((subject (or (rmail-get-header "Subject" msgnum) "")) - (regexp "\\`[ \t\n]*\\(\\(\\w\\{1,4\\}[:：]\\|\\[[^]]+]\\)[ \t\n]+\\)*")) + (regexp "\\`[ \t\n]*\\(\\(\\w\\{1,4\\}\u00a0*[:：]\\|\\[[^]]+]\\)[ \t\n]+\\)*")) (setq subject (rfc2047-decode-string subject)) (setq subject (replace-regexp-in-string regexp "" subject)) (replace-regexp-in-string "[ \t\n]+" " " subject))) |