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

[Eric S. Raymond]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Eric S. Raymond <esr>   08/05/09 20:17:51

Index: vc-dispatcher.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-dispatcher.el,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- vc-dispatcher.el    9 May 2008 20:07:01 -0000       1.34
+++ vc-dispatcher.el    9 May 2008 20:17:50 -0000       1.35
@@ -1270,16 +1270,6 @@
 
 (put 'vc-dir-mode 'mode-class 'special)
 
-(defun vc-buffer-sync (&optional not-urgent)
-  "Make sure the current buffer and its working file are in sync.
-NOT-URGENT means it is ok to continue if the user says not to save."
-  (when (buffer-modified-p)
-    (if (or vc-suppress-confirm
-           (y-or-n-p (format "Buffer %s modified; save it? " (buffer-name))))
-       (save-buffer)
-      (unless not-urgent
-       (error "Aborted")))))
-
 (defun vc-dispatcher-browsing ()
   "Are we in a directory browser buffer?"
   (derived-mode-p 'vc-dir-mode))
@@ -1295,7 +1285,7 @@
             (setq member t))))
     member))
 
-(defun vc-dispatcher-selection-set ()
+(defun vc-dispatcher-selection-set (&optional observer)
   "Deduce a set of files to which to apply an operation.  Return the fileset.
 If we're in a directory display, the fileset is the list of marked files (if
 there is one) else the file on the curreent line.  If not in a directory
@@ -1320,10 +1310,9 @@
     ;; We assume, in order to avoid unpleasant surprises to the user,
     ;; that a fileset is not in good shape to be handed to the user if the
     ;; buffers visiting the fileset don't match the on-disk contents.
-    ;; This is actually untrue for operations like `print-log' (or `diff'
-    ;; between two revisions), so maybe this should be moved elsewhere.
+    (if (not observer)
     (save-some-buffers
-     nil (lambda () (vc-dispatcher-in-fileset-p files)))
+        nil (lambda () (vc-dispatcher-in-fileset-p files))))
     files))
 
 ;; arch-tag: 7d08b17f-5470-4799-914b-bfb9fcf6a246