aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2016-09-23 11:08:34 +0300
committerEli Zaretskii2016-09-23 11:08:34 +0300
commitf6fa160e91e264f0a3f797b56e8605dbdb32cb76 (patch)
tree8496f07670f5c9ceacd5dfb0492dc2484cdecc6e
parent2b8c5f0bffd329616f26721325da57f4ac06cabb (diff)
downloademacs-f6fa160e91e264f0a3f797b56e8605dbdb32cb76.tar.gz
emacs-f6fa160e91e264f0a3f797b56e8605dbdb32cb76.zip
Fix 'dired-compress-files'
* lisp/dired-aux.el (dired-do-compress-to): Make sure the archive file name is fully expanded by running it through 'expand-file-name'. Suggested by Drew Adams <drew.adams@oracle.com>. (Bug#24486) Doc fix. * lisp/dired.el: Regenerated changes in autoloads.
-rw-r--r--lisp/dired-aux.el8
-rw-r--r--lisp/dired.el2
2 files changed, 5 insertions, 5 deletions
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index b9111a8d5b4..204ee13006a 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -937,12 +937,12 @@ output file. %i path(s) are relative, while %o is absolute.")
937;;;###autoload 937;;;###autoload
938(defun dired-do-compress-to () 938(defun dired-do-compress-to ()
939 "Compress selected files and directories to an archive. 939 "Compress selected files and directories to an archive.
940You are prompted for the archive name. 940Prompt for the archive file name.
941The archiving command is chosen based on the archive name extension and 941Choose the archiving command based on the archive file-name extension
942`dired-compress-files-alist'." 942and `dired-compress-files-alist'."
943 (interactive) 943 (interactive)
944 (let* ((in-files (dired-get-marked-files)) 944 (let* ((in-files (dired-get-marked-files))
945 (out-file (read-file-name "Compress to: ")) 945 (out-file (expand-file-name (read-file-name "Compress to: ")))
946 (rule (cl-find-if 946 (rule (cl-find-if
947 (lambda (x) 947 (lambda (x)
948 (string-match (car x) out-file)) 948 (string-match (car x) out-file))
diff --git a/lisp/dired.el b/lisp/dired.el
index b838e649848..92aa65a9085 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3919,7 +3919,7 @@ Ask means pop up a menu for the user to select one of copy, move or link."
3919 3919
3920;;; Start of automatically extracted autoloads. 3920;;; Start of automatically extracted autoloads.
3921 3921
3922;;;### (autoloads nil "dired-aux" "dired-aux.el" "8346506b9ef7167fd55b5eac7e6617a1") 3922;;;### (autoloads nil "dired-aux" "dired-aux.el" "c1ea036dd5d740f00b18a76bfb32f887")
3923;;; Generated autoloads from dired-aux.el 3923;;; Generated autoloads from dired-aux.el
3924 3924
3925(autoload 'dired-diff "dired-aux" "\ 3925(autoload 'dired-diff "dired-aux" "\