[Emacs-diffs] emacs-25 a71560b 1/3: Implement vc-mtn-find-ignore-file, fix some doc strings

[Stephen Leake]

branch: emacs-25
commit a71560b0e3011c04dc86546b1da51b828cdf040a
Author: Stephen Leake <address@hidden>
Commit: Stephen Leake <address@hidden>

    Implement vc-mtn-find-ignore-file, fix some doc strings
    
    * lisp/cedet/cedet-global.el (cedet-gnu-global-root): Improve doc string.
    
    * lisp/cedet/ede/locate.el (initialize-instance): Improve doc string.
    
    * lisp/vc/vc-git.el (vc-git-find-ignore-file): Fix doc string.
    
    * lisp/vc/vc-mtn.el (vc-mtn-find-ignore-file): New function.
---
 lisp/cedet/cedet-global.el |    6 +++---
 lisp/cedet/ede/locate.el   |    2 +-
 lisp/vc/vc-git.el          |    2 +-
 lisp/vc/vc-mtn.el          |    4 ++++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lisp/cedet/cedet-global.el b/lisp/cedet/cedet-global.el
index def023d..f1cc3c9 100644
--- a/lisp/cedet/cedet-global.el
+++ b/lisp/cedet/cedet-global.el
@@ -127,9 +127,9 @@ Signal an error if Gnu global not available."
   (message "%s" (cedet-gnu-global-root)))
 
 (defun cedet-gnu-global-root (&optional dir)
-  "Return the root of any GNU Global scanned project.
-If a default starting DIR is not specified, the current buffer's
-`default-directory' is used."
+  "Return the root of any GNU Global scanned project containing DIR.
+Returns nil if no GNU Global project can be found.
+DIR defaults to `default-directory'."
   (let ((default-directory (or dir default-directory)))
     (with-current-buffer (cedet-gnu-global-call (list "-pq"))
       (goto-char (point-min))
diff --git a/lisp/cedet/ede/locate.el b/lisp/cedet/ede/locate.el
index abbfd60..38d2388 100644
--- a/lisp/cedet/ede/locate.el
+++ b/lisp/cedet/ede/locate.el
@@ -231,7 +231,7 @@ variable `cedet-global-command'.")
   (let* ((default-directory (oref loc root))
         (root (cedet-gnu-global-root)))
     (when (not root)
-      (error "Cannot use GNU Global in %s"
+      (error "No GNU Global project found for %s"
             (oref loc root))))
   )
 
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 560d303..1c43e3e 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -714,7 +714,7 @@ It is based on `log-edit-mode', and has Git-specific 
extensions.")
      "cat-file" "blob" (concat (if rev rev "HEAD") ":" fullname))))
 
 (defun vc-git-find-ignore-file (file)
-  "Return the root directory of the repository of FILE."
+  "Return the git ignore file that controls FILE."
   (expand-file-name ".gitignore"
                    (vc-git-root file)))
 
diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el
index 115a658..0e2e16b 100644
--- a/lisp/vc/vc-mtn.el
+++ b/lisp/vc/vc-mtn.el
@@ -102,6 +102,10 @@ switches."
   "Return the administrative directory of FILE."
   (expand-file-name vc-mtn-admin-dir (vc-mtn-root file)))
 
+(defun vc-mtn-find-ignore-file (file)
+  "Return the mtn ignore file that controls FILE."
+  (expand-file-name ".mtnignore" (vc-git-root file)))
+
 (defun vc-mtn-registered (file)
   (let ((root (vc-mtn-root file)))
     (when root