(dired-get-filename): Complain only about "." and "..",

not all directories.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fefd706b0a369618de1984b8fd132b2abdba06e5..9a4172069cbdd34458bcdf3402d13dee359476e9 100644 (file)
--- 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 db66f78d71da12db175dd6059fcde3e5c8d5266c..3aae474a1185099a66753e87f8e897859ca3c0d5 100644 (file)
--- 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))