[Emacs-diffs] /srv/bzr/emacs/trunk r110103: * lisp/dired-aux.el (dired-diff): Add (require 'diff) because

[Juri Linkov]

------------------------------------------------------------
revno: 110103
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Wed 2012-09-19 23:09:55 +0300
message:
  * lisp/dired-aux.el (dired-diff): Add (require 'diff) because
  `diff-latest-backup-file' is not autoloaded.
  (dired-do-chxxx, dired-do-chmod): Set `no-error-if-not-filep' arg
  of `dired-get-filename' to t to not report error when there is
  no default file on the current line.
modified:
  lisp/ChangeLog
  lisp/dired-aux.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-19 19:59:52 +0000
+++ b/lisp/ChangeLog    2012-09-19 20:09:55 +0000
@@ -1,3 +1,11 @@
+2012-09-19  Juri Linkov  <address@hidden>
+
+       * dired-aux.el (dired-diff): Add (require 'diff) because
+       `diff-latest-backup-file' is not autoloaded.
+       (dired-do-chxxx, dired-do-chmod): Set `no-error-if-not-filep' arg
+       of `dired-get-filename' to t to not report error when there is
+       no default file on the current line.
+
 2012-09-19  Stefan Monnier  <address@hidden>
 
        * emacs-lisp/macroexp.el (macroexp--funcall-if-compiled): Rename from

=== modified file 'lisp/dired-aux.el'
--- a/lisp/dired-aux.el 2012-09-18 23:40:39 +0000
+++ b/lisp/dired-aux.el 2012-09-19 20:09:55 +0000
@@ -70,7 +70,7 @@
   (interactive
    (let* ((current (dired-get-filename t))
          ;; Get the latest existing backup file.
-         (oldf (diff-latest-backup-file current))
+         (oldf (progn (require 'diff) (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))
@@ -248,7 +248,7 @@
   ;; 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 +300,7 @@
   (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