Commit 827dc60d authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(dired-make-relative): Ignore the third argument;

never signal an error just bbcause FILE is not in DIR's tree.
parent c9ab42e1
......@@ -1277,12 +1277,10 @@ Optional arg GLOBAL means to replace all matches."
;; dired-get-filename.
(concat (or dir default-directory) file))
(defun dired-make-relative (file &optional dir no-error)
;;"Convert FILE (an absolute file name) to a name relative to DIR.
;; Else error (unless NO-ERROR is non-nil, then FILE is returned unchanged)
;;DIR defaults to default-directory."
;; DIR must be file-name-as-directory, as with all directory args in
;; Emacs Lisp code.
(defun dired-make-relative (file &optional dir ignore)
"Convert FILE (an absolute file name) to a name relative to DIR.
If this is impossible, return FILE unchanged.
DIR must be a directory name, not a file name."
(or dir (setq dir default-directory))
;; This case comes into play if default-directory is set to
;; use ~.
......@@ -1290,9 +1288,9 @@ Optional arg GLOBAL means to replace all matches."
(setq dir (expand-file-name dir)))
(if (string-match (concat "^" (regexp-quote dir)) file)
(substring file (match-end 0))
(if no-error
file
(error "%s: not in directory tree growing at %s" file dir))))
;;; (or no-error
;;; (error "%s: not in directory tree growing at %s" file dir))
file))
;;; Functions for finding the file name in a dired buffer line.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment