emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 19d0cf5 1/6: Use rfc822-goto-eoh rather that mail-header-separato


From: Richard M. Stallman
Subject: master 19d0cf5 1/6: Use rfc822-goto-eoh rather that mail-header-separator.
Date: Tue, 11 May 2021 23:09:48 -0400 (EDT)

branch: master
commit 19d0cf5484ca8e4726b842b11de8cfc7843503e2
Author: Richard Stallman <rms@gnu.org>
Commit: Richard Stallman <rms@gnu.org>

    Use rfc822-goto-eoh rather that mail-header-separator.
    
    * lisp/epa-mail.el (epa-mail-sign)
    (epa-mail-default-recipients, epa-mail-encrypt):
    Use rfc822-goto-eoh, not mail-header-separator.
    (epa-mail-default-recipients): Assume epa-mail-aliases
    elements are lower case, search case-independently.
---
 lisp/epa-mail.el | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lisp/epa-mail.el b/lisp/epa-mail.el
index 7eac1f8..bed0c06 100644
--- a/lisp/epa-mail.el
+++ b/lisp/epa-mail.el
@@ -108,8 +108,9 @@ use from your key ring."
   (interactive
    (save-excursion
      (goto-char (point-min))
-     (if (search-forward mail-header-separator nil t)
-        (forward-line))
+     (rfc822-goto-eoh)
+     (unless (eobp)
+       (forward-line))
      (setq epa-last-coding-system-specified
           (or coding-system-for-write
               (select-safe-coding-system (point) (point-max))))
@@ -135,9 +136,7 @@ If no one is selected, default secret key is used.  "
       (goto-char (point-min))
       (save-restriction
        (narrow-to-region (point)
-                         (if (search-forward mail-header-separator nil 0)
-                             (match-beginning 0)
-                           (point)))
+                          (progn (rfc822-goto-eoh) (point)))
        (setq recipients-string
              (mapconcat #'identity
                         (nconc (mail-fetch-field "to" nil nil t)
@@ -170,7 +169,7 @@ If no one is selected, default secret key is used.  "
            (apply #'nconc
                   (mapcar
                    (lambda (recipient)
-                     (let ((tem (assoc recipient epa-mail-aliases)))
+                     (let ((tem (assoc (downcase recipient) epa-mail-aliases)))
                        (if tem (copy-sequence (cdr tem))
                          (list recipient))))
                    real-recipients)))
@@ -236,8 +235,9 @@ If no one is selected, symmetric encryption will be 
performed.  "
                       default-recipients)))))
 
       (goto-char (point-min))
-      (if (search-forward mail-header-separator nil t)
-         (forward-line))
+      (rfc822-goto-eoh)
+      (unless (eobp)
+       (forward-line))
       (setq start (point))
 
       (setq epa-last-coding-system-specified



reply via email to

[Prev in Thread] Current Thread [Next in Thread]