aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-07-16 02:25:40 +0000
committerGlenn Morris2008-07-16 02:25:40 +0000
commit75d37c3dfc98bd3c0955cd7d61ab6ecdcc2c88e8 (patch)
treefc754bf13b573ccfb07c92435f9381a61017e1a0
parent192801044515d917592aaa1fe6ab6cf9110ba1e3 (diff)
downloademacs-75d37c3dfc98bd3c0955cd7d61ab6ecdcc2c88e8.tar.gz
emacs-75d37c3dfc98bd3c0955cd7d61ab6ecdcc2c88e8.zip
(check-declare-locate, check-declare-verify): Handle .m files.
-rw-r--r--lisp/emacs-lisp/check-declare.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/check-declare.el b/lisp/emacs-lisp/check-declare.el
index d71268e1443..5a507178777 100644
--- a/lisp/emacs-lisp/check-declare.el
+++ b/lisp/emacs-lisp/check-declare.el
@@ -42,7 +42,7 @@
42 42
43(defun check-declare-locate (file basefile) 43(defun check-declare-locate (file basefile)
44 "Return the full path of FILE. 44 "Return the full path of FILE.
45Expands files with a \".c\" extension relative to the Emacs 45Expands files with a \".c\" or \".m\" extension relative to the Emacs
46\"src/\" directory. Otherwise, `locate-library' searches for FILE. 46\"src/\" directory. Otherwise, `locate-library' searches for FILE.
47If that fails, expands FILE relative to BASEFILE's directory part. 47If that fails, expands FILE relative to BASEFILE's directory part.
48The returned file might not exist. If FILE has an \"ext:\" prefix, so does 48The returned file might not exist. If FILE has an \"ext:\" prefix, so does
@@ -52,7 +52,7 @@ the result."
52 (if ext 52 (if ext
53 (setq file (substring file 4))) 53 (setq file (substring file 4)))
54 (setq file 54 (setq file
55 (if (string-equal "c" (file-name-extension file)) 55 (if (member (file-name-extension file) '("c" "m"))
56 (expand-file-name file (expand-file-name "src" source-directory)) 56 (expand-file-name file (expand-file-name "src" source-directory))
57 (if (setq tfile (locate-library (file-name-nondirectory file))) 57 (if (setq tfile (locate-library (file-name-nondirectory file)))
58 (progn 58 (progn
@@ -130,7 +130,7 @@ Returns nil if all claims are found to be true, otherwise a list
130of errors with elements of the form \(FILE FN TYPE), where TYPE 130of errors with elements of the form \(FILE FN TYPE), where TYPE
131is a string giving details of the error." 131is a string giving details of the error."
132 (let ((m (format "Checking %s..." fnfile)) 132 (let ((m (format "Checking %s..." fnfile))
133 (cflag (string-equal "c" (file-name-extension fnfile))) 133 (cflag (member (file-name-extension fnfile) '("c" "m")))
134 (ext (string-match "^ext:" fnfile)) 134 (ext (string-match "^ext:" fnfile))
135 re fn sig siglist arglist type errlist minargs maxargs) 135 re fn sig siglist arglist type errlist minargs maxargs)
136 (message "%s" m) 136 (message "%s" m)