summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Andrus <darthandrus@gmail.com>2013-05-06 00:40:58 -0700
committerGlenn Morris <rgm@gnu.org>2013-05-06 00:40:58 -0700
commitd491e7a83f5fc1127483a42a1d2b6a0474c8b222 (patch)
tree1859adb5cd18a4e6e7b56b5a0bb3a3649d1843ee
parent7cc3af27a1bd8507ee5202714c27070f969cb5d9 (diff)
downloademacs-d491e7a83f5fc1127483a42a1d2b6a0474c8b222.tar.gz
emacs-d491e7a83f5fc1127483a42a1d2b6a0474c8b222.tar.bz2
emacs-d491e7a83f5fc1127483a42a1d2b6a0474c8b222.zip
* lisp/find-file.el (cc-other-file-alist): Add ".m" for ObjC.
Fixes: debbugs:14339
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/find-file.el3
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d38ef5a541e..5abb4954a97 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-06 Ivan Andrus <darthandrus@gmail.com>
+
+ * find-file.el (cc-other-file-alist): Add ".m" for ObjC. (Bug#14339)
+
2013-05-06 Glenn Morris <rgm@gnu.org>
* w32-fns.el (w32-charset-info-alist): Declare.
diff --git a/lisp/find-file.el b/lisp/find-file.el
index 4d1953b3c1f..367036d3753 100644
--- a/lisp/find-file.el
+++ b/lisp/find-file.el
@@ -245,7 +245,8 @@ the preceding slash. The star represents all the subdirectories except
("\\.hh\\'" (".cc" ".C"))
("\\.c\\'" (".h"))
- ("\\.h\\'" (".c" ".cc" ".C" ".CC" ".cxx" ".cpp"))
+ ("\\.m\\'" (".h"))
+ ("\\.h\\'" (".c" ".cc" ".C" ".CC" ".cxx" ".cpp" ".m"))
("\\.C\\'" (".H" ".hh" ".h"))
("\\.H\\'" (".C" ".CC"))