diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-09-06 11:37:01 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-09-06 11:37:01 -0400 |
| commit | 86cf73299170efd02eb9ede42547eca65df83c86 (patch) | |
| tree | 87ee6c388fd4772b2301665d99af9a57282f70b5 /lisp/epg.el | |
| parent | 816244a2ab34d651371bf8045eac14320587beda (diff) | |
| download | emacs-86cf73299170efd02eb9ede42547eca65df83c86.tar.gz | |
* lisp/abbrev.el (edit-abbrevs-mode): Use define-derived-mode.
(edit-abbrevs-mode-map): Rename from edit-abbrevs-map.
* lisp/epa.el (epa--encode-coding-string, epa--decode-coding-string)
(epa--select-safe-coding-system, epa--derived-mode-p): Make it obvious
that it's defined.
(epa-key-list-mode, epa-key-mode, epa-info-mode):
Use define-derived-mode.
* lisp/epg.el (epg-start-encrypt): Minor CSE simplification.
Diffstat (limited to 'lisp/epg.el')
| -rw-r--r-- | lisp/epg.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/epg.el b/lisp/epg.el index bcd91d8abba..c733a273988 100644 --- a/lisp/epg.el +++ b/lisp/epg.el @@ -2415,9 +2415,8 @@ If you are unsure, use synchronous version of this function (list "--" (epg-data-file plain))))) ;; `gpgsm' does not read passphrase from stdin, so waiting is not needed. (unless (eq (epg-context-protocol context) 'CMS) - (if sign - (epg-wait-for-status context '("BEGIN_SIGNING")) - (epg-wait-for-status context '("BEGIN_ENCRYPTION")))) + (epg-wait-for-status context + (if sign '("BEGIN_SIGNING") '("BEGIN_ENCRYPTION")))) (when (epg-data-string plain) (if (eq (process-status (epg-context-process context)) 'run) (process-send-string (epg-context-process context) |