Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-300

lisp/emacs-lisp/check-declare.el

@@ -34,6 +34,9 @@
 
 ;;; TODO:
 
+;; 1. Warn about functions marked as obsolete, eg
+;; password-read-and-add in smime.el.
+
 ;;; Code:
 
 (defconst check-declare-warning-buffer "*Check Declarations Warnings*"
@@ -141,7 +144,8 @@ is a string giving details of the error."
           ;; defsubst's don't _have_ to be known at compile time.
           (setq re (format (if cflag
                                "^[ \t]*\\(DEFUN\\)[ \t]*([ \t]*\"%s\""
-                             "^[ \t]*(\\(fset[ \t]+'\\|def\\(?:un\\|subst\\|\
+                             "^[ \t]*(\\(fset[ \t]+'\\|\
+def\\(?:un\\|subst\\|foo\\|\
 ine-\\(?:derived\\|generic\\|\\(?:global\\(?:ized\\)?-\\)?minor\\)-mode\
 \\|\\(?:ine-obsolete-function-\\)?alias[ \t]+'\\)\\)\
 \[ \t]*%s\\([ \t;]+\\|$\\)")

lisp/emacs-lisp/checkdoc.el

@@ -978,7 +978,7 @@ Optional argument INTERACT permits more interactive fixing."
     (if (not (interactive-p))
 	e
       (if e
-	  (message (checkdoc-error-text e))
+	  (message "%s" (checkdoc-error-text e))
 	(checkdoc-show-diagnostics)
 	(message "Space Check: done.")))))
 
@@ -1038,15 +1038,15 @@ space at the end of each line."
 	     (end (save-excursion (end-of-defun) (point)))
 	     (msg (checkdoc-this-string-valid)))
 	(if msg (if no-error
-		    (message (checkdoc-error-text msg))
+		    (message "%s" (checkdoc-error-text msg))
 		  (error "%s" (checkdoc-error-text msg)))
 	  (setq msg (checkdoc-message-text-search beg end))
 	  (if msg (if no-error
-		      (message (checkdoc-error-text msg))
+		      (message "%s" (checkdoc-error-text msg))
 		    (error "%s" (checkdoc-error-text msg)))
 	    (setq msg (checkdoc-rogue-space-check-engine beg end))
 	    (if msg (if no-error
-			(message (checkdoc-error-text msg))
+			(message "%s" (checkdoc-error-text msg))
 		      (error "%s" (checkdoc-error-text msg))))))
 	(if (interactive-p) (message "Checkdoc: done."))))))
 

lisp/emacs-lisp/edebug.el

@@ -3295,12 +3295,12 @@ With prefix argument, make it a temporary breakpoint."
   (if (eq (1+ edebug-recursion-depth) (recursion-depth))
       (progn
 	(setq edebug-execution-mode mode)
-	(message shortmsg)
+	(message "%s" shortmsg)
 	;; Continue execution
 	(exit-recursive-edit))
     ;; This is not terribly useful!!
     (setq edebug-next-execution-mode mode)
-    (message msg)))
+    (message "%s" msg)))
 
 
 (defalias 'edebug-step-through-mode 'edebug-step-mode)

lisp/emacs-lisp/lisp-mnt.el

@@ -511,18 +511,17 @@ copyright notice is allowed."
     (if (and file (file-directory-p file))
 	(setq ret
 	      (with-temp-buffer
-		(mapcar
-		 (lambda (f)
-		   (if (string-match ".*\\.el\\'" f)
-		       (let ((status (lm-verify f)))
-			 (insert f ":")
-			 (if status
-			     (lm-insert-at-column lm-comment-column status
-						  "\n")
-			   (if showok
-			       (lm-insert-at-column lm-comment-column
-						    "OK\n"))))))
-		 (directory-files file))))
+		(dolist (f (directory-files file nil "\\.el\\'")
+			   (buffer-string))
+		  (when (file-regular-p f)
+		    (let ((status (lm-verify f)))
+		      (insert f ":")
+		      (if status
+			  (lm-insert-at-column lm-comment-column status
+					       "\n")
+			(if showok
+			    (lm-insert-at-column lm-comment-column
+						 "OK\n"))))))))
       (lm-with-file file
 	(setq name (lm-get-package-name))
 	(setq ret
@@ -562,7 +561,7 @@ copyright notice is allowed."
 	       (t
 		ret)))))
     (if verbose
-	(message ret))
+	(message "%s" ret))
     ret))
 
 (defun lm-synopsis (&optional file showall)