diff options
| author | Dan Nicolaescu | 2008-07-24 02:55:59 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2008-07-24 02:55:59 +0000 |
| commit | f63b48bb47efca9b8aae79df85be8d832c6523dc (patch) | |
| tree | a2f76d9443420f5d5319d10be60cb702636cf990 | |
| parent | 93d102d029569715f7adc2519fb9e388feb0e840 (diff) | |
| download | emacs-f63b48bb47efca9b8aae79df85be8d832c6523dc.tar.gz emacs-f63b48bb47efca9b8aae79df85be8d832c6523dc.zip | |
(auto-mode-alist): Add .i and .ii files.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/progmodes/cc-mode.el | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3de0a1f65e5..034cbb8e33e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2008-07-24 Dan Nicolaescu <dann@ics.uci.edu> | 1 | 2008-07-24 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 2 | ||
| 3 | * progmodes/cc-mode.el (auto-mode-alist): Add .i and .ii files. | ||
| 4 | |||
| 3 | * Makefile.in (ELCFILES): Add term/common-win.elc. | 5 | * Makefile.in (ELCFILES): Add term/common-win.elc. |
| 4 | 6 | ||
| 5 | * vc-dir.el (vc-dir-search, vc-dir-isearch) | 7 | * vc-dir.el (vc-dir-search, vc-dir-isearch) |
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 747b35be00a..06f94bde94a 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el | |||
| @@ -1096,6 +1096,11 @@ This does not load the font-lock package. Use after | |||
| 1096 | ;;;###autoload (add-to-list 'auto-mode-alist '("\\.y\\(acc\\)?\\'" . c-mode)) | 1096 | ;;;###autoload (add-to-list 'auto-mode-alist '("\\.y\\(acc\\)?\\'" . c-mode)) |
| 1097 | ;;;###autoload (add-to-list 'auto-mode-alist '("\\.lex\\'" . c-mode)) | 1097 | ;;;###autoload (add-to-list 'auto-mode-alist '("\\.lex\\'" . c-mode)) |
| 1098 | 1098 | ||
| 1099 | ;; Preprocessed files generated by C and C++ compilers. | ||
| 1100 | ;;;###autoload (add-to-list 'auto-mode-alist '("\\.i\\'" . c-mode)) | ||
| 1101 | ;;;###autoload (add-to-list 'auto-mode-alist '("\\.ii\\'" . c++-mode)) | ||
| 1102 | |||
| 1103 | |||
| 1099 | ;;;###autoload | 1104 | ;;;###autoload |
| 1100 | (defun c-mode () | 1105 | (defun c-mode () |
| 1101 | "Major mode for editing K&R and ANSI C code. | 1106 | "Major mode for editing K&R and ANSI C code. |