aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2009-09-12 01:30:51 +0000
committerChong Yidong2009-09-12 01:30:51 +0000
commit2fd0161b9d2873a61dc1313905a7ba4322e3f25c (patch)
treed8da7f6511ea2fa0979c78bda7ed4730d9a6f2b7 /src
parentbc5e75b6162ea23df8863289de9497617224e9e5 (diff)
downloademacs-2fd0161b9d2873a61dc1313905a7ba4322e3f25c.tar.gz
emacs-2fd0161b9d2873a61dc1313905a7ba4322e3f25c.zip
* fns.c (syms_of_fns): Doc fix (Bug#4227).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/fns.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ff2cce89cb6..ff940d6ea8b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12009-09-12 Chong Yidong <cyd@stupidchicken.com>
2
3 * fns.c (syms_of_fns): Doc fix (Bug#4227).
4
12009-09-12 Stefan Monnier <monnier@iro.umontreal.ca> 52009-09-12 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * keymap.c (Fwhere_is_internal): Use nconc2. 7 * keymap.c (Fwhere_is_internal): Use nconc2.
diff --git a/src/fns.c b/src/fns.c
index 562d493b59c..7c3e04e818f 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -5251,9 +5251,9 @@ non-nil. */);
5251 DEFVAR_BOOL ("use-file-dialog", &use_file_dialog, 5251 DEFVAR_BOOL ("use-file-dialog", &use_file_dialog,
5252 doc: /* *Non-nil means mouse commands use a file dialog to ask for files. 5252 doc: /* *Non-nil means mouse commands use a file dialog to ask for files.
5253This applies to commands from menus and tool bar buttons even when 5253This applies to commands from menus and tool bar buttons even when
5254they are initiated from the keyboard. The value of `use-dialog-box' 5254they are initiated from the keyboard. If `use-dialog-box' is nil,
5255takes precedence over this variable, so a file dialog is only used if 5255that disables the use of a file dialog, regardless of the value of
5256both `use-dialog-box' and this variable are non-nil. */); 5256this variable. */);
5257 use_file_dialog = 1; 5257 use_file_dialog = 1;
5258 5258
5259 defsubr (&Sidentity); 5259 defsubr (&Sidentity);