Use find-file-hook instead of find-file-hooks.

[bpt/emacs.git] / lisp / vc.el

diff --git a/lisp/vc.el b/lisp/vc.el
index 0069c12..f2a044f 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -566,6 +566,9 @@
 ;;
 ;; - "snapshots" should be renamed to "branches", and thoroughly reworked.
 ;;
+;; - do not default to RCS anymore when the current directory is not
+;;   controlled by any VCS and the user does C-x v v
+;;
 
 ;;; Code:
 
@@ -1036,7 +1039,11 @@ Else, add CODE to the process' sentinel."
             ;; Deliberate overstatement, but power law respected.
             ;; (The message is ephemeral, so we make it loud.)  --ttn
             (propertize " (incomplete/in progress)"
-                        'face 'compilation-warning
+                        'face (if (featurep 'compile)
+                                  ;; ttn's preferred loudness
+                                  'compilation-warning
+                                ;; suitably available fallback
+                                font-lock-warning-face)
                        'help-echo
                        "A VC command is in progress in this buffer"))
       (let ((previous (process-sentinel proc)))
@@ -2973,7 +2980,7 @@ changes from the current branch are merged into the working file."
     (if (buffer-modified-p (get-file-buffer file))
        (error "Please kill or save all modified buffers before updating."))
     (if (vc-up-to-date-p file)
-       (vc-checkout file nil "")
+       (vc-checkout file nil t)
       (if (eq (vc-checkout-model file) 'locking)
          (if (eq (vc-state file) 'edited)
              (error "%s"