mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/dired-aux.el (dired-diff): Remove (require 'diff) since

Browse source 
`diff-latest-backup-file' is now autoloaded.
This commit is contained in:
Juri Linkov 2012-09-20 12:03:51 +03:00
parent 9f7c28f0f6
commit 0876a82d85
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/dired-aux.el
View file

@ -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))