Mercurial > emacs
comparison lisp/progmodes/cc-mode.el @ 91041:bdb3fe0ba9fa
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 866-879)
- Merge multi-tty branch
- Update from CVS
- Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-257
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Thu, 11 Oct 2007 16:22:07 +0000 |
| parents | 539530fa389c f4b3c97a692f |
| children | d38543a1c0f9 |
comparison
equal
deleted
inserted
replaced
| 91040:14c4a6aac623 | 91041:bdb3fe0ba9fa |
|---|---|
| 267 c-mode-base-map global-map) | 267 c-mode-base-map global-map) |
| 268 (substitute-key-definition 'indent-new-comment-line | 268 (substitute-key-definition 'indent-new-comment-line |
| 269 'c-indent-new-comment-line | 269 'c-indent-new-comment-line |
| 270 c-mode-base-map global-map) | 270 c-mode-base-map global-map) |
| 271 (substitute-key-definition 'indent-for-tab-command | 271 (substitute-key-definition 'indent-for-tab-command |
| 272 'c-indent-command | 272 ;; XXX Is this the right thing to do |
| 273 ;; here? | |
| 274 'c-indent-line-or-region | |
| 273 c-mode-base-map global-map) | 275 c-mode-base-map global-map) |
| 274 (when (fboundp 'comment-indent-new-line) | 276 (when (fboundp 'comment-indent-new-line) |
| 275 ;; indent-new-comment-line has changed name to | 277 ;; indent-new-comment-line has changed name to |
| 276 ;; comment-indent-new-line in Emacs 21. | 278 ;; comment-indent-new-line in Emacs 21. |
| 277 (substitute-key-definition 'comment-indent-new-line | 279 (substitute-key-definition 'comment-indent-new-line |