[Emacs-diffs] /srv/bzr/emacs/trunk r110111: * lisp/dired-aux.el (dired-diff): Remove (require 'diff) since

[Juri Linkov]

------------------------------------------------------------
revno: 110111
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Thu 2012-09-20 12:03:51 +0300
message:
  * lisp/dired-aux.el (dired-diff): Remove (require 'diff) since
  `diff-latest-backup-file' is now autoloaded.
modified:
  lisp/ChangeLog
  lisp/dired-aux.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-20 04:29:04 +0000
+++ b/lisp/ChangeLog    2012-09-20 09:03:51 +0000
@@ -1,3 +1,8 @@
+2012-09-20  Juri Linkov  <address@hidden>
+
+       * dired-aux.el (dired-diff): Remove (require 'diff) since
+       `diff-latest-backup-file' is now autoloaded.
+
 2012-09-20  Chong Yidong  <address@hidden>
 
        * vc/diff.el (diff-latest-backup-file): Autoload.

=== modified file 'lisp/dired-aux.el'
--- a/lisp/dired-aux.el 2012-09-19 20:09:55 +0000
+++ b/lisp/dired-aux.el 2012-09-20 09:03:51 +0000
@@ -51,8 +51,6 @@
 (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 @@
   (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))