Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

8 files changed, 96 insertions, 67 deletions

diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el
index 3b06cf792d2..7d99b179112 100644
--- a/lisp/cedet/ede.el
+++ b/lisp/cedet/ede.el
@@ -512,7 +512,7 @@ Sets buffer local variables for EDE."
         (when projdetect
           ;; No project was loaded, but we have a project description
           ;; object.  This means that we try to load it.
-          ;; 
+          ;;
           ;; Before loading, we need to check if it is a safe
           ;; project to load before requesting it to be loaded.
 
@@ -728,9 +728,10 @@ Return nil if DIR should not be in `ede-project-directories'."
       (when (listp ede-project-directories)
         (or (member dir ede-project-directories)
             (when (funcall ede-check-project-query-fcn
-                           (format "`%s' is not listed in `ede-project-directories'.
+                           (format-message
+                            "`%s' is not listed in `ede-project-directories'.
 Add it to the list of allowed project directories? "
-                                   dir))
+                            dir))
               (push dir ede-project-directories)
               ;; If possible, save `ede-project-directories'.
               (if (or custom-file user-init-file)
@@ -799,7 +800,7 @@ Optional argument NAME is the name to give this project."
                                               "Unknown file name specifier %S"
                                               pf)))
                                 :targets nil)
-                 
+
                  ))
          (inits (oref obj initializers)))
     ;; Force the name to match for new objects.
diff --git a/lisp/cedet/ede/auto.el b/lisp/cedet/ede/auto.el
index 482632f294a..51459fa7e74 100644
--- a/lisp/cedet/ede/auto.el
+++ b/lisp/cedet/ede/auto.el
@@ -155,9 +155,9 @@ into memory.")
 Specifying this matcher object will allow EDE to perform a complex
 check without loading the project.
 
-NOTE: If you use dirmatch, you may need to set :root-only to nil.
+NOTE: If you use dirmatch, you may need to set :root-only to `nil'.
 While it may be a root based project, all subdirs will happen to return
-true for the dirmatch, so for scanning purposes, set it to nil.")
+true for the dirmatch, so for scanning purposes, set it to `nil'.")
    (proj-root :initarg :proj-root
               :type function
               :documentation "A function symbol to call for the project root.
@@ -197,23 +197,20 @@ type is required and the load function used.")
 
 (defvar ede-project-class-files
   (list
-   (ede-project-autoload "edeproject-makefile"
-                         :name "Make" :file 'ede/proj
+   (ede-project-autoload :name "Make" :file 'ede/proj
                          :proj-file "Project.ede"
                          :root-only nil
                          :load-type 'ede-proj-load
                          :class-sym 'ede-proj-project
                          :safe-p nil)
-   (ede-project-autoload "edeproject-automake"
-                         :name "Automake" :file 'ede/proj
+   (ede-project-autoload :name "Automake" :file 'ede/proj
                          :proj-file "Project.ede"
                          :root-only nil
                          :initializers '(:makefile-type Makefile.am)
                          :load-type 'ede-proj-load
                          :class-sym 'ede-proj-project
                          :safe-p nil)
-   (ede-project-autoload "automake"
-                         :name "automake" :file 'ede/project-am
+   (ede-project-autoload :name "automake" :file 'ede/project-am
                          :proj-file "Makefile.am"
                          :root-only nil
                          :load-type 'project-am-load
@@ -225,6 +222,19 @@ type is required and the load function used.")
 
 (put 'ede-project-class-files 'risky-local-variable t)
 
+(defun ede-show-supported-projects ()
+  "Display all the project types registered with EDE."
+  (interactive)
+  (let ((b (get-buffer-create "*EDE Autodetect Projects*")))
+    (set-buffer b)
+    (setq buffer-read-only nil)
+    (erase-buffer)
+    (dolist (prj ede-project-class-files)
+      (insert (oref prj name))
+      (newline))
+    (display-buffer b)
+ ))
+
 (defun ede-add-project-autoload (projauto &optional flag)
   "Add PROJAUTO, an EDE autoload definition to `ede-project-class-files'.
 Optional argument FLAG indicates how this autoload should be
