Changeset 4098 for trunk/lisp/complete.el

Timestamp:

07/01/06 08:27:06 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

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

trunk/lisp/complete.el

@@ -197 +197 @@
-command begins with that sequence of characters, and
-\\[find-file] f_b.c TAB might complete to foo_bar.c if that file existed and no
-
+s
-
-Unless `PC-disable-includes' is non-nil, the `<...>' sequence is interpreted
@@ -235 +235 @@
-   (if partial-completion-mode 'add-hook 'remove-hook)
-   'choose-completion-string-functions
-
+
+
+
-  ;; Build the env-completion and mapping table.
-  (when (and partial-completion-mode (null PC-env-vars-alist))
@@ -359 +361 @@
-of `minibuffer-completion-table' and the minibuffer contents.")
-
+;; Returns the sequence of non-delimiter characters that follow regexp in string.
+(defun PC-chunk-after (string regexp)
+  (if (not (string-match regexp string))
+      (let ((message (format "String %s didn't match regexp %s" string regexp)))
+        (message message)
+        (error message)))
+  (let ((result (substring string (match-end 0))))
+    ;; result may contain multiple chunks
+    (if (string-match PC-delim-regex result)
+        (setq result (substring result 0 (match-beginning 0))))
+    result))
+
+(defun test-completion-ignore-case (str table pred)
+  "Like `test-completion', but ignores case when possible."
+  ;; Binding completion-ignore-case to nil ensures, for compatibility with
+  ;; standard completion, that the return value is exactly one of the
+  ;; possibilities.  Do this binding only if pred is nil, out of paranoia;
+  ;; perhaps it is safe even if pred is non-nil.
+  (if pred
+      (test-completion str table pred)
+    (let ((completion-ignore-case nil))
+      (test-completion str table pred))))
+
-(defun PC-do-completion (&optional mode beg end)
-  (or beg (setq beg (minibuffer-prompt-end)))
@@ -365 +390 @@
-         (pred minibuffer-completion-predicate)
-         (filename (funcall PC-completion-as-file-name-predicate))
-
+         ; non-nil only if a filename is being completed
-         (dirlength 0)
-         (str (buffer-substring beg end))
@@ -380 +405 @@
-    ;; Check if buffer contents can already be considered complete
-    (if (and (eq mode 'exit)
-
+-ignore-case
-        'complete
-
@@ -599 +624 @@
-            ;; Check if next few letters are the same in all cases
-            (if (and (not (eq mode 'help))
-""
+(PC-chunk-after basestr skip)
-                (let ((first t) i)
+                  ;; Retain capitalization of user input even if
+                  ;; completion-ignore-case is set.
-                  (if (eq mode 'word)
-                      (setq prefix (PC-chop-word prefix basestr)))
-                  (goto-char (+ beg (length dirname)))
-                  (while (and (progn
-
+ ; index into prefix string
-                                (while (< i (length prefix))
-                                  (if (and (< (point) end)
-
-
+
+
+
-                                      (forward-char 1)
-                                    (if (and (< (point) end)
-or (
+
-                                                      (memq (aref prefix i)
-
-
-
-
+
+
-                                        (progn
-                                          (delete-char 1)
-
+
+
+
-                                      (and filename (looking-at "\\*")
-                                           (progn
-                                             (delete-char 1)
-                                             (setq end (1- end))))
-      (setq improved t)
+       (setq improved t
-                                    (insert (substring prefix i (1+ i)))
-    (setq end (1+ end
+       (setq end (1+ end))
-                                  (setq i (1+ i)))
-                                (or pt (setq pt (point)))
@@ -635 +663 @@
-                                                 PC-ndelims-regex)
-                                    prefix (try-completion
-
+
+
+
+
+
+
-                                            (mapcar
-                                             (function
@@ -667 +700 @@
-                  ;; We changed it... enough to be complete?
-                  (and (eq mode 'exit)
-
+-ignore-case
-
-                ;; If totally ambiguous, display a list of completions
@@ -951 +984 @@
-      (let* ((string (ad-get-arg 0))
-             (action (ad-get-arg 2))
-match-string 1 string
+substring string (match-beginning 1) (match-end 1)
-             (str2 (substring string (match-beginning 0)))
-             (completion-table
-
-
+
-                      (PC-include-file-all-completions
-                       name (PC-include-file-path)))))