Initial revision

[gnu-emacs] / lisp / complete.el

diff --git a/lisp/complete.el b/lisp/complete.el
index a578f22cc542279172de927da9c217454a10dba2..e51a9f3340211b62092f0213a6442aabe284ef8d 100644 (file)
--- a/lisp/complete.el
+++ b/lisp/complete.el
@@ -128,7 +128,7 @@ If non-nil and non-t, the first character is taken literally only for file name
 completion."
   :type '(choice (const :tag "delimiter" nil)
                 (const :tag "literal" t)
-                (sexp :tag "find-file" :format "%t\n" find-file))
+                (other :tag "find-file" find-file))
   :group 'partial-completion)
 
 (defcustom PC-meta-flag t
@@ -562,10 +562,12 @@ of `minibuffer-completion-table' and the minibuffer contents.")
                                  "\\|")
                                 "\\)\\'")))
 
-              ;; Check if there are any without an ignored extension
+              ;; Check if there are any without an ignored extension.
+              ;; Also ignore `.' and `..'.
               (setq p nil)
               (while p2
                 (or (string-match PC-ignored-regexp (car p2))
+                    (string-match "\\(\\`\\|/\\)[.][.]?/?\\'" (car p2))
                     (setq p (cons (car p2) p)))
                 (setq p2 (cdr p2)))