[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 18c18c6 1/2: Don't inhibit redisplay in the mml* functions
From: |
Lars Ingebrigtsen |
Subject: |
master 18c18c6 1/2: Don't inhibit redisplay in the mml* functions |
Date: |
Tue, 21 Sep 2021 11:42:13 -0400 (EDT) |
branch: master
commit 18c18c69fc9621955da89e0b4e7a9d6dcb2f0207
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
Don't inhibit redisplay in the mml* functions
* lisp/gnus/mml-smime.el (inhibit-redisplay): Removed.
(mml-smime-epg-encrypt):
(mml-smime-epg-verify): Don't inhibit.
* lisp/gnus/mml1991.el (mml1991-epg-sign): Ditto.
* lisp/gnus/mml2015.el (inhibit-redisplay): Removed
(mml2015-epg-decrypt):
(mml2015-epg-clear-decrypt):
(mml2015-epg-verify):
(mml2015-epg-clear-verify):
(mml2015-epg-sign):
(mml2015-epg-encrypt): Don't bind `inhibit-redisplay', because it
makes debugging very odd, and doesn't seem to help much with anything.
---
lisp/gnus/mml-smime.el | 8 ++------
lisp/gnus/mml1991.el | 3 +--
lisp/gnus/mml2015.el | 19 ++++++-------------
3 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el
index 959de09..b81dd2d 100644
--- a/lisp/gnus/mml-smime.el
+++ b/lisp/gnus/mml-smime.el
@@ -314,7 +314,6 @@ Whether the passphrase is cached at all is controlled by
(defvar epg-user-id-alist)
(defvar epg-digest-algorithm-alist)
-(defvar inhibit-redisplay)
(defvar password-cache-expiry)
(eval-when-compile
@@ -369,9 +368,7 @@ Content-Disposition: attachment; filename=smime.p7s
(goto-char (point-max)))))
(defun mml-smime-epg-encrypt (cont)
- (let* ((inhibit-redisplay t) ;FIXME: Why?
- ;; (boundary (mml-compute-boundary cont))
- (cipher (mml-secure-epg-encrypt 'CMS cont)))
+ (let* ((cipher (mml-secure-epg-encrypt 'CMS cont)))
(delete-region (point-min) (point-max))
(goto-char (point-min))
(insert "\
@@ -387,8 +384,7 @@ Content-Disposition: attachment; filename=smime.p7m
(defun mml-smime-epg-verify (handle ctl)
(catch 'error
- (let ((inhibit-redisplay t)
- context part signature) ;; plain signature-file
+ (let (context part signature) ;; plain signature-file
(when (or (null (setq part (mm-find-raw-part-by-type
ctl (or (mm-handle-multipart-ctl-parameter
ctl 'protocol)
diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el
index 05f44a1..55ef9cf 100644
--- a/lisp/gnus/mml1991.el
+++ b/lisp/gnus/mml1991.el
@@ -259,8 +259,7 @@ Whether the passphrase is cached at all is controlled by
(autoload 'epg-expand-group "epg-config")
(defun mml1991-epg-sign (_cont)
- (let ((inhibit-redisplay t)
- headers cte)
+ (let (headers cte)
;; Don't sign headers.
(goto-char (point-min))
(when (re-search-forward "^$" nil t)
diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index 8c40fc7..2397381 100644
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -700,7 +700,6 @@ If set, it overrides the setting of
`mml2015-sign-with-sender'."
(defvar epg-user-id-alist)
(defvar epg-digest-algorithm-alist)
(defvar epg-gpg-program)
-(defvar inhibit-redisplay)
(autoload 'epg-make-context "epg")
(autoload 'epg-context-set-armor "epg")
@@ -773,8 +772,7 @@ If set, it overrides the setting of
`mml2015-sign-with-sender'."
(defun mml2015-epg-decrypt (handle _ctl)
(catch 'error
- (let ((inhibit-redisplay t)
- context plain child handles) ;; decrypt-status result
+ (let (context plain child handles) ;; decrypt-status result
(unless (setq child (mm-find-part-by-type
(cdr handle)
"application/octet-stream" nil t))
@@ -818,8 +816,7 @@ If set, it overrides the setting of
`mml2015-sign-with-sender'."
(list handles)))))
(defun mml2015-epg-clear-decrypt ()
- (let ((inhibit-redisplay t)
- (context (epg-make-context))
+ (let ((context (epg-make-context))
plain)
(if (or mml2015-cache-passphrase mml-secure-cache-passphrase)
(epg-context-set-passphrase-callback
@@ -851,8 +848,7 @@ If set, it overrides the setting of
`mml2015-sign-with-sender'."
(defun mml2015-epg-verify (handle ctl)
(catch 'error
- (let ((inhibit-redisplay t)
- context part signature) ;; plain signature-file
+ (let (context part signature) ;; plain signature-file
(when (or (null (setq part (mm-find-raw-part-by-type
ctl (or (mm-handle-multipart-ctl-parameter
ctl 'protocol)
@@ -881,8 +877,7 @@ If set, it overrides the setting of
`mml2015-sign-with-sender'."
handle)))
(defun mml2015-epg-clear-verify ()
- (let ((inhibit-redisplay t)
- (context (epg-make-context))
+ (let ((context (epg-make-context))
(signature (encode-coding-string (buffer-string)
coding-system-for-write))
plain)
@@ -904,8 +899,7 @@ If set, it overrides the setting of
`mml2015-sign-with-sender'."
(mml2015-extract-cleartext-signature))))
(defun mml2015-epg-sign (cont)
- (let ((inhibit-redisplay t)
- (boundary (mml-compute-boundary cont)))
+ (let ((boundary (mml-compute-boundary cont)))
;; Signed data must end with a newline (RFC 3156, 5).
(goto-char (point-max))
(unless (bolp)
@@ -934,8 +928,7 @@ If set, it overrides the setting of
`mml2015-sign-with-sender'."
(goto-char (point-max)))))
(defun mml2015-epg-encrypt (cont &optional sign)
- (let* ((inhibit-redisplay t)
- (boundary (mml-compute-boundary cont))
+ (let* ((boundary (mml-compute-boundary cont))
(cipher (mml-secure-epg-encrypt 'OpenPGP cont sign)))
(delete-region (point-min) (point-max))
(goto-char (point-min))