From: Glenn Morris <rgm@gnu.org>
Date: Thu, 18 Mar 2021 15:50:32 +0000 (-0700)
Subject: Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~3228
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d92b725ffc95b72b595818216b92184446245e7e;p=emacs.git

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
---

d92b725ffc95b72b595818216b92184446245e7e
diff --cc lisp/mail/rmail.el
index 2bd3ffa2910,86154f2a61f..c7960f85043
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@@ -548,10 -582,7 +548,10 @@@ Examples
  ;; This pattern should catch all the common variants.
  ;; rms: I deleted the change to delete tags in square brackets
  ;; because they mess up RT tags.
 -(defvar rmail-reply-regexp "\\`\\(Re\\(([0-9]+)\\|\\[[0-9]+\\]\\|\\^[0-9]+\\)?\u00a0*: *\\)*"
 +(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 -3398,8 +3356,7 @@@ whitespace, replacing whitespace runs w
  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,3\\}\u00a0*:\\|\\[[^]]+]\\)[ \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)))