* lisp/emacs-lisp/nadvice.el (advice--member-p): Return the advice if found.

[gnu-emacs] / lisp / find-file.el

diff --git a/lisp/find-file.el b/lisp/find-file.el
index 1deafc9734c837cd8dcbe6ca601d2811f5c70498..367036d3753411e8c830cc6795d1400d5c379f34 100644 (file)
--- a/lisp/find-file.el
+++ b/lisp/find-file.el
@@ -4,7 +4,7 @@
 ;; Maintainer: FSF
 ;; Keywords: c, matching, tools
 
-;; Copyright (C) 1994-1995, 2001-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1995, 2001-2013 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -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"))