Merge from origin/emacs-25

[gnu-emacs] / lisp / progmodes / ada-xref.el

diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index 6b611e6f99b15ec5ea32e698e06a93441affccf6..b3248d3f13ba4bfcb603810bfe70a47e415c6a45 100644 (file)
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -1,6 +1,6 @@
 ;; ada-xref.el --- for lookup and completion in Ada mode
 
-;; Copyright (C) 1994-2015 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2016 Free Software Foundation, Inc.
 
 ;; Author: Markus Heritsch <Markus.Heritsch@studbox.uni-stuttgart.de>
 ;;      Rolf Ebert <ebert@inf.enst.fr>
@@ -174,7 +174,7 @@ If GVD is not the debugger used, nothing happens."
   :type 'boolean :group 'ada)
 
 (defcustom ada-xref-search-with-egrep t
-  "If non-nil, use egrep to find the possible declarations for an entity.
+  "If non-nil, use grep -E to find the possible declarations for an entity.
 This alternate method is used when the exact location was not found in the
 information provided by GNAT.  However, it might be expensive if you have a lot
 of sources, since it will search in all the files in your project."
@@ -236,7 +236,7 @@ we need to use `/d' or the drive is never changed.")
   "Associative list of project files with properties.
 It has the format: (project project ...)
 A project has the format: (project-file . project-plist)
-\(See 'apropos plist' for operations on property lists).
+\(See `apropos plist' for operations on property lists).
 See `ada-default-prj-properties' for the list of valid properties.
 The current project is retrieved with `ada-xref-current-project'.
 Properties are retrieved with `ada-xref-get-project-field', set with
@@ -286,7 +286,7 @@ On Windows systems, this will properly handle .exe extension as well."
                    (ada-find-file-in-dir (concat exec-name ".exe") exec-path))))
     (if result
        result
-      (error "'%s' not found in path" exec-name))))
+      (error "`%s' not found in path" exec-name))))
 
 (defun ada-initialize-runtime-library (cross-prefix)
   "Initialize the variables for the runtime library location.
@@ -420,7 +420,7 @@ As a special case, ${current} is replaced with the name of the current
 file, minus extension but with directory, and ${full_current} is
 replaced by the name including the extension."
 
-  (while (string-match "\\(-[^-\$IO]*[IO]\\)?\${\\([^}]+\\)}" cmd-string)
+  (while (string-match "\\(-[^-$IO]*[IO]\\)?${\\([^}]+\\)}" cmd-string)
     (let (value
          (name (match-string 2 cmd-string)))
       (cond
@@ -667,7 +667,7 @@ the same base name as the Ada file, but extension given by
 `ada-prj-file-extension' (default .adp).  If not found, search for *.adp
 in the current directory; if several are found, and NO-USER-QUESTION
 is non-nil, prompt the user to select one.  If none are found, return
-'default.adp'."
+\"default.adp\"."
 
   (let (selected)
 
@@ -954,7 +954,7 @@ Return new value of PROJECT."
        (append (mapcar 'directory-file-name compilation-search-path)
                ada-search-directories))
 
-  ;; return 't', for decent display in message buffer when called interactively
+  ;; return t, for decent display in message buffer when called interactively
   t)
 
 (defun ada-find-references (&optional pos arg local-only)
@@ -1724,7 +1724,7 @@ Information is extracted from the ali file."
                (concat "^"    (ada-line-of identlist)
                        "."    (ada-column-of identlist)
                        "[ *]" (ada-name-of identlist)
-                       "[{\[\(<= ]?\\(.*\\)$") bound t))
+                       "[{[(<= ]?\\(.*\\)$") bound t))
          (if declaration-found
              (ada-set-on-declaration identlist t))
          ))
@@ -1756,7 +1756,7 @@ Information is extracted from the ali file."
                   (concat
                    "^[0-9]+.[0-9]+[ *]"
                    (ada-name-of identlist)
-                   "[ <{=\(\[]\\(.\\|\n\\.\\)*\\<"
+                   "[ <{=([]\\(.\\|\n\\.\\)*\\<"
                    (ada-line-of identlist)
                    "[^0-9]"
                    (ada-column-of identlist) "\\>")
@@ -1779,7 +1779,7 @@ Information is extracted from the ali file."
              (forward-line -1)
              (beginning-of-line))
            (unless (looking-at (concat "[0-9]+.[0-9]+[ *]"
-                                       (ada-name-of identlist) "[ <{=\(\[]"))
+                                       (ada-name-of identlist) "[ <{=([]"))
              (setq declaration-found nil))))
 
       ;; Still no success ! The ali file must be too old, and we need to
@@ -2013,7 +2013,7 @@ This function should be used when the standard algorithm that parses the
 exist.
 This function attempts to find the possible declarations for the identifier
 anywhere in the object path.
-This command requires the external `egrep' program to be available.
+This command requires the external `grep' program to be available.
 
 This works well when one is using an external library and wants to find
 the declaration and documentation of the subprograms one is using."