emacs-elpa-diffs
[Top][All Lists]
Advanced

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

[elpa] externals/pinentry 77991a491f: Handle 'quit' at the pinentry prom


From: ELPA Syncer
Subject: [elpa] externals/pinentry 77991a491f: Handle 'quit' at the pinentry prompt
Date: Fri, 22 Nov 2024 21:58:32 -0500 (EST)

branch: externals/pinentry
commit 77991a491f3fc4673dfdd959ba6b4c9b0111150f
Author: Steven Allen <steven@stebalien.com>
Commit: Daiki Ueno <ueno@gnu.org>

    Handle 'quit' at the pinentry prompt
    
    Otherwise, we'll leave the client hanging (and quit from inside a
    process filter which isn't great). I've also changed the output of "user
    errors" in general to more closely match the rest of Emacs.
---
 pinentry.el | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pinentry.el b/pinentry.el
index 5da8e9fca4..f9fd53b9c1 100644
--- a/pinentry.el
+++ b/pinentry.el
@@ -352,12 +352,18 @@ Assuan protocol."
                                 (pinentry--send-data
                                  process encoded-passphrase)
                                 (process-send-string process "OK\n")))
+                         ((quit user-error)
+                          (message (error-message-string err))
+                          (ignore-errors
+                            (pinentry--send-error
+                             process
+                             pinentry--error-cancelled)))
                          (error
                           (message "GETPIN error %S" err)
-                           (ignore-errors
-                             (pinentry--send-error
-                              process
-                              pinentry--error-cancelled))))
+                          (ignore-errors
+                            (pinentry--send-error
+                             process
+                             pinentry--error-cancelled))))
                        (if passphrase
                            (clear-string passphrase))
                        (if escaped-passphrase



reply via email to

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