[Emacs-diffs] /srv/bzr/emacs/trunk r111683: * vc/vc-hooks.el (vc-find-file-hook): Don't ask about following links

[Glenn Morris]

------------------------------------------------------------
revno: 111683
fixes bug: http://debbugs.gnu.org/6567
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-02-06 00:27:41 -0800
message:
  * vc/vc-hooks.el (vc-find-file-hook): Don't ask about following links
  if we can't get user input.
modified:
  lisp/ChangeLog
  lisp/vc/vc-hooks.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-02-06 02:03:35 +0000
+++ b/lisp/ChangeLog    2013-02-06 08:27:41 +0000
@@ -1,5 +1,8 @@
 2013-02-06  Glenn Morris  <address@hidden>
 
+       * 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.
 

=== modified file 'lisp/vc/vc-hooks.el'
--- a/lisp/vc/vc-hooks.el       2013-02-01 08:44:10 +0000
+++ b/lisp/vc/vc-hooks.el       2013-02-06 08:27:41 +0000
@@ -866,6 +866,13 @@
                 (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