From 4ab4de9ce6fec1ff368f5b244ba1f8d3b37632cc Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 28 Nov 2007 03:53:44 +0000 Subject: [PATCH] (check-declare-locate): Reflow doc. (check-declare-verify): Handle fset. --- lisp/emacs-lisp/check-declare.el | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lisp/emacs-lisp/check-declare.el b/lisp/emacs-lisp/check-declare.el index 800d0fa5fc0..d98b59d774e 100644 --- a/lisp/emacs-lisp/check-declare.el +++ b/lisp/emacs-lisp/check-declare.el @@ -46,9 +46,9 @@ (defun check-declare-locate (file basefile) "Return the full path of FILE. Expands files with a \".c\" extension relative to the Emacs -\"src/\" directory. Otherwise, `locate-library' searches for -FILE. If that fails, expands FILE relative to BASEFILE's -directory part. The returned file might not exist." +\"src/\" directory. Otherwise, `locate-library' searches for FILE. +If that fails, expands FILE relative to BASEFILE's directory part. +The returned file might not exist." (if (string-equal "c" (file-name-extension file)) (expand-file-name file (expand-file-name "src" source-directory)) (let ((tfile (locate-library (file-name-nondirectory file)))) @@ -112,7 +112,7 @@ found to be true, otherwise a list of errors with elements of the form ;; defsubst's don't _have_ to be known at compile time. (setq re (format (if cflag "^[ \t]*\\(DEFUN\\)[ \t]*([ \t]*\"%s\"" - "^[ \t]*(\\(def\\(?:un\\|subst\\|\ + "^[ \t]*(\\(fset[ \t]+'\\|def\\(?:un\\|subst\\|\ ine-\\(?:derived\\|generic\\|\\(?:global\\(?:ized\\)?-\\)?minor\\)-mode\ \\|\\(?:ine-obsolete-function-\\)?alias[ \t]+'\\)\\)\ \[ \t]*%s\\([ \t;]+\\|$\\)") @@ -153,8 +153,8 @@ ine-\\(?:derived\\|generic\\|\\(?:global\\(?:ized\\)?-\\)?minor\\)-mode\ "\\`define-obsolete-function-alias\\>" type) 'obsolete) - ;; Can't easily check alias arguments. - ((string-match "\\`defalias\\>" type) + ;; Can't easily check arguments in these cases. + ((string-match "\\`\\(defalias\\|fset\\)\\>" type) t) ((looking-at "\\((\\|nil\\)") (byte-compile-arglist-signature @@ -176,7 +176,7 @@ ine-\\(?:derived\\|generic\\|\\(?:global\\(?:ized\\)?-\\)?minor\\)-mode\ ;; arglist t means no arglist specified, as ;; opposed to an empty arglist. ((eq arglist t) nil) - ((eq sig t) nil) ; defalias, can't check + ((eq sig t) nil) ; eg defalias - can't check arguments ((eq sig 'err) "arglist not found") ; internal error ((not (equal (byte-compile-arglist-signature -- 2.39.5