@@ -234,8 +244,8 @@ added.  Possible values are:
             front of the list so more generic projects don't get priority."
   ;; First, can we identify PROJAUTO as already in the list?  If so, replace.
   (let ((projlist ede-project-class-files)
-        (projname (eieio-object-name-string projauto)))
-    (while (and projlist (not (string= (eieio-object-name-string (car projlist)) projname)))
+        (projname (oref projauto name)))
+    (while (and projlist (not (string= (oref (car projlist) name) projname)))
       (setq projlist (cdr projlist)))
 
     (if projlist
@@ -296,7 +306,7 @@ be loaded.
 
 NOTE: Do not call this - it should only be called from `ede-load-project-file'."
   ;; Last line of defense: don't load unsafe projects.
-  (when (not (or (oref this :safe-p)
+  (when (not (or (oref this safe-p)
                  (ede-directory-safe-p dir)))
     (error "Attempt to load an unsafe project (bug elsewhere in EDE)"))
   ;; Things are good - so load the project.
diff --git a/lisp/cedet/ede/generic.el b/lisp/cedet/ede/generic.el
index 9e6fc978376..8d013245bb6 100644
--- a/lisp/cedet/ede/generic.el
+++ b/lisp/cedet/ede/generic.el
@@ -74,7 +74,7 @@
 ;; The ede-generic-target-c-cpp has some example methods setting up
 ;; the pre-processor map and system include path.
 ;;
-;; NOTE: It is not necessary to modify ede-generic.el to add any of
+;; NOTE: It is not necessary to modify ede/generic.el to add any of
 ;; the above described support features.
 
 (require 'eieio-opt)
@@ -102,14 +102,14 @@ ROOTPROJ is nil, since there is only one project."
   (let* ((alobj ede-constructing))
     (when (not alobj) (error "Cannot load generic project without the autoload instance"))
     ;;;
-    ;; TODO - find the root dir. 
+    ;; TODO - find the root dir.
     (let ((rootdir dir))
       (funcall (oref alobj class-sym)
                (symbol-name (oref alobj class-sym))
                :name (file-name-nondirectory (directory-file-name dir))
                :version "1.0"
                :directory (file-name-as-directory rootdir)
-               :file (expand-file-name (oref alobj :proj-file)
+               :file (expand-file-name (oref alobj proj-file)
                                        rootdir)))
     ))
 
@@ -211,7 +211,7 @@ All directories need at least one target.")
   (let ((match nil))
     (dolist (T targets)
       (when (and (object-of-class-p T class)
-                 (string= (oref T :path) dir))
+                 (string= (oref T path) dir))
         (setq match T)
       ))
     match))
@@ -241,7 +241,7 @@ If one doesn't exist, create a new one for this directory."
     (when (not ans)
       (setq ans (make-instance
                  cls
-                 :name (oref cls shortname)
+                 :name (oref-default cls shortname)
                  :path dir
                  :source nil))
       (object-add-to-list proj :targets ans)
@@ -252,18 +252,18 @@ If one doesn't exist, create a new one for this directory."
 ;;
 ;; Derived projects need an autoloader so that EDE can find the
 ;; different projects on disk.
-(defun ede-generic-new-autoloader (internal-name external-name
-                                                 projectfile class)
+(defun ede-generic-new-autoloader (_internal-name external-name
+                                                  projectfile class)
   "Add a new EDE Autoload instance for identifying a generic project.
-INTERNAL-NAME is a long name that identifies this project type.
-EXTERNAL-NAME is a shorter human readable name to describe the project.
+INTERNAL-NAME is obsolete and ignored.
+EXTERNAL-NAME is a human readable name to describe the project; it
+must be unique among all autoloaded projects.
 PROJECTFILE is a file name that identifies a project of this type to EDE, such as
 a Makefile, or SConstruct file.
 CLASS is the EIEIO class that is used to track this project.  It should subclass
-the class `ede-generic-project' project."
+`ede-generic-project'."
   (ede-add-project-autoload
-   (ede-project-autoload internal-name
-                         :name external-name
+   (ede-project-autoload :name external-name
                          :file 'ede/generic
                          :proj-file projectfile
                          :root-only nil
@@ -284,29 +284,29 @@ the class `ede-generic-project' project."
 (defun ede-enable-generic-projects ()
   "Enable generic project loaders."
   (interactive)
-  (ede-generic-new-autoloader "generic-makefile" "Make"
+  (ede-generic-new-autoloader "generic-makefile" "Generic Make"
                               "Makefile" 'ede-generic-makefile-project)
-  (ede-generic-new-autoloader "generic-scons" "SCons"
+  (ede-generic-new-autoloader "generic-scons" "Generic SCons"
                               "SConstruct" 'ede-generic-scons-project)
-  (ede-generic-new-autoloader "generic-cmake" "CMake"
+  (ede-generic-new-autoloader "generic-cmake" "Generic CMake"
                               "CMakeLists" 'ede-generic-cmake-project)
 
   ;; Super Generic found via revision control tags.
-  (ede-generic-new-autoloader "generic-git" "Git"
+  (ede-generic-new-autoloader "generic-git" "Generic Git"
                               ".git" 'ede-generic-vc-project)
-  (ede-generic-new-autoloader "generic-bzr" "Bazaar"
+  (ede-generic-new-autoloader "generic-bzr" "Generic Bazaar"
                               ".bzr" 'ede-generic-vc-project)
-  (ede-generic-new-autoloader "generic-hg" "Mercurial"
+  (ede-generic-new-autoloader "generic-hg" "Generic Mercurial"
                               ".hg" 'ede-generic-vc-project)
-  (ede-generic-new-autoloader "generic-svn" "Subversions"
+  (ede-generic-new-autoloader "generic-svn" "Generic Subversions"
                               ".svn" 'ede-generic-vc-project)
-  (ede-generic-new-autoloader "generic-cvs" "CVS"
+  (ede-generic-new-autoloader "generic-cvs" "Generic CVS"
                               "CVS" 'ede-generic-vc-project)
 
   ;; Take advantage of existing 'projectile' based projects.
   ;; @TODO - if projectile supports compile commands etc, can we
   ;; read that out?  Howto if projectile is not part of core emacs.
-  (ede-generic-new-autoloader "generic-projectile" ".projectile"
+  (ede-generic-new-autoloader "generic-projectile" "Generic .projectile"
                               ".projectile" 'ede-generic-vc-project)
 
   )
diff --git a/lisp/cedet/mode-local.el b/lisp/cedet/mode-local.el
index 9ee875022f8..72512c6e6bc 100644
--- a/lisp/cedet/mode-local.el
+++ b/lisp/cedet/mode-local.el
@@ -637,21 +637,30 @@ SYMBOL is a function that can be overridden."
   (when (get symbol 'mode-local-overload)
     (let ((default (or (intern-soft (format "%s-default" (symbol-name symbol)))
                        symbol))
-          (override (and
-                     (boundp 'describe-function-orig-buffer) ;; added in Emacs 25
-                     describe-function-orig-buffer
-                     (with-current-buffer describe-function-orig-buffer
-                       (fetch-overload symbol)))))
+          (override (with-current-buffer describe-function-orig-buffer
+                      (fetch-overload symbol)))
+          modes)
+
       (insert (overload-docstring-extension symbol) "\n\n")
-      (insert (substitute-command-keys (format "default function: `%s'\n" default)))
-      (when (and (boundp 'describe-function-orig-buffer) ;; added in Emacs 25
-                 describe-function-orig-buffer)
-        (if override
-            (insert (substitute-command-keys
-                     (format "\noverride in buffer '%s': `%s'\n"
-                             describe-function-orig-buffer override)))
-          (insert (substitute-command-keys (format "\nno override in buffer '%s'\n"
-                                                   describe-function-orig-buffer)))))
+      (insert (format-message "default function: `%s'\n" default))
+      (if override
+          (insert (format-message "\noverride in buffer '%s': `%s'\n"
+                                  describe-function-orig-buffer override))
+        (insert (format-message "\nno override in buffer '%s'\n"
+                                describe-function-orig-buffer)))
+
+      (mapatoms
+       (lambda (sym) (when (get sym 'mode-local-symbol-table) (push sym modes)))
+       obarray)
+
+      (dolist (mode modes)
+        (let* ((major-mode mode)
+               (override (fetch-overload symbol)))
+
+          (when override
+            (insert (format-message "\noverride in mode ‘%s’: ’%s’\n"
+                                    major-mode override))
+            )))
       )))
 
 (add-hook 'help-fns-describe-function-functions 'describe-mode-local-overload)
diff --git a/lisp/cedet/semantic/analyze/debug.el b/lisp/cedet/semantic/analyze/debug.el
index d0ab7c82c13..76a6cc2f9b2 100644
--- a/lisp/cedet/semantic/analyze/debug.el
+++ b/lisp/cedet/semantic/analyze/debug.el
@@ -405,7 +405,8 @@ or implementing a version specific to ")
 
     (princ "\n\nInclude Path Summary:")
     (when edeobj
-        (princ "\n\nThis file's project include search is handled by the EDE object:\n")
+        (princ (substitute-command-keys
+                "\n\nThis file's project include search is handled by the EDE object:\n"))
         (princ "  Buffer Target:  ")
         (princ (object-print edeobj))
         (princ "\n")
@@ -463,12 +464,12 @@ or implementing a version specific to ")
 
           (princ "\nYou can fix the include path for ")
           (princ (symbol-name (oref table major-mode)))
-          (princ " by using this function:
+          (princ (substitute-command-keys " by using this function:
 
-M-x semantic-customize-system-include-path RET
+\\[semantic-customize-system-include-path]
 
 which customizes the mode specific variable for the mode-local
-variable `semantic-dependency-system-include-path'.")
+variable `semantic-dependency-system-include-path'."))
           )
 
       (princ "\n No unknown includes.\n"))
diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index 6639f178e86..1c25c7b0808 100644
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -2176,7 +2176,8 @@ actually in their parent which is not accessible.")
 
       (princ "\n\nInclude Path Summary:\n")
       (when (and (boundp 'ede-object) ede-object)
-        (princ "\n  This file's project include is handled by:\n")
+        (princ (substitute-command-keys
+                "\n  This file's project include is handled by:\n"))
         (let ((objs (if (listp ede-object)
                         ede-object
                       (list ede-object))))
@@ -2194,14 +2195,16 @@ actually in their parent which is not accessible.")
         )
 
       (when semantic-dependency-include-path
-        (princ "\n  This file's generic include path is:\n")
+        (princ (substitute-command-keys
+                "\n  This file's generic include path is:\n"))
         (dolist (dir semantic-dependency-include-path)
           (princ "    ")
           (princ dir)
           (princ "\n")))
 
       (when semantic-dependency-system-include-path
-        (princ "\n  This file's system include path is:\n")
+        (princ (substitute-command-keys
+                "\n  This file's system include path is:\n"))
         (dolist (dir semantic-dependency-system-include-path)
           (princ "    ")
           (princ dir)
diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el
index 7bfca77e8c4..962dc49da54 100644
--- a/lisp/cedet/semantic/decorate/include.el
+++ b/lisp/cedet/semantic/decorate/include.el
@@ -503,7 +503,8 @@ Argument EVENT is the mouse clicked event."
       (princ "Include File: ")
       (princ (semantic-format-tag-name tag nil t))
       (princ "\n\n")
-      (princ "This header file has been marked \"Unknown\".
+      (princ (substitute-command-keys "\
+This header file has been marked \"Unknown\".
 This means that Semantic has not been able to locate this file on disk.
 
 When Semantic cannot find an include file, this means that the
@@ -521,9 +522,9 @@ M-x semantic-add-system-include RET /path/to/includes RET
 
 or, in your .emacs file do:
 
-  (semantic-add-system-include \"/path/to/include\" '")
+  (semantic-add-system-include \"/path/to/include\" \\='"))
       (princ (symbol-name mm))
-      (princ ")
+      (princ (substitute-command-keys ")
 
 to add the path to Semantic's search.
 
@@ -531,7 +532,7 @@ If this is an include file that belongs to your project, then you may
 need to update `semanticdb-project-roots' or better yet, use `ede'
 to manage your project.  See the ede manual for projects that will
 wrap existing project code for Semantic's benefit.
-")
+"))
 
       (when (or (eq mm 'c++-mode) (eq mm 'c-mode))
         (princ "
@@ -745,7 +746,8 @@ Argument EVENT describes the event that caused this function to be called."
       (when (and (boundp 'ede-object)
                  (boundp 'ede-object-project)
                  ede-object)
-        (princ "  This file's project include search is handled by the EDE object:\n")
+        (princ (substitute-command-keys
+                "  This file's project include search is handled by the EDE object:\n"))
         (princ "    Buffer Target:  ")
         (princ (object-print ede-object))
         (princ "\n")
@@ -769,7 +771,8 @@ Argument EVENT describes the event that caused this function to be called."
               (princ "\n"))
             )))
 
-      (princ "\n  This file's system include path is:\n")
+      (princ (substitute-command-keys
+              "\n  This file's system include path is:\n"))
       (dolist (dir semantic-dependency-system-include-path)
         (princ "    ")
         (princ dir)
diff --git a/lisp/cedet/semantic/ia.el b/lisp/cedet/semantic/ia.el
index 2216fa9e964..27e6db16f39 100644
--- a/lisp/cedet/semantic/ia.el
+++ b/lisp/cedet/semantic/ia.el
@@ -364,15 +364,17 @@ origin of the code at point."
       (let ((secondclass (car (reverse (oref ctxt prefixtypes)))))
         (cond
          ((and (semantic-tag-with-position-p secondclass)
-               (y-or-n-p (format "Could not find `%s'.  Jump to %s? "
-                                 first (semantic-tag-name secondclass))))
+               (y-or-n-p (format-message
+                          "Could not find `%s'.  Jump to %s? "
+                          first (semantic-tag-name secondclass))))
           (semantic-ia--fast-jump-helper secondclass)
           )
          ;; If we missed out on the class of the second item, then
          ;; just visit SECOND.
          ((and (semantic-tag-p second)
-               (y-or-n-p (format "Could not find `%s'.  Jump to %s? "
-                                 first (semantic-tag-name second))))
+               (y-or-n-p (format-message
+                          "Could not find `%s'.  Jump to %s? "
+                          first (semantic-tag-name second))))
           (semantic-ia--fast-jump-helper second)
           ))))