aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2012-04-04 15:54:02 +0800
committerChong Yidong2012-04-04 15:54:02 +0800
commit3d439cd10fff3e71c7115263a03a5a92898ca7ea (patch)
treee79c2b0c1e66474429fec04614701d38c5bf52e7 /src
parent97f4a299ee49ed580beb079752bd4d0c9dee0ce7 (diff)
downloademacs-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 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/keyboard.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ea80129ff16..ea770969818 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-04-04 Chong Yidong <cyd@gnu.org>
2
3 * keyboard.c (Vdelayed_warnings_list): Doc fix.
4
12012-04-01 Eli Zaretskii <eliz@gnu.org> 52012-04-01 Eli Zaretskii <eliz@gnu.org>
2 6
3 * w32menu.c (simple_dialog_show, add_menu_item): Use SAFE_ALLOCA 7 * w32menu.c (simple_dialog_show, add_menu_item): Use SAFE_ALLOCA
diff --git a/src/keyboard.c b/src/keyboard.c
index 79223116b2f..50b2ade8ee4 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -12168,7 +12168,7 @@ whenever `deferred-action-list' is non-nil. */);
12168 Vdeferred_action_function = Qnil; 12168 Vdeferred_action_function = Qnil;
12169 12169
12170 DEFVAR_LISP ("delayed-warnings-list", Vdelayed_warnings_list, 12170 DEFVAR_LISP ("delayed-warnings-list", Vdelayed_warnings_list,
12171 doc: /* List of warnings to be displayed as soon as possible. 12171 doc: /* List of warnings to be displayed after this command.
12172Each element must be a list (TYPE MESSAGE [LEVEL [BUFFER-NAME]]), 12172Each element must be a list (TYPE MESSAGE [LEVEL [BUFFER-NAME]]),
12173as per the args of `display-warning' (which see). 12173as per the args of `display-warning' (which see).
12174If this variable is non-nil, `delayed-warnings-hook' will be run 12174If this variable is non-nil, `delayed-warnings-hook' will be run