Changeset 4140 for trunk/lisp/complete.el

Timestamp:

08/10/06 11:19:54 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/complete.el (modified) (6 diffs)

trunk/lisp/complete.el

@@ -544 +544 @@
-                                          (file-name-nondirectory (substring str 0 p))
-                                        (substring str 0 p))
-  
-  
+
+
-          (setq p compl)
-          (while p
@@ -553 +553 @@
-                   (setq poss (cons (car p) poss))))
-            (setq p (cdr p)))))
+
+      ;; Handle completion-ignored-extensions
+      (and filename
+           (not (eq mode 'help))
+           (let ((p2 poss))
+
+             ;; Build a regular expression representing the extensions list
+             (or (equal completion-ignored-extensions PC-ignored-extensions)
+                 (setq PC-ignored-regexp
+                       (concat "\\("
+                               (mapconcat
+                                'regexp-quote
+                                (setq PC-ignored-extensions
+                                      completion-ignored-extensions)
+                                "\\|")
+                               "\\)\\'")))
+
+             ;; 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)))
+
+             ;; If there are "good" names, use them
+             (and p (setq poss p))))
-
-      ;; Now we have a list of possible completions
@@ -576 +604 @@
-            (memq mode '(help word)))
-
-        ;; Handle completion-ignored-extensions
-        (and filename
-             (not (eq mode 'help))
-             (let ((p2 poss))
-
-               ;; Build a regular expression representing the extensions list
-               (or (equal completion-ignored-extensions PC-ignored-extensions)
-                   (setq PC-ignored-regexp
-                         (concat "\\("
-                                 (mapconcat
-                                  'regexp-quote
-                                  (setq PC-ignored-extensions
-                                        completion-ignored-extensions)
-                                  "\\|")
-                                 "\\)\\'")))
-
-               ;; 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)))
-
-               ;; If there are "good" names, use them
-               (and p (setq poss p))))
-
-        ;; Is the actual string one of the possible completions?
-        (setq p (and (not (eq mode 'help)) poss))
@@ -624 +624 @@
-            ;; Check if next few letters are the same in all cases
-            (if (and (not (eq mode 'help))
-
+
+
-                (let ((first t) i)
-                  ;; Retain capitalization of user input even if
@@ -670 +671 @@
-                                             skip)
-                                            (mapcar
-
-
-
-
-
-
-
+
+
+
-                                             poss)))
-                              (or (> i 0) (> (length prefix) 0))
@@ -812 +809 @@
-  (with-current-buffer (generate-new-buffer " *Glob Output*")
-    (erase-buffer)
+    (when (and (file-name-absolute-p name)
+               (not (file-directory-p default-directory)))
+      ;; If the current working directory doesn't exist `shell-command'
+      ;; signals an error.  So if the file names we're looking for don't
+      ;; depend on the working directory, switch to a valid directory first.
+      (setq default-directory "/"))
-    (shell-command (concat "echo " name) t)
-    (goto-char (point-min))