Update copyright notices for 2013.

[bpt/emacs.git] / lisp / dired-aux.el

diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 7ba6705..1344341 100644 (file)
--- 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 <sk@thp.uni-koeln.de>.
 ;; 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'.
@@ -248,7 +246,7 @@ List has a form of (file-name full-file-name (attribute-list))."
   ;; ARG describes which files to use, as in `dired-get-marked-files'.
   (let* ((files (dired-get-marked-files t arg))
         ;; The source of default file attributes is the file at point.
-        (default-file (dired-get-filename t))
+        (default-file (dired-get-filename t t))
         (default (when default-file
                    (cond ((eq op-symbol 'touch)
                           (format-time-string
@@ -300,7 +298,7 @@ into the minibuffer."
   (interactive "P")
   (let* ((files (dired-get-marked-files t arg))
         ;; The source of default file attributes is the file at point.
-        (default-file (dired-get-filename t))
+        (default-file (dired-get-filename t t))
         (modestr (when default-file
                    (nth 8 (file-attributes default-file))))
         (default