Mercurial > emacs
changeset 16794:2de3fd99ae88
(dired-make-relative): Ignore the third argument;
never signal an error just bbcause FILE is not in DIR's tree.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Tue, 31 Dec 1996 18:29:49 +0000 |
| parents | f932e8b3c525 |
| children | 2a9ae2be61ae |
| files | lisp/dired.el |
| diffstat | 1 files changed, 7 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/dired.el Tue Dec 31 04:55:55 1996 +0000 +++ b/lisp/dired.el Tue Dec 31 18:29:49 1996 +0000 @@ -1277,12 +1277,10 @@ ;; 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 @@ (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.