X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/127342224ea0971d14077f9290d91064972c78ca..ab422c4d6899b1442cb6954c1829c1fb656b006c:/lisp/dired-aux.el diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index 3d3fe49189..13443419bd 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -1,7 +1,7 @@ ;;; dired-aux.el --- less commonly used parts of dired -;; Copyright (C) 1985-1986, 1992, 1994, 1998, 2000-2012 -;; Free Software Foundation, Inc. +;; Copyright (C) 1985-1986, 1992, 1994, 1998, 2000-2013 Free Software +;; Foundation, Inc. ;; Author: Sebastian Kremer . ;; Maintainer: FSF @@ -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))