X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/f5f727f8ffa2e674601875b2f2fe7ce3f0030c93..ae2777b77ab61c109b92e0b7fd00fc56f9afb61f:/lisp/complete.el

diff --git a/lisp/complete.el b/lisp/complete.el
index a578f22cc5..e51a9f3340 100644
--- 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)))