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

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/03/29 00:17:56

Index: vc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc.el,v
retrieving revision 1.564
retrieving revision 1.565
diff -u -b -r1.564 -r1.565
--- vc.el       28 Mar 2008 19:32:47 -0000      1.564
+++ vc.el       29 Mar 2008 00:17:53 -0000      1.565
@@ -2750,6 +2750,9 @@
     (define-key map [register]
       '(menu-item "Register" vc-status-register
                  :help "Register file set into the version control system"))
+    (define-key map [update]
+      '(menu-item "Update" vc-update
+                 :help "Update the current fileset's files to their tip 
revisions"))
     ;; vc-print-log uses the current buffer, not a file.
     ;; (define-key map [log]
     ;;  '(menu-item "Show history" vc-status-print-log
@@ -2815,6 +2818,7 @@
     ;; VC commands.
     (define-key map "=" 'vc-diff)
     (define-key map "a" 'vc-status-register)
+    (define-key map "+" 'vc-update)
     ;; Can't be "g" (as in vc map), so "A" for "Annotate".
     (define-key map "A" 'vc-annotate)
     ;; vc-print-log uses the current buffer, not a file.
@@ -3364,7 +3368,8 @@
 changes from the current branch are merged into the working file."
   (interactive)
   (dolist (file (vc-deduce-fileset))
-    (if (buffer-modified-p (get-file-buffer file))
+    (when (let ((buf (get-file-buffer file)))
+           (and buf (buffer-modified-p buf)))
        (error "Please kill or save all modified buffers before updating."))
     (if (vc-up-to-date-p file)
        (vc-checkout file nil t)