branch: externals/pinentry
commit 0079964a1dde954ccb2ce8a28613d8020c549a36
Author: Sergey Trofimov <s...@sarg.org.ru>
Commit: Daiki Ueno <u...@gnu.org>
Display pinentry title when provided
---
pinentry.el | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/pinentry.el b/pinentry.el
index f9fd53b9c1..36dc09bdce 100644
--- a/pinentry.el
+++ b/pinentry.el
@@ -113,9 +113,11 @@ If local sockets are not supported, this is nil.")
buffer-read-only t))
(defun pinentry--prompt (labels query-function &rest query-args)
- (let ((desc (cdr (assq 'desc labels)))
- (error (cdr (assq 'error labels)))
- (prompt (cdr (assq 'prompt labels))))
+ (let* ((title-label (cdr (assq 'title labels)))
+ (desc-label (cdr (assq 'desc labels)))
+ (desc (if title-label (concat title-label "\n" desc-label)
desc-label))
+ (error (cdr (assq 'error labels)))
+ (prompt (cdr (assq 'prompt labels))))
(when (string-match "[ \n]*\\'" prompt)
(setq prompt (concat
(substring
@@ -150,7 +152,7 @@ If local sockets are not supported, this is nil.")
pinentry-prompt-window-height))))
(prog1 (apply query-function prompt query-args)
(quit-window)))
- (apply query-function (concat desc "\n" prompt) query-args))))
+ (apply query-function (if desc (concat desc "\n" prompt) prompt)
query-args))))
;;;###autoload
(defun pinentry-start (&optional quiet)
