# HG changeset patch # User Juanma Barranquero # Date 1054850413 0 # Node ID 031a70df49c95b587bb213571ef369c755b46642 # Parent bd8689acb25b119937624a8ad0f3b0be81de3cf0 (dired-get-filename): Don't err for . and .. for calls from dired-add-entry. diff -r bd8689acb25b -r 031a70df49c9 lisp/dired.el --- a/lisp/dired.el Thu Jun 05 20:07:16 2003 +0000 +++ b/lisp/dired.el Thu Jun 05 22:00:13 2003 +0000 @@ -1367,7 +1367,7 @@ (defun dired-find-file () "In Dired, visit the file or directory named on this line." (interactive) - ;; Bind `find-file-run-dired' so that the command works on directories + ;; Bind `find-file-run-dired' so that the command works on directories ;; too, independent of the user's setting. (let ((find-file-run-dired t)) (find-file (dired-get-file-for-visit)))) @@ -1487,13 +1487,13 @@ (cond ((null file) nil) + ((eq localp 'verbatim) + file) ((and (not no-error-if-not-filep) (save-excursion (beginning-of-line) (looking-at dired-re-dir))) (error "Cannot operate on `.' or `..'")) - ((eq localp 'verbatim) - file) ((and (eq localp 'no-dir) already-absolute) (file-name-nondirectory file)) (already-absolute @@ -1519,7 +1519,7 @@ (concat (dired-current-directory localp) file))))) (defun dired-string-replace-match (regexp string newtext - &optional literal global) + &optional literal global) "Replace first match of REGEXP in STRING with NEWTEXT. If it does not match, nil is returned instead of the new string. Optional arg LITERAL means to take NEWTEXT literally.