summaryrefslogtreecommitdiff
path: root/lisp/vc/vc-hooks.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2013-02-06 00:27:41 -0800
committerGlenn Morris <rgm@gnu.org>2013-02-06 00:27:41 -0800
commit5fd03926b34b26255bbde9dc1696183625f8be03 (patch)
tree6895885aabd257a6594dc4b375e8b92f3b8f5cc5 /lisp/vc/vc-hooks.el
parente86762ec4135da4018a76d173b91e411b5a30dbb (diff)
downloademacs-5fd03926b34b26255bbde9dc1696183625f8be03.tar.gz
* vc/vc-hooks.el (vc-find-file-hook): Don't ask about following links
if we can't get user input. Fixes: debbugs:6567
Diffstat (limited to 'lisp/vc/vc-hooks.el')
-rw-r--r--lisp/vc/vc-hooks.el7
1 files changed, 7 insertions, 0 deletions
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 541b0c04b0b..818b37b3c34 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -866,6 +866,13 @@ current, and kill the buffer that visits the link."
(message
"Warning: symbolic link to %s-controlled source file" link-type))
((or (not (eq vc-follow-symlinks 'ask))
+ ;; Assume we cannot ask, default to yes.
+ noninteractive
+ ;; Copied from server-start. Seems like there should
+ ;; be a better way to ask "can we get user input?"...
+ (and (daemonp)
+ (null (cdr (frame-list)))
+ (eq (selected-frame) terminal-frame))
;; If we already visited this file by following
;; the link, don't ask again if we try to visit
;; it again. GUD does that, and repeated questions