diff options
| author | Ivan Andrus | 2013-05-06 00:40:58 -0700 |
|---|---|---|
| committer | Glenn Morris | 2013-05-06 00:40:58 -0700 |
| commit | d491e7a83f5fc1127483a42a1d2b6a0474c8b222 (patch) | |
| tree | 1859adb5cd18a4e6e7b56b5a0bb3a3649d1843ee | |
| parent | 7cc3af27a1bd8507ee5202714c27070f969cb5d9 (diff) | |
| download | emacs-d491e7a83f5fc1127483a42a1d2b6a0474c8b222.tar.gz emacs-d491e7a83f5fc1127483a42a1d2b6a0474c8b222.zip | |
* lisp/find-file.el (cc-other-file-alist): Add ".m" for ObjC.
Fixes: debbugs:14339
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/find-file.el | 3 |
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 @@ | |||
| 1 | 2013-05-06 Ivan Andrus <darthandrus@gmail.com> | ||
| 2 | |||
| 3 | * find-file.el (cc-other-file-alist): Add ".m" for ObjC. (Bug#14339) | ||
| 4 | |||
| 1 | 2013-05-06 Glenn Morris <rgm@gnu.org> | 5 | 2013-05-06 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * w32-fns.el (w32-charset-info-alist): Declare. | 7 | * 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 | |||
| 245 | ("\\.hh\\'" (".cc" ".C")) | 245 | ("\\.hh\\'" (".cc" ".C")) |
| 246 | 246 | ||
| 247 | ("\\.c\\'" (".h")) | 247 | ("\\.c\\'" (".h")) |
| 248 | ("\\.h\\'" (".c" ".cc" ".C" ".CC" ".cxx" ".cpp")) | 248 | ("\\.m\\'" (".h")) |
| 249 | ("\\.h\\'" (".c" ".cc" ".C" ".CC" ".cxx" ".cpp" ".m")) | ||
| 249 | 250 | ||
| 250 | ("\\.C\\'" (".H" ".hh" ".h")) | 251 | ("\\.C\\'" (".H" ".hh" ".h")) |
| 251 | ("\\.H\\'" (".C" ".CC")) | 252 | ("\\.H\\'" (".C" ".CC")) |