diff options
| author | Andreas Schwab <schwab@suse.de> | 2003-06-09 17:05:55 +0000 |
|---|---|---|
| committer | Andreas Schwab <schwab@suse.de> | 2003-06-09 17:05:55 +0000 |
| commit | 9b341343a9bdd70c6a8fc1abf166785acad460f8 (patch) | |
| tree | f3ea6fd235d214a3147d38c24e2700f8011b3e52 | |
| parent | 15a893fa2841ca1ea6209c21c995846f413b5cbd (diff) | |
| download | emacs-9b341343a9bdd70c6a8fc1abf166785acad460f8.tar.gz emacs-9b341343a9bdd70c6a8fc1abf166785acad460f8.tar.bz2 emacs-9b341343a9bdd70c6a8fc1abf166785acad460f8.zip | |
(dired-get-filename): Complain only about "." and "..",
not all directories.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/dired.el | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fefd706b0a3..9a4172069cb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2003-06-09 Andreas Schwab <schwab@suse.de> + + * dired.el (dired-get-filename): Complain only about "." and "..", + not all directories. + 2003-06-08 Nick Roberts <nick@nick.uklinux.net> * gdb-ui.el (gdb-get-current-frame, gdb-frame-handler): Use Gdb diff --git a/lisp/dired.el b/lisp/dired.el index db66f78d71d..3aae474a118 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -1490,9 +1490,7 @@ Optional arg NO-ERROR-IF-NOT-FILEP means return nil if no filename on ((eq localp 'verbatim) file) ((and (not no-error-if-not-filep) - (save-excursion - (beginning-of-line) - (looking-at dired-re-dir))) + (member (file-name-nondirectory file) '("." ".."))) (error "Cannot operate on `.' or `..'")) ((and (eq localp 'no-dir) already-absolute) (file-name-nondirectory file)) |