diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-04-09 12:51:06 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-04-09 12:51:06 -0700 |
| commit | 9f46df23a3d01f82a24f2a3dd8730f0263fa9fde (patch) | |
| tree | e10467a42658a374d5cdb7bb25fc94016abdad7a /src/dosfns.c | |
| parent | b8df54ffbefc5ddf40ddcda68a2a682769c5833d (diff) | |
| parent | a130c2afed5e7d5ec10efa1a57f4de2461a9c778 (diff) | |
| download | emacs-9f46df23a3d01f82a24f2a3dd8730f0263fa9fde.tar.gz | |
Merge from trunk; add Bug#.
Diffstat (limited to 'src/dosfns.c')
| -rw-r--r-- | src/dosfns.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dosfns.c b/src/dosfns.c index 8ef672fb8bb..d4b96e9df90 100644 --- a/src/dosfns.c +++ b/src/dosfns.c @@ -710,7 +710,7 @@ Implicitly modified when the TZ variable is changed. */); #endif DEFVAR_LISP ("dos-display-scancodes", Vdos_display_scancodes, - doc: /* *Controls whether DOS raw keyboard events are displayed as you type. + doc: /* Whether DOS raw keyboard events are displayed as you type. When non-nil, the keyboard scan-codes are displayed at the bottom right corner of the display (typically at the end of the mode line). The output format is: scan code:char code*modifiers. */); @@ -718,17 +718,17 @@ The output format is: scan code:char code*modifiers. */); Vdos_display_scancodes = Qnil; DEFVAR_INT ("dos-hyper-key", dos_hyper_key, - doc: /* *If set to 1, use right ALT key as hyper key. + doc: /* If set to 1, use right ALT key as hyper key. If set to 2, use right CTRL key as hyper key. */); dos_hyper_key = 0; DEFVAR_INT ("dos-super-key", dos_super_key, - doc: /* *If set to 1, use right ALT key as super key. + doc: /* If set to 1, use right ALT key as super key. If set to 2, use right CTRL key as super key. */); dos_super_key = 0; DEFVAR_INT ("dos-keypad-mode", dos_keypad_mode, - doc: /* *Controls what key code is returned by a key in the numeric keypad. + doc: /* Controls what key code is returned by a key in the numeric keypad. The `numlock ON' action is only taken if no modifier keys are pressed. The value is an integer constructed by adding the following bits together: |