diff options
| author | Paul Eggert | 2014-11-28 22:55:31 -0800 |
|---|---|---|
| committer | Paul Eggert | 2014-11-28 23:07:16 -0800 |
| commit | 0cce3623b169732a51f055a86fc926313b11a5ee (patch) | |
| tree | 17154977d6e77f604ede0b82f89b2aeb6925310a /src/keyboard.c | |
| parent | 9875d23d86c0668b1e697b67a394560d66c7826d (diff) | |
| parent | 6b765b8facbdbb03f28028007885236601652515 (diff) | |
| download | emacs-0cce3623b169732a51f055a86fc926313b11a5ee.tar.gz emacs-0cce3623b169732a51f055a86fc926313b11a5ee.zip | |
Merge branch 'emacs-24'.
Diffstat (limited to 'src/keyboard.c')
| -rw-r--r-- | src/keyboard.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 908eb59ff9c..6dc0b820eb9 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -11868,7 +11868,7 @@ keys_of_keyboard (void) | |||
| 11868 | - we enter the second prompt. | 11868 | - we enter the second prompt. |
| 11869 | current-prefix-arg is non-nil, prefix-arg is nil. | 11869 | current-prefix-arg is non-nil, prefix-arg is nil. |
| 11870 | - before running the first real event, we run the special iconify-frame | 11870 | - before running the first real event, we run the special iconify-frame |
| 11871 | event, but we pass the `special' arg to execute-command so | 11871 | event, but we pass the `special' arg to command-execute so |
| 11872 | current-prefix-arg and prefix-arg are left untouched. | 11872 | current-prefix-arg and prefix-arg are left untouched. |
| 11873 | - here we foolishly copy the non-nil current-prefix-arg to prefix-arg. | 11873 | - here we foolishly copy the non-nil current-prefix-arg to prefix-arg. |
| 11874 | - the next key event will have a spuriously non-nil current-prefix-arg. */ | 11874 | - the next key event will have a spuriously non-nil current-prefix-arg. */ |