Merge from origin/emacs-25

d0d9f55 Allow newlines inside cl function arglists
963541a Publicize cl--generic-all-functions
3c581d5 ; Fix typo
e58f900 Add some "safe-local-variable" declarations for compatibility...

diff --git a/etc/NEWS b/etc/NEWS
index ed0bc5f7626df65ef6c66e9c571377e0ac496863..31229f11e5dd03fcb3cf1a3202bd1bd17f57e9df 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2052,7 +2052,7 @@ process filter, sentinel, etc., through keyword arguments (similar to
 'make-network-process').
 
 +++
-** Subprocesses are automatically told about changes in window dimensions
+** Subprocesses are automatically told about changes in window dimensions.
 The new option 'window-adjust-process-window-size-function' controls
 how subprocesses are told to adapt their logical window sizes to
 changes in the Emacs window configuration.  Its default value calls

diff --git a/lisp/cedet/semantic/db-el.el b/lisp/cedet/semantic/db-el.el
index 83a268073b3c3df485d2678a48e4154e93d07dbd..a85b9024eb0322233a944be01bac01cd85029a7f 100644 (file)
--- a/lisp/cedet/semantic/db-el.el
+++ b/lisp/cedet/semantic/db-el.el
@@ -336,7 +336,7 @@ Return a list of tags."
                             (mapcar 'semanticdb-elisp-sym->tag
                                     ;; Fancy eieio function that knows all about
                                     ;; built in methods belonging to CLASS.
-                                    (eieio-all-generic-functions class)))))
+                                    (cl-generic-all-functions class)))))
             )
        taglst))))
 

diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el
index b5dfe487d07eb11e06220c28eb4bd3758865fecc..8bf0675f54b6453ce8eb8692a3590ffd21fbf341 100644 (file)
--- a/lisp/emacs-lisp/cl-extra.el
+++ b/lisp/emacs-lisp/cl-extra.el
@@ -822,7 +822,7 @@ including `cl-block' and `cl-eval-when'."
     (cl--describe-class-slots class)
 
     ;; Describe all the methods specific to this class.
-    (let ((generics (cl--generic-all-functions type)))
+    (let ((generics (cl-generic-all-functions type)))
       (when generics
         (insert (propertize "Specialized Methods:\n\n" 'face 'bold))
         (dolist (generic generics)

diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el
index 7ad9f307f9365ade3e5f6e0ed9496d0ff08fdb2b..37edf45df3814a51aedffcf76108dafd13a110cc 100644 (file)
--- a/lisp/emacs-lisp/cl-generic.el
+++ b/lisp/emacs-lisp/cl-generic.el
@@ -937,7 +937,7 @@ MET-NAME is a cons (SYMBOL . SPECIALIZERS)."
            (setq applies t)))
     applies))
 
-(defun cl--generic-all-functions (&optional type)
+(defun cl-generic-all-functions (&optional type)
   "Return a list of all generic functions.
 Optional TYPE argument returns only those functions that contain
 methods for TYPE."

diff --git a/lisp/emacs-lisp/eieio-opt.el b/lisp/emacs-lisp/eieio-opt.el
index 9e5f524a945c46238babd66a7ff076f1602bb83c..2f1d69f78f8a02291013351bd65e4e259c7beb51 100644 (file)
--- a/lisp/emacs-lisp/eieio-opt.el
+++ b/lisp/emacs-lisp/eieio-opt.el
@@ -162,7 +162,7 @@ are not abstract."
 (defun eieio-display-method-list ()
   "Display a list of all the methods and what features are used."
   (interactive)
-  (let* ((meth1 (cl--generic-all-functions))
+  (let* ((meth1 (cl-generic-all-functions))
         (meth (sort meth1 (lambda (a b)
                             (string< (symbol-name a)
                                      (symbol-name b)))))

diff --git a/lisp/help.el b/lisp/help.el
index efbae39a002af155e80c87124cbd628f3d6b1de2..897cab5e37189337b2bbd1348f10737279b683db 100644 (file)
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1412,7 +1412,7 @@ ARGLIST can also be t or a string of the form \"(FUN ARG1 ARG2 ...)\"."
                (if (< (- (match-end 0) (match-beginning 0)) 2) "\n" "")
              "\n\n")
            (if (stringp arglist)
-                (if (string-match "\\`[^ ]+\\(.*\\))\\'" arglist)
+                (if (string-match "\\`[^ ]+\\(\\(?:.\\|\n\\)*\\))\\'" arglist)
                     (concat "(fn" (match-string 1 arglist) ")")
                   (error "Unrecognized usage format"))
              (help--make-usage-docstring 'fn arglist)))))

diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index 8cad27fd86d16094c532f519d34b7e22e7ef7dbe..216f0cc143a6b6ae447313f62b3efbb6399a04ee 100644 (file)
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.el
@@ -1679,6 +1679,10 @@ c-noise-macro-with-parens-names is invalid: %s" c-noise-macro-with-parens-names)
 c-noise-macro-names is invalid: %s" c-noise-macro-names)))))
 \f
 ;; Non-customizable variables, still part of the interface to CC Mode
+;; The following two are preparations for Emacs 25.2 (2016-05-09):
+(put 'c-noise-macro-names 'safe-local-variable #'c-string-list-p)
+(put 'c-noise-macro-with-parens-names 'safe-local-variable #'c-string-list-p)
+
 (defvar c-macro-with-semi-re nil
   ;; Regular expression which matches a (#define'd) symbol whose expansion
   ;; ends with a semicolon.