From: Juri Linkov <juri@jurta.org>
Date: Thu, 20 Sep 2012 09:03:51 +0000 (+0300)
Subject: * lisp/dired-aux.el (dired-diff): Remove (require 'diff) since
X-Git-Tag: emacs-24.2.90~269^2~14
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0876a82d85917a20bd54e8d999d7c5bf5f96b1bc;p=emacs.git

* lisp/dired-aux.el (dired-diff): Remove (require 'diff) since
`diff-latest-backup-file' is now autoloaded.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 99d50511b88..b2e0e7b1d49 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-20  Juri Linkov  <juri@jurta.org>
+
+	* dired-aux.el (dired-diff): Remove (require 'diff) since
+	`diff-latest-backup-file' is now autoloaded.
+
 2012-09-20  Chong Yidong  <cyd@gnu.org>
 
 	* vc/diff.el (diff-latest-backup-file): Autoload.
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 3d3fe491899..afa0e32b3af 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -51,8 +51,6 @@ into this list; they also should call `dired-log' to log the errors.")
 (defconst dired-star-subst-regexp "\\(^\\|[ \t]\\)\\*\\([ \t]\\|$\\)")
 (defconst dired-quark-subst-regexp "\\(^\\|[ \t]\\)\\?\\([ \t]\\|$\\)")
 
-(declare-function diff-latest-backup-file "diff" (fn)) ; actually belongs into files.el
-
 ;;;###autoload
 (defun dired-diff (file &optional switches)
   "Compare file at point with file FILE using `diff'.
@@ -70,7 +68,7 @@ the string of command switches for the third argument of `diff'."
   (interactive
    (let* ((current (dired-get-filename t))
 	  ;; Get the latest existing backup file.
-	  (oldf (progn (require 'diff) (diff-latest-backup-file current)))
+	  (oldf (diff-latest-backup-file current))
 	  ;; Get the file at the mark.
 	  (file-at-mark (if (and transient-mark-mode mark-active)
 			    (save-excursion (goto-char (mark t))