diff options
| author | Richard M. Stallman | 2013-07-19 09:30:58 -0400 |
|---|---|---|
| committer | Richard M. Stallman | 2013-07-19 09:30:58 -0400 |
| commit | aec7da77ec1033bc23996d6d2d73a0431a7821b3 (patch) | |
| tree | 30cd4fd52c43039a204b375db3524f0cee23b4d4 /lisp | |
| parent | a10b2d0377ed82a67571447cb491523cc4f26645 (diff) | |
| download | emacs-aec7da77ec1033bc23996d6d2d73a0431a7821b3.tar.gz emacs-aec7da77ec1033bc23996d6d2d73a0431a7821b3.zip | |
* epa.el (epa-popup-info-window): Doc fix.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/epa.el | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fd9416acdc9..b78d5587e46 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2013-07-19 Richard Stallman <rms@gnu.org> | 1 | 2013-07-19 Richard Stallman <rms@gnu.org> |
| 2 | 2 | ||
| 3 | * epa.el (epa-popup-info-window): Doc fix. | ||
| 4 | |||
| 3 | * subr.el (split-string): New arg TRIM. | 5 | * subr.el (split-string): New arg TRIM. |
| 4 | 6 | ||
| 5 | 2013-07-18 Juanma Barranquero <lekktu@gmail.com> | 7 | 2013-07-18 Juanma Barranquero <lekktu@gmail.com> |
diff --git a/lisp/epa.el b/lisp/epa.el index 14f8879c1c6..68e7a18fe17 100644 --- a/lisp/epa.el +++ b/lisp/epa.el | |||
| @@ -34,8 +34,7 @@ | |||
| 34 | :group 'epg) | 34 | :group 'epg) |
| 35 | 35 | ||
| 36 | (defcustom epa-popup-info-window t | 36 | (defcustom epa-popup-info-window t |
| 37 | "If non-nil, status information from epa commands is displayed on | 37 | "If non-nil, display status information from epa commands in another window." |
| 38 | the separate window." | ||
| 39 | :type 'boolean | 38 | :type 'boolean |
| 40 | :group 'epa) | 39 | :group 'epa) |
| 41 | 40 | ||