diff options
| author | Paul Eggert | 2011-10-01 22:44:43 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-10-01 22:44:43 -0700 |
| commit | df52aeb91d63c3f904c717fa8897e59fd9a5a557 (patch) | |
| tree | 0d3a471d6e44def1ba160d06b454a149a1a033b9 /lisp/progmodes/cpp.el | |
| parent | 39b5db3b1bb51088830bdf2d5e50940d462573d2 (diff) | |
| parent | 32c1fffd728cfed8427d144bf7c622257aad859f (diff) | |
| download | emacs-df52aeb91d63c3f904c717fa8897e59fd9a5a557.tar.gz emacs-df52aeb91d63c3f904c717fa8897e59fd9a5a557.zip | |
Merge from trunk.
Diffstat (limited to 'lisp/progmodes/cpp.el')
| -rw-r--r-- | lisp/progmodes/cpp.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/progmodes/cpp.el b/lisp/progmodes/cpp.el index a8f01705e2d..e5bfda54728 100644 --- a/lisp/progmodes/cpp.el +++ b/lisp/progmodes/cpp.el | |||
| @@ -419,8 +419,8 @@ A prefix arg suppresses display of that buffer." | |||
| 419 | (suppress-keymap map) | 419 | (suppress-keymap map) |
| 420 | (define-key map [ down-mouse-2 ] 'cpp-push-button) | 420 | (define-key map [ down-mouse-2 ] 'cpp-push-button) |
| 421 | (define-key map [ mouse-2 ] 'ignore) | 421 | (define-key map [ mouse-2 ] 'ignore) |
| 422 | (define-key map " " 'scroll-up) | 422 | (define-key map " " 'scroll-up-command) |
| 423 | (define-key map "\C-?" 'scroll-down) | 423 | (define-key map "\C-?" 'scroll-down-command) |
| 424 | (define-key map [ delete ] 'scroll-down) | 424 | (define-key map [ delete ] 'scroll-down) |
| 425 | (define-key map "\C-c\C-c" 'cpp-edit-apply) | 425 | (define-key map "\C-c\C-c" 'cpp-edit-apply) |
| 426 | (define-key map "a" 'cpp-edit-apply) | 426 | (define-key map "a" 'cpp-edit-apply) |