diff options
| author | Paul Eggert | 2012-04-09 15:54:59 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-04-09 15:54:59 -0700 |
| commit | 45e9f7da84c1bd3fc0d36d05c5708ed3b2d3a193 (patch) | |
| tree | 5bc87a8b5a3c754b8eb44a612cc6c03561d6b968 /src/fns.c | |
| parent | 9d6b4d53469a9ffd67bd770fabc6fe254e35c21d (diff) | |
| parent | 05920a43fc18e696b464387e781e7cfdcea5b5af (diff) | |
| download | emacs-45e9f7da84c1bd3fc0d36d05c5708ed3b2d3a193.tar.gz emacs-45e9f7da84c1bd3fc0d36d05c5708ed3b2d3a193.zip | |
Merge from trunk.
Diffstat (limited to 'src/fns.c')
| -rw-r--r-- | src/fns.c | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -4937,7 +4937,7 @@ Used by `featurep' and `require', and altered by `provide'. */); | |||
| 4937 | #endif /* HAVE_LANGINFO_CODESET */ | 4937 | #endif /* HAVE_LANGINFO_CODESET */ |
| 4938 | 4938 | ||
| 4939 | DEFVAR_BOOL ("use-dialog-box", use_dialog_box, | 4939 | DEFVAR_BOOL ("use-dialog-box", use_dialog_box, |
| 4940 | doc: /* *Non-nil means mouse commands use dialog boxes to ask questions. | 4940 | doc: /* Non-nil means mouse commands use dialog boxes to ask questions. |
| 4941 | This applies to `y-or-n-p' and `yes-or-no-p' questions asked by commands | 4941 | This applies to `y-or-n-p' and `yes-or-no-p' questions asked by commands |
| 4942 | invoked by mouse clicks and mouse menu items. | 4942 | invoked by mouse clicks and mouse menu items. |
| 4943 | 4943 | ||
| @@ -4946,7 +4946,7 @@ non-nil. */); | |||
| 4946 | use_dialog_box = 1; | 4946 | use_dialog_box = 1; |
| 4947 | 4947 | ||
| 4948 | DEFVAR_BOOL ("use-file-dialog", use_file_dialog, | 4948 | DEFVAR_BOOL ("use-file-dialog", use_file_dialog, |
| 4949 | doc: /* *Non-nil means mouse commands use a file dialog to ask for files. | 4949 | doc: /* Non-nil means mouse commands use a file dialog to ask for files. |
| 4950 | This applies to commands from menus and tool bar buttons even when | 4950 | This applies to commands from menus and tool bar buttons even when |
| 4951 | they are initiated from the keyboard. If `use-dialog-box' is nil, | 4951 | they are initiated from the keyboard. If `use-dialog-box' is nil, |
| 4952 | that disables the use of a file dialog, regardless of the value of | 4952 | that disables the use of a file dialog, regardless of the value of |