aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/net
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/pinentry.el10
1 files changed, 7 insertions, 3 deletions
diff --git a/lisp/net/pinentry.el b/lisp/net/pinentry.el
index eaa9fa40b12..0037006f40a 100644
--- a/lisp/net/pinentry.el
+++ b/lisp/net/pinentry.el
@@ -151,16 +151,20 @@ If local sockets are not supported, this is nil.")
151 (apply query-function (concat desc "\n" prompt) query-args)))) 151 (apply query-function (concat desc "\n" prompt) query-args))))
152 152
153;;;###autoload 153;;;###autoload
154(defun pinentry-start () 154(defun pinentry-start (&optional quiet)
155 "Start a Pinentry service. 155 "Start a Pinentry service.
156 156
157Once the environment is properly set, subsequent invocations of 157Once the environment is properly set, subsequent invocations of
158the gpg command will interact with Emacs for passphrase input." 158the gpg command will interact with Emacs for passphrase input.
159
160If the optional QUIET argument is non-nil, messages at startup
161will not be shown."
159 (interactive) 162 (interactive)
160 (unless (featurep 'make-network-process '(:family local)) 163 (unless (featurep 'make-network-process '(:family local))
161 (error "local sockets are not supported")) 164 (error "local sockets are not supported"))
162 (if (process-live-p pinentry--server-process) 165 (if (process-live-p pinentry--server-process)
163 (message "Pinentry service is already running") 166 (unless quiet
167 (message "Pinentry service is already running"))
164 (let* ((server-file (expand-file-name "pinentry" pinentry--socket-dir))) 168 (let* ((server-file (expand-file-name "pinentry" pinentry--socket-dir)))
165 (server-ensure-safe-dir pinentry--socket-dir) 169 (server-ensure-safe-dir pinentry--socket-dir)
166 ;; Delete the socket files made by previous server invocations. 170 ;; Delete the socket files made by previous server invocations.