summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2008-07-24 02:55:59 +0000
committerDan Nicolaescu <dann@ics.uci.edu>2008-07-24 02:55:59 +0000
commitf63b48bb47efca9b8aae79df85be8d832c6523dc (patch)
treea2f76d9443420f5d5319d10be60cb702636cf990 /lisp
parent93d102d029569715f7adc2519fb9e388feb0e840 (diff)
downloademacs-f63b48bb47efca9b8aae79df85be8d832c6523dc.tar.gz
(auto-mode-alist): Add .i and .ii files.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/progmodes/cc-mode.el5
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 @@
2008-07-24 Dan Nicolaescu <dann@ics.uci.edu>
+ * progmodes/cc-mode.el (auto-mode-alist): Add .i and .ii files.
+
* Makefile.in (ELCFILES): Add term/common-win.elc.
* 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
;;;###autoload (add-to-list 'auto-mode-alist '("\\.y\\(acc\\)?\\'" . c-mode))
;;;###autoload (add-to-list 'auto-mode-alist '("\\.lex\\'" . c-mode))
+;; Preprocessed files generated by C and C++ compilers.
+;;;###autoload (add-to-list 'auto-mode-alist '("\\.i\\'" . c-mode))
+;;;###autoload (add-to-list 'auto-mode-alist '("\\.ii\\'" . c++-mode))
+
+
;;;###autoload
(defun c-mode ()
"Major mode for editing K&R and ANSI C code.