emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/lisp/vc.el,v


From: Eric S. Raymond
Subject: [Emacs-diffs] Changes to emacs/lisp/vc.el,v
Date: Thu, 11 Oct 2007 15:27:17 +0000

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Eric S. Raymond <esr>   07/10/11 15:27:17

Index: vc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc.el,v
retrieving revision 1.466
retrieving revision 1.467
diff -u -b -r1.466 -r1.467
--- vc.el       11 Oct 2007 15:10:32 -0000      1.466
+++ vc.el       11 Oct 2007 15:27:17 -0000      1.467
@@ -1424,7 +1424,7 @@
        (setq revision (read-string "Branch, revision, or backend to move to: 
"))
        (let ((vsym (intern-soft (upcase revision))))
          (if (member vsym vc-handled-backends)
-             (mapc (lambda (file) vc-transfer-file file vsym) files)
+             (mapc (lambda (file) (vc-transfer-file file vsym)) files)
            (mapc (lambda (file) 
                    (vc-checkout file (eq model 'implicit) revision))))))
        ((not (eq model 'implicit))
@@ -1881,12 +1881,14 @@
        ;; Gnus-5.8.5 sets up an autoload for diff-mode, even if it's
        ;; not available.  Work around that.
        (if (require 'diff-mode nil t) (diff-mode))
+       (when verbose
+         (let (buffer-read-only t)
        (goto-char (point-max))
        (if verbose
            (insert (format "\n\nDiffs between %s and %s end here." rev1-name 
rev2-name)))
        (goto-char (point-min))
        (if verbose
-           (insert (format "Diffs between %s and %s:\n\n" rev1-name 
rev2-name)))
+               (insert (format "Diffs between %s and %s:\n\n" rev1-name 
rev2-name)))))
        (shrink-window-if-larger-than-buffer)
        t)
     (progn
@@ -1906,7 +1908,7 @@
         (coding-system-for-read 
          (if files (vc-coding-system-for-diff (car files)) 'undecided)))
     (vc-setup-buffer "*vc-diff*")
-    (message "Finding changes in..." filenames)
+    (message "Finding changes in %s..." filenames)
     ;; Many backends don't handle well the case of a file that has been 
     ;; added but not yet committed to the repo (notably CVS and Subversion).  
     ;; Do that work here so the backends don't have to futz with it.
@@ -2007,8 +2009,9 @@
 "
 
   (interactive "P")
-  (cond ((not (vc-contains-version-controlled-file default-directory))
-        (error "No version-controlled files directly beneath default 
directory"))
+  (cond 
+   ;;((not (vc-contains-version-controlled-file default-directory))
+   ;;(error "No version-controlled files directly beneath default directory"))
        (historic
         (call-interactively 'vc-history-diff))
        (t




reply via email to

[Prev in Thread] Current Thread [Next in Thread]