procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prefer customized value for GnuPG executable

Browse source 
* lisp/epg-config.el (epg-configuration-find): Don't check GPG
configuration if it is already set with custom.  (Bug#22747)
This commit is contained in:
Daiki Ueno 2016-02-21 07:11:04 +09:00
parent ea0b604412
commit 74ec92da9e
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lisp/epg-config.el
View file

@ -114,16 +114,15 @@ entry until the version requirement is met."
(cl-destructuring-bind (symbol constructor . alist) (cl-destructuring-bind (symbol constructor . alist)
(cdr entry) (cdr entry)
(or (and (not force) (alist-get protocol epg--configurations)) (or (and (not force) (alist-get protocol epg--configurations))
(let ((executable (get symbol 'saved-value))) ;; If the executable value is already set with M-x
(if executable ;; customize, use it without checking.
(ignore-errors (if (get symbol 'saved-value)
(let ((configuration (funcall constructor executable))) (let ((configuration (funcall constructor (symbol-value symbol))))
(epg-check-configuration configuration) (push (cons protocol configuration) epg--configurations)
(push (cons protocol configuration) epg--configurations) configuration)
configuration)) (catch 'found
(catch 'found (dolist (program-version alist)
(dolist (program-version alist) (let ((executable (executable-find (car program-version))))
(setq executable (executable-find (car program-version)))
(when executable (when executable
(let ((configuration (let ((configuration
(funcall constructor executable))) (funcall constructor executable)))