[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 3984ea8553: Merge from origin/emacs-28
From: |
Stefan Kangas |
Subject: |
master 3984ea8553: Merge from origin/emacs-28 |
Date: |
Sun, 9 Jan 2022 00:47:48 -0500 (EST) |
branch: master
commit 3984ea855361f8c82cdeffbc616dbb459c257dae
Merge: af7ca138c4 30f1bdb41f
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
Merge from origin/emacs-28
30f1bdb41f Clarify docstring of package-native-compile
c54fda643d Fix Subject "simplification" in Rmail
---
lisp/emacs-lisp/package.el | 8 +++++++-
lisp/mail/rmail.el | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 42979d1675..5a3ec4f4af 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -397,7 +397,13 @@ a sane initial value."
:type '(repeat symbol))
(defcustom package-native-compile nil
- "Non-nil means to native compile packages on installation."
+ "Non-nil means to native compile packages after installing them.
+This controls ahead-of-time compilation. If this option is nil,
+packages are normally compiled after they have been loaded for
+the first time.
+
+This option does not have any effect if Emacs was not built with
+native compilation support."
:type '(boolean)
:risky t
:version "28.1")
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 3795377cd2..6b058d09f9 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -3354,12 +3354,12 @@ 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\\}\u00a0*[::]\\|\\[[^]]+]\\)[
\t\n]+\\)*"))
+ (setq subject (rfc2047-decode-string subject))
;; Corporate mailing systems sometimes add `[External] :'; if that
happened,
;; delete everything up thru there. Empirically, that deletion makes
;; the Subject match the other messages in the thread.
(if (string-match "\\[external][ \t\n]*:" subject)
(setq subject (substring subject (match-end 0))))
- (setq subject (rfc2047-decode-string subject))
(setq subject (replace-regexp-in-string regexp "" subject))
(replace-regexp-in-string "[ \t\n]+" " " subject)))