diff options
| author | Alan Mackenzie <[email protected]> | 2008-06-27 21:12:46 +0000 |
|---|---|---|
| committer | Alan Mackenzie <[email protected]> | 2008-06-27 21:12:46 +0000 |
| commit | 13ac2398ff34ce51d1f3b7cafa2aea9af99cf203 (patch) | |
| tree | 8187b144e2d1dca839b732facd2da7e1f2819682 /lisp/progmodes/cc-mode.el | |
| parent | 2a79117ef584d4d01254a7fd311a755984f728b6 (diff) | |
cc-mode.el (c-mode-base-map): Don't bind C-M-[ae] to the CC Mode specific
functions; this is no longer needed, since {beginning,end}-of-defun now
pass ARG to ...-of-defun-function.
cc-defs.el (c-emacs-features): new feature 'argumentative-bod-function.
----------------------------------------------------------------------
cc-defs.el cc-mode.el CVS:
----------------------------------------------------------------------
Diffstat (limited to 'lisp/progmodes/cc-mode.el')
| -rw-r--r-- | lisp/progmodes/cc-mode.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 9076491db3..747b35be00 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -285,8 +285,9 @@ control). See \"cc-mode.el\" for more info." ;; RMS says don't make these the default. ;; (April 2006): RMS has now approved these commands as defaults. - (define-key c-mode-base-map "\e\C-a" 'c-beginning-of-defun) - (define-key c-mode-base-map "\e\C-e" 'c-end-of-defun) + (unless (memq 'argumentative-bod-function c-emacs-features) + (define-key c-mode-base-map "\e\C-a" 'c-beginning-of-defun) + (define-key c-mode-base-map "\e\C-e" 'c-end-of-defun)) (define-key c-mode-base-map "\C-c\C-n" 'c-forward-conditional) (define-key c-mode-base-map "\C-c\C-p" 'c-backward-conditional) |