diff options
| author | Chong Yidong | 2012-04-04 15:54:02 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-04-04 15:54:02 +0800 |
| commit | 3d439cd10fff3e71c7115263a03a5a92898ca7ea (patch) | |
| tree | e79c2b0c1e66474429fec04614701d38c5bf52e7 /lisp | |
| parent | 97f4a299ee49ed580beb079752bd4d0c9dee0ce7 (diff) | |
| download | emacs-3d439cd10fff3e71c7115263a03a5a92898ca7ea.tar.gz emacs-3d439cd10fff3e71c7115263a03a5a92898ca7ea.zip | |
Several miscellaneous doc changes.
* doc/lispref/display.texi (Delayed Warnings): New node.
* doc/misc/gnus-faq.texi (FAQ 8-2): Mention EasyPG.
* doc/misc/gnus.texi: Reduce references to obsolete pgg library.
(Security): Note that epg is now the default.
* doc/misc/message.texi (Using PGP/MIME): Note that epg is now the default.
* doc/misc/nxml-mode.texi (Completion): C-RET is no longer bound to
nxml-complete.
* lisp/subr.el (delayed-warnings-hook): Doc fix.
* src/keyboard.c (Vdelayed_warnings_list): Doc fix.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/subr.el | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4e59dd65b2d..32bdd8630ca 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-04-04 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * subr.el (delayed-warnings-hook): Doc fix. | ||
| 4 | |||
| 1 | 2012-04-04 Daiki Ueno <ueno@unixuser.org> | 5 | 2012-04-04 Daiki Ueno <ueno@unixuser.org> |
| 2 | 6 | ||
| 3 | * epa.el (epa--select-keys): Bind C-c C-c to finish the key | 7 | * epa.el (epa--select-keys): Bind C-c C-c to finish the key |
diff --git a/lisp/subr.el b/lisp/subr.el index 514827f9615..497809a23e8 100644 --- a/lisp/subr.el +++ b/lisp/subr.el | |||
| @@ -1893,9 +1893,10 @@ Used from `delayed-warnings-hook' (which see)." | |||
| 1893 | ;; Ref http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00085.html | 1893 | ;; Ref http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00085.html |
| 1894 | (defvar delayed-warnings-hook '(collapse-delayed-warnings | 1894 | (defvar delayed-warnings-hook '(collapse-delayed-warnings |
| 1895 | display-delayed-warnings) | 1895 | display-delayed-warnings) |
| 1896 | "Normal hook run to process delayed warnings. | 1896 | "Normal hook run to process and display delayed warnings. |
| 1897 | Functions in this hook should access the `delayed-warnings-list' | 1897 | By default, this hook contains functions to consolidate the |
| 1898 | variable (which see) and remove from it the warnings they process.") | 1898 | warnings listed in `delayed-warnings-list', display them, and set |
| 1899 | `delayed-warnings-list' back to nil.") | ||
| 1899 | 1900 | ||
| 1900 | 1901 | ||
| 1901 | ;;;; Process stuff. | 1902 | ;;;; Process stuff. |