[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 8a64559 3/9: Merge from origin/emacs-25
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master 8a64559 3/9: Merge from origin/emacs-25 |
Date: |
Mon, 10 Oct 2016 14:46:44 +0000 (UTC) |
branch: master
commit 8a645599891bcec6d7a91ae538481df467ba3391
Merge: 2923b3d 74b4f13
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Merge from origin/emacs-25
74b4f13 Document nil args of compare-buffer-substrings
9fc81bc * doc/misc/message.texi (Bcc Warning): Fix markup.
95baa25 * doc/misc/message.texi (Bcc Warning): Document mml-secure-sa...
---
doc/misc/message.texi | 8 +++++++-
src/editfns.c | 4 ++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index 048990d..6ec7615 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -1326,7 +1326,13 @@ OpenPGP) or @code{mml-secure-smime-encrypt-to-self} (for
The @code{Bcc} header is meant to hide recipients of messages.
However, when encrypted messages are used, the e-mail addresses of all
@code{Bcc}-headers are given away to all recipients without
-warning, which is a bug, see
+warning, which is a bug.
address@hidden mml-secure-safe-bcc-list
+But now Message got to warn if @code{Bcc} recipients are found in an
+encrypted message when you are just about to send it. If you are sure
+those @code{Bcc} addresses are safe to expose, set the
address@hidden variable, that is a list of e-mail
+addresses. See
@uref{https://debbugs.gnu.org/cgi/bugreport.cgi?bug=18718}.
diff --git a/src/editfns.c b/src/editfns.c
index 0bcc439..dcb1d8d 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -2936,6 +2936,10 @@ Return -N if first string is less after N-1 chars, +N if
first string is
greater after N-1 chars, or 0 if strings match.
The first substring is in BUFFER1 from START1 to END1 and the second
is in BUFFER2 from START2 to END2.
+All arguments may be nil. If BUFFER1 or BUFFER2 is nil, the current
+buffer is used. If START1 or START2 is nil, the value of `point-min'
+in the respective buffers is used. If END1 or END2 is nil, the value
+of `point-max' in the respective buffers is used.
The value of `case-fold-search' in the current buffer
determines whether case is significant or ignored. */)
(Lisp_Object buffer1, Lisp_Object start1, Lisp_Object end1, Lisp_Object
buffer2, Lisp_Object start2, Lisp_Object end2)
- [Emacs-diffs] master updated (5b77459 -> 46b83c0), Paul Eggert, 2016/10/10
- [Emacs-diffs] master 4e42e84 1/9: Merge from origin/emacs-25, Paul Eggert, 2016/10/10
- [Emacs-diffs] master be589ea 8/9: ; Merge from origin/emacs-25, Paul Eggert, 2016/10/10
- [Emacs-diffs] master cf9bdf1 7/9: Merge from origin/emacs-25, Paul Eggert, 2016/10/10
- [Emacs-diffs] master 314f397 4/9: ; Merge from origin/emacs-25, Paul Eggert, 2016/10/10
- [Emacs-diffs] master 53d1b9d 6/9: ; Merge from origin/emacs-25, Paul Eggert, 2016/10/10
- [Emacs-diffs] master 8a64559 3/9: Merge from origin/emacs-25,
Paul Eggert <=
- [Emacs-diffs] master 2923b3d 2/9: ; Merge from origin/emacs-25, Paul Eggert, 2016/10/10
- [Emacs-diffs] master 97046e8 5/9: Merge from origin/emacs-25, Paul Eggert, 2016/10/10
- [Emacs-diffs] master 46b83c0 9/9: Merge from origin/emacs-25, Paul Eggert, 2016/10/10