diff options
| author | Tom Tromey | 2013-03-08 11:57:29 -0700 |
|---|---|---|
| committer | Tom Tromey | 2013-03-08 11:57:29 -0700 |
| commit | 71f91792e3013b397996905224f387da5cc539a9 (patch) | |
| tree | 4c3d3ba909e76deea1cdf73b73fca67a57149465 /lisp/progmodes/cpp.el | |
| parent | 6f4de085f065e11f4df3195d47479f28f5ef08ba (diff) | |
| parent | b5426561089d39f18b42bed9dbfcb531f43ed562 (diff) | |
| download | emacs-71f91792e3013b397996905224f387da5cc539a9.tar.gz emacs-71f91792e3013b397996905224f387da5cc539a9.zip | |
merge from trunk
Diffstat (limited to 'lisp/progmodes/cpp.el')
| -rw-r--r-- | lisp/progmodes/cpp.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/progmodes/cpp.el b/lisp/progmodes/cpp.el index 340b97e80bd..674d98b8dc3 100644 --- a/lisp/progmodes/cpp.el +++ b/lisp/progmodes/cpp.el | |||
| @@ -420,6 +420,7 @@ A prefix arg suppresses display of that buffer." | |||
| 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-command) | 422 | (define-key map " " 'scroll-up-command) |
| 423 | (define-key map [?\S-\ ] 'scroll-down-command) | ||
| 423 | (define-key map "\C-?" 'scroll-down-command) | 424 | (define-key map "\C-?" 'scroll-down-command) |
| 424 | (define-key map [ delete ] 'scroll-down) | 425 | (define-key map [ delete ] 'scroll-down) |
| 425 | (define-key map "\C-c\C-c" 'cpp-edit-apply) | 426 | (define-key map "\C-c\C-c" 'cpp-edit-apply) |