summaryrefslogtreecommitdiff
path: root/lisp/vc/vc.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-11-04 15:02:03 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2016-11-04 15:02:03 -0700
commitae0a1a890ec7b885e85cd945a21ca42fed80df3d (patch)
tree495f1d851cb3a43a0e677bff9c09d4211a35fbde /lisp/vc/vc.el
parent66b5222c3cd72839bf72e0b2a03912719c930451 (diff)
parentacae275b2752357497a2411876b83240ce7c8aec (diff)
downloademacs-ae0a1a890ec7b885e85cd945a21ca42fed80df3d.tar.gz
Merge from origin/emacs-25
acae275 ; Spelling fixes d8fac73 Update README for precompiled windows Emacs. 23570fd Clarify documentation of 'vc-responsible-backend' wrt symlinks f708cb2 Clarify doc string of 'transpose-sexps' cd05b1d Fix docstring of 'browse-url-firefox-new-window-is-tab' bdc89eb Improve documentation of 'font-lock-remove-keywords' 4a0c590 Fix documentation of the command summary key 0221b7a Mark relocation workarounds with REL_ALLOC
Diffstat (limited to 'lisp/vc/vc.el')
-rw-r--r--lisp/vc/vc.el6
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index ac020d09539..2ddf4e19e1f 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -959,7 +959,11 @@ use."
If FILE is already registered, return the
backend of FILE. If FILE is not registered, then the
first backend in `vc-handled-backends' that declares itself
-responsible for FILE is returned."
+responsible for FILE is returned.
+
+Note that if FILE is a symbolic link, it will not be resolved --
+the responsible backend system for the symbolic link itself will
+be reported."
(or (and (not (file-directory-p file)) (vc-backend file))
(catch 'found
;; First try: find a responsible backend. If this is for registration,