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

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   07/11/09 05:20:59

Index: vc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc.el,v
retrieving revision 1.477
retrieving revision 1.478
diff -u -b -r1.477 -r1.478
--- vc.el       30 Oct 2007 12:43:34 -0000      1.477
+++ vc.el       9 Nov 2007 05:20:55 -0000       1.478
@@ -1930,9 +1930,7 @@
           (message "No changes between %s and %s" rev1-name rev2-name)
           nil)
       (pop-to-buffer (current-buffer))
-      ;; 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))
+      (diff-mode)
       (vc-exec-after `(vc-diff-sentinel ,verbose ,rev1-name ,rev2-name))
       ;; In the async case, we return t even if there are no differences
       ;; because we don't know that yet.