* vc/vc-hooks.el (vc-find-file-hook): Don't ask about following links

if we can't get user input.

Fixes: debbugs:6567

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0be77ed..96c390b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2013-02-06  Glenn Morris  <rgm@gnu.org>
 
+       * vc/vc-hooks.el (vc-find-file-hook): Don't ask about following links
+       if we can't get user input.  (Bug#6567)
+
        * startup.el (command-line): If simple.el is missing,
        test and warn about for some possible causes.
 

diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 541b0c0..818b37b 100644 (file)
--- 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