annotate lisp/minibuffer.el @ 102138:3830c0dc1415

Updated gnus manual for mbox rmail.
author Glenn Morris <rgm@gnu.org>
date Fri, 20 Feb 2009 04:31:13 +0000
parents efada72951fb
children 03ed2dba14f6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1 ;;; minibuffer.el --- Minibuffer completion functions
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2
100908
a9dc0e7c3f2b Add 2009 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 100623
diff changeset
3 ;; Copyright (C) 2008, 2009 Free Software Foundation, Inc.
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
4
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
5 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
6
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
7 ;; This file is part of GNU Emacs.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
8
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94607
diff changeset
9 ;; GNU Emacs is free software: you can redistribute it and/or modify
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
10 ;; it under the terms of the GNU General Public License as published by
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
11 ;; the Free Software Foundation, either version 3 of the License, or
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
12 ;; (at your option) any later version.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
13
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94607
diff changeset
14 ;; GNU Emacs is distributed in the hope that it will be useful,
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
15 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
17 ;; GNU General Public License for more details.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
18
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
19 ;; You should have received a copy of the GNU General Public License
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94607
diff changeset
20 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
21
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
22 ;;; Commentary:
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
23
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
24 ;; Names with "--" are for functions and variables that are meant to be for
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
25 ;; internal use only.
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
26
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
27 ;; Functional completion tables have an extended calling conventions:
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
28 ;; - The `action' can be (additionally to nil, t, and lambda) of the form
95228
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
29 ;; (boundaries . SUFFIX) in which case it should return
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
30 ;; (boundaries START . END). See `completion-boundaries'.
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
31 ;; Any other return value should be ignored (so we ignore values returned
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
32 ;; from completion tables that don't know about this new `action' form).
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
33 ;; See `completion-boundaries'.
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
34
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
35 ;;; Bugs:
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
36
95799
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
37 ;; - completion-all-sorted-completions list all the completions, whereas
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
38 ;; it should only lists the ones that `try-completion' would consider.
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
39 ;; E.g. it should honor completion-ignored-extensions.
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
40 ;; - choose-completion can't automatically figure out the boundaries
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
41 ;; corresponding to the displayed completions. `base-size' gives the left
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
42 ;; boundary, but not the righthand one. So we need to add
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
43 ;; completion-extra-size (and also completion-no-auto-exit).
93937
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
44
94211
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
45 ;;; Todo:
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
46
95799
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
47 ;; - make lisp-complete-symbol and sym-comp use it.
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
48 ;; - add support for ** to pcm.
94304
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
49 ;; - Make read-file-name-predicate obsolete.
94211
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
50 ;; - Add vc-file-name-completion-table to read-file-name-internal.
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
51 ;; - A feature like completing-help.el.
95799
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
52 ;; - make lisp/complete.el obsolete.
94211
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
53 ;; - Make the `hide-spaces' arg of all-completions obsolete?
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
54
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
55 ;;; Code:
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
56
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
57 (eval-when-compile (require 'cl))
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
58
94013
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
59 ;;; Completion table manipulation
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
60
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
61 ;; New completion-table operation.
95228
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
62 (defun completion-boundaries (string table pred suffix)
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
63 "Return the boundaries of the completions returned by TABLE for STRING.
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
64 STRING is the string on which completion will be performed.
95228
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
65 SUFFIX is the string after point.
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
66 The result is of the form (START . END) where START is the position
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
67 in STRING of the beginning of the completion field and END is the position
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
68 in SUFFIX of the end of the completion field.
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
69 E.g. for simple completion tables, the result is always (0 . (length SUFFIX))
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
70 and for file names the result is the positions delimited by
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
71 the closest directory separators."
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
72 (let ((boundaries (if (functionp table)
95228
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
73 (funcall table string pred (cons 'boundaries suffix)))))
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
74 (if (not (eq (car-safe boundaries) 'boundaries))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
75 (setq boundaries nil))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
76 (cons (or (cadr boundaries) 0)
95228
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
77 (or (cddr boundaries) (length suffix)))))
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
78
94062
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
79 (defun completion--some (fun xs)
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
80 "Apply FUN to each element of XS in turn.
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
81 Return the first non-nil returned value.
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
82 Like CL's `some'."
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
83 (let ((firsterror nil)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
84 res)
94062
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
85 (while (and (not res) xs)
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
86 (condition-case err
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
87 (setq res (funcall fun (pop xs)))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
88 (error (unless firsterror (setq firsterror err)) nil)))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
89 (or res
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
90 (if firsterror (signal (car firsterror) (cdr firsterror))))))
94062
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
91
94013
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
92 (defun complete-with-action (action table string pred)
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
93 "Perform completion ACTION.
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
94 STRING is the string to complete.
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
95 TABLE is the completion table, which should not be a function.
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
96 PRED is a completion predicate.
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
97 ACTION can be one of nil, t or `lambda'."
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
98 (cond
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
99 ((functionp table) (funcall table string pred action))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
100 ((eq (car-safe action) 'boundaries)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
101 (cons 'boundaries (completion-boundaries string table pred (cdr action))))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
102 (t
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
103 (funcall
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
104 (cond
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
105 ((null action) 'try-completion)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
106 ((eq action t) 'all-completions)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
107 (t 'test-completion))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
108 string table pred))))
94013
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
109
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
110 (defun completion-table-dynamic (fun)
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
111 "Use function FUN as a dynamic completion table.
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
112 FUN is called with one argument, the string for which completion is required,
94202
987535788e11 (completion-table-dynamic): Fix typo, and reflow docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 94182
diff changeset
113 and it should return an alist containing all the intended possible completions.
987535788e11 (completion-table-dynamic): Fix typo, and reflow docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 94182
diff changeset
114 This alist may be a full list of possible completions so that FUN can ignore
987535788e11 (completion-table-dynamic): Fix typo, and reflow docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 94182
diff changeset
115 the value of its argument. If completion is performed in the minibuffer,
987535788e11 (completion-table-dynamic): Fix typo, and reflow docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 94182
diff changeset
116 FUN will be called in the buffer from which the minibuffer was entered.
94013
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
117
97550
dc32b170fe16 (completion-table-dynamic): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 97544
diff changeset
118 The result of the `completion-table-dynamic' form is a function
95426
92edde3e7af6 (completion-table-dynamic): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 95394
diff changeset
119 that can be used as the COLLECTION argument to `try-completion' and
94202
987535788e11 (completion-table-dynamic): Fix typo, and reflow docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 94182
diff changeset
120 `all-completions'. See Info node `(elisp)Programmed Completion'."
94013
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
121 (lexical-let ((fun fun))
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
122 (lambda (string pred action)
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
123 (with-current-buffer (let ((win (minibuffer-selected-window)))
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
124 (if (window-live-p win) (window-buffer win)
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
125 (current-buffer)))
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
126 (complete-with-action action (funcall fun string) string pred)))))
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
127
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
128 (defmacro lazy-completion-table (var fun)
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
129 "Initialize variable VAR as a lazy completion table.
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
130 If the completion table VAR is used for the first time (e.g., by passing VAR
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
131 as an argument to `try-completion'), the function FUN is called with no
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
132 arguments. FUN must return the completion table that will be stored in VAR.
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
133 If completion is requested in the minibuffer, FUN will be called in the buffer
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
134 from which the minibuffer was entered. The return value of
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
135 `lazy-completion-table' must be used to initialize the value of VAR.
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
136
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
137 You should give VAR a non-nil `risky-local-variable' property."
94017
f2ded84f543c (lazy-completion-table): Fix debug spec.
Johan Bockgård <bojohan@gnu.org>
parents: 94013
diff changeset
138 (declare (debug (symbolp lambda-expr)))
94013
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
139 (let ((str (make-symbol "string")))
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
140 `(completion-table-dynamic
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
141 (lambda (,str)
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
142 (when (functionp ,var)
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
143 (setq ,var (,fun)))
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
144 ,var))))
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
145
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
146 (defun completion-table-with-context (prefix table string pred action)
94180
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
147 ;; TODO: add `suffix' maybe?
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
148 ;; Notice that `pred' may not be a function in some abusive cases.
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
149 (when (functionp pred)
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
150 (setq pred
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
151 (lexical-let ((pred pred))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
152 ;; Predicates are called differently depending on the nature of
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
153 ;; the completion table :-(
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
154 (cond
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
155 ((vectorp table) ;Obarray.
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
156 (lambda (sym) (funcall pred (concat prefix (symbol-name sym)))))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
157 ((hash-table-p table)
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
158 (lambda (s v) (funcall pred (concat prefix s))))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
159 ((functionp table)
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
160 (lambda (s) (funcall pred (concat prefix s))))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
161 (t ;Lists and alists.
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
162 (lambda (s)
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
163 (funcall pred (concat prefix (if (consp s) (car s) s)))))))))
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
164 (if (eq (car-safe action) 'boundaries)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
165 (let* ((len (length prefix))
95228
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
166 (bound (completion-boundaries string table pred (cdr action))))
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
167 (list* 'boundaries (+ (car bound) len) (cdr bound)))
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
168 (let ((comp (complete-with-action action table string pred)))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
169 (cond
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
170 ;; In case of try-completion, add the prefix.
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
171 ((stringp comp) (concat prefix comp))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
172 (t comp)))))
94013
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
173
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
174 (defun completion-table-with-terminator (terminator table string pred action)
94180
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
175 (cond
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
176 ((eq action nil)
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
177 (let ((comp (try-completion string table pred)))
94077
28e2f73174d6 (completion-table-with-terminator): Those completions
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94069
diff changeset
178 (if (eq comp t)
28e2f73174d6 (completion-table-with-terminator): Those completions
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94069
diff changeset
179 (concat string terminator)
28e2f73174d6 (completion-table-with-terminator): Those completions
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94069
diff changeset
180 (if (and (stringp comp)
94180
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
181 (eq (try-completion comp table pred) t))
94077
28e2f73174d6 (completion-table-with-terminator): Those completions
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94069
diff changeset
182 (concat comp terminator)
94180
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
183 comp))))
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
184 ((eq action t)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
185 ;; FIXME: We generally want the `try' and `all' behaviors to be
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
186 ;; consistent so pcm can merge the `all' output to get the `try' output,
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
187 ;; but that sometimes clashes with the need for `all' output to look
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
188 ;; good in *Completions*.
100623
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
189 ;; (mapcar (lambda (s) (concat s terminator))
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
190 ;; (all-completions string table pred))))
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
191 (all-completions string table pred))
94180
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
192 ;; completion-table-with-terminator is always used for
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
193 ;; "sub-completions" so it's only called if the terminator is missing,
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
194 ;; in which case `test-completion' should return nil.
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
195 ((eq action 'lambda) nil)))
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
196
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
197 (defun completion-table-with-predicate (table pred1 strict string pred2 action)
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
198 "Make a completion table equivalent to TABLE but filtered through PRED1.
94736
3a7862f514d0 (completion-table-with-predicate): Don't use `iff' in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 94678
diff changeset
199 PRED1 is a function of one argument which returns non-nil if and only if the
94180
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
200 argument is an element of TABLE which should be considered for completion.
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
201 STRING, PRED2, and ACTION are the usual arguments to completion tables,
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
202 as described in `try-completion', `all-completions', and `test-completion'.
94211
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
203 If STRICT is t, the predicate always applies; if nil it only applies if
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
204 it does not reduce the set of possible completions to nothing.
94180
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
205 Note: TABLE needs to be a proper completion table which obeys predicates."
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
206 (cond
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
207 ((and (not strict) (eq action 'lambda))
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
208 ;; Ignore pred1 since it doesn't really have to apply anyway.
94182
0be1624297ac (completion-table-with-predicate): Typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94180
diff changeset
209 (test-completion string table pred2))
94180
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
210 (t
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
211 (or (complete-with-action action table string
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
212 (if (null pred2) pred1
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
213 (lexical-let ((pred1 pred2) (pred2 pred2))
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
214 (lambda (x)
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
215 ;; Call `pred1' first, so that `pred2'
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
216 ;; really can't tell that `x' is in table.
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
217 (if (funcall pred1 x) (funcall pred2 x))))))
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
218 ;; If completion failed and we're not applying pred1 strictly, try
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
219 ;; again without pred1.
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
220 (and (not strict)
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
221 (complete-with-action action table string pred2))))))
94013
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
222
94062
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
223 (defun completion-table-in-turn (&rest tables)
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
224 "Create a completion table that tries each table in TABLES in turn."
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
225 (lexical-let ((tables tables))
94013
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
226 (lambda (string pred action)
94062
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
227 (completion--some (lambda (table)
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
228 (complete-with-action action table string pred))
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
229 tables))))
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
230
94180
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
231 ;; (defmacro complete-in-turn (a b) `(completion-table-in-turn ,a ,b))
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
232 ;; (defmacro dynamic-completion-table (fun) `(completion-table-dynamic ,fun))
94062
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
233 (define-obsolete-function-alias
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
234 'complete-in-turn 'completion-table-in-turn "23.1")
94180
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
235 (define-obsolete-function-alias
114d8f4904d0 * minibuffer.el (completion-table-with-context): Add support for `pred'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94172
diff changeset
236 'dynamic-completion-table 'completion-table-dynamic "23.1")
94013
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
237
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
238 ;;; Minibuffer completion
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
239
93937
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
240 (defgroup minibuffer nil
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
241 "Controlling the behavior of the minibuffer."
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
242 :link '(custom-manual "(emacs)Minibuffer")
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
243 :group 'environment)
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
244
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
245 (defun minibuffer-message (message &rest args)
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
246 "Temporarily display MESSAGE at the end of the minibuffer.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
247 The text is displayed for `minibuffer-message-timeout' seconds,
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
248 or until the next input event arrives, whichever comes first.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
249 Enclose MESSAGE in [...] if this is not yet the case.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
250 If ARGS are provided, then pass MESSAGE through `format'."
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
251 ;; Clear out any old echo-area message to make way for our new thing.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
252 (message nil)
101162
64a6da0f9aa2 * minibuffer.el (minibuffer-message): Fix regexp so it doesn't exclude
Juanma Barranquero <lekktu@gmail.com>
parents: 101010
diff changeset
253 (setq message (if (and (null args) (string-match-p "\\` *\\[.+\\]\\'" message))
94091
14fafab62797 (minibuffer-message): Make sure we can put-text-property.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94077
diff changeset
254 ;; Make sure we can put-text-property.
14fafab62797 (minibuffer-message): Make sure we can put-text-property.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94077
diff changeset
255 (copy-sequence message)
14fafab62797 (minibuffer-message): Make sure we can put-text-property.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94077
diff changeset
256 (concat " [" message "]")))
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
257 (when args (setq message (apply 'format message args)))
95671
b88c2237c3e7 (minibuffer-message): Bind inhibit-quit around
Andreas Schwab <schwab@suse.de>
parents: 95575
diff changeset
258 (let ((ol (make-overlay (point-max) (point-max) nil t t))
95799
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
259 ;; A quit during sit-for normally only interrupts the sit-for,
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
260 ;; but since minibuffer-message is used at the end of a command,
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
261 ;; at a time when the command has virtually finished already, a C-g
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
262 ;; should really cause an abort-recursive-edit instead (i.e. as if
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
263 ;; the C-g had been typed at top-level). Binding inhibit-quit here
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
264 ;; is an attempt to get that behavior.
95671
b88c2237c3e7 (minibuffer-message): Bind inhibit-quit around
Andreas Schwab <schwab@suse.de>
parents: 95575
diff changeset
265 (inhibit-quit t))
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
266 (unwind-protect
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
267 (progn
94069
a91b57e652cd (minibuffer-message): Put cursor at the right place.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94068
diff changeset
268 (unless (zerop (length message))
a91b57e652cd (minibuffer-message): Put cursor at the right place.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94068
diff changeset
269 ;; The current C cursor code doesn't know to use the overlay's
a91b57e652cd (minibuffer-message): Put cursor at the right place.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94068
diff changeset
270 ;; marker's stickiness to figure out whether to place the cursor
a91b57e652cd (minibuffer-message): Put cursor at the right place.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94068
diff changeset
271 ;; before or after the string, so let's spoon-feed it the pos.
a91b57e652cd (minibuffer-message): Put cursor at the right place.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94068
diff changeset
272 (put-text-property 0 1 'cursor t message))
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
273 (overlay-put ol 'after-string message)
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
274 (sit-for (or minibuffer-message-timeout 1000000)))
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
275 (delete-overlay ol))))
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
276
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
277 (defun minibuffer-completion-contents ()
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
278 "Return the user input in a minibuffer before point as a string.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
279 That is what completion commands operate on."
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
280 (buffer-substring (field-beginning) (point)))
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
281
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
282 (defun delete-minibuffer-contents ()
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
283 "Delete all user input in a minibuffer.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
284 If the current buffer is not a minibuffer, erase its entire contents."
99232
63548ee8ae9f (delete-minibuffer-contents): Delete all minibuffer contents instead
Chong Yidong <cyd@stupidchicken.com>
parents: 98907
diff changeset
285 ;; We used to do `delete-field' here, but when file name shadowing
63548ee8ae9f (delete-minibuffer-contents): Delete all minibuffer contents instead
Chong Yidong <cyd@stupidchicken.com>
parents: 98907
diff changeset
286 ;; is on, the field doesn't cover the entire minibuffer contents.
63548ee8ae9f (delete-minibuffer-contents): Delete all minibuffer contents instead
Chong Yidong <cyd@stupidchicken.com>
parents: 98907
diff changeset
287 (delete-region (minibuffer-prompt-end) (point-max)))
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
288
93937
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
289 (defcustom completion-auto-help t
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
290 "Non-nil means automatically provide help for invalid completion input.
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
291 If the value is t the *Completion* buffer is displayed whenever completion
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
292 is requested but cannot be done.
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
293 If the value is `lazy', the *Completions* buffer is only displayed after
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
294 the second failed attempt to complete."
93942
187008494f10 (completion-auto-help): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents: 93937
diff changeset
295 :type '(choice (const nil) (const t) (const lazy))
93937
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
296 :group 'minibuffer)
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
297
94062
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
298 (defvar completion-styles-alist
94304
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
299 '((basic completion-basic-try-completion completion-basic-all-completions)
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
300 (emacs22 completion-emacs22-try-completion completion-emacs22-all-completions)
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
301 (emacs21 completion-emacs21-try-completion completion-emacs21-all-completions)
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
302 (partial-completion
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
303 completion-pcm-try-completion completion-pcm-all-completions))
94062
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
304 "List of available completion styles.
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
305 Each element has the form (NAME TRY-COMPLETION ALL-COMPLETIONS)
94375
f8b940834bbb (completion-pcm-word-delimiters): Add :group.
Juanma Barranquero <lekktu@gmail.com>
parents: 94352
diff changeset
306 where NAME is the name that should be used in `completion-styles',
94062
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
307 TRY-COMPLETION is the function that does the completion, and
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
308 ALL-COMPLETIONS is the function that lists the completions.")
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
309
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
310 (defcustom completion-styles '(basic partial-completion)
94062
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
311 "List of completion styles to use."
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
312 :type `(repeat (choice ,@(mapcar (lambda (x) (list 'const (car x)))
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
313 completion-styles-alist)))
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
314 :group 'minibuffer
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
315 :version "23.1")
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
316
94304
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
317 (defun completion-try-completion (string table pred point)
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
318 "Try to complete STRING using completion table TABLE.
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
319 Only the elements of table that satisfy predicate PRED are considered.
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
320 POINT is the position of point within STRING.
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
321 The return value can be either nil to indicate that there is no completion,
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
322 t to indicate that STRING is the only possible completion,
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
323 or a pair (STRING . NEWPOINT) of the completed result string together with
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
324 a new position for point."
94211
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
325 ;; The property `completion-styles' indicates that this functional
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
326 ;; completion-table claims to take care of completion styles itself.
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
327 ;; [I.e. It will most likely call us back at some point. ]
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
328 (if (and (symbolp table) (get table 'completion-styles))
94304
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
329 ;; Extended semantics for functional completion-tables:
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
330 ;; They accept a 4th argument `point' and when called with action=nil
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
331 ;; and this 4th argument (a position inside `string'), they should
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
332 ;; return instead of a string a pair (STRING . NEWPOINT).
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
333 (funcall table string pred nil point)
94062
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
334 (completion--some (lambda (style)
94068
f2cff391663b (minibuffer-try-completion, minibuffer-all-completions): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94062
diff changeset
335 (funcall (nth 1 (assq style completion-styles-alist))
94304
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
336 string table pred point))
94062
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
337 completion-styles)))
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
338
94304
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
339 (defun completion-all-completions (string table pred point)
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
340 "List the possible completions of STRING in completion table TABLE.
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
341 Only the elements of table that satisfy predicate PRED are considered.
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
342 POINT is the position of point within STRING.
94375
f8b940834bbb (completion-pcm-word-delimiters): Add :group.
Juanma Barranquero <lekktu@gmail.com>
parents: 94352
diff changeset
343 The return value is a list of completions and may contain the base-size
94304
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
344 in the last `cdr'."
100623
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
345 ;; The property `completion-styles' indicates that this functional
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
346 ;; completion-table claims to take care of completion styles itself.
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
347 ;; [I.e. It will most likely call us back at some point. ]
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
348 (if (and (symbolp table) (get table 'completion-styles))
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
349 ;; Extended semantics for functional completion-tables:
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
350 ;; They accept a 4th argument `point' and when called with action=t
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
351 ;; and this 4th argument (a position inside `string'), they may
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
352 ;; return BASE-SIZE in the last `cdr'.
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
353 (funcall table string pred t point)
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
354 (completion--some (lambda (style)
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
355 (funcall (nth 2 (assq style completion-styles-alist))
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
356 string table pred point))
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
357 completion-styles)))
94062
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
358
93937
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
359 (defun minibuffer--bitset (modified completions exact)
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
360 (logior (if modified 4 0)
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
361 (if completions 2 0)
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
362 (if exact 1 0)))
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
363
94211
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
364 (defun completion--do-completion (&optional try-completion-function)
93937
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
365 "Do the completion and return a summary of what happened.
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
366 M = completion was performed, the text was Modified.
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
367 C = there were available Completions.
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
368 E = after completion we now have an Exact match.
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
369
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
370 MCE
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
371 000 0 no possible completion
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
372 001 1 was already an exact and unique completion
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
373 010 2 no completion happened
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
374 011 3 was already an exact completion
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
375 100 4 ??? impossible
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
376 101 5 ??? impossible
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
377 110 6 some completion happened
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
378 111 7 completed to an exact completion"
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
379 (let* ((beg (field-beginning))
94304
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
380 (end (field-end))
94211
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
381 (string (buffer-substring beg end))
94304
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
382 (comp (funcall (or try-completion-function
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
383 'completion-try-completion)
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
384 string
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
385 minibuffer-completion-table
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
386 minibuffer-completion-predicate
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
387 (- (point) beg))))
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
388 (cond
94304
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
389 ((null comp)
93937
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
390 (ding) (minibuffer-message "No match") (minibuffer--bitset nil nil nil))
94304
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
391 ((eq t comp) (minibuffer--bitset nil nil t)) ;Exact and unique match.
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
392 (t
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
393 ;; `completed' should be t if some completion was done, which doesn't
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
394 ;; include simply changing the case of the entered string. However,
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
395 ;; for appearance, the string is rewritten if the case changes.
94304
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
396 (let* ((comp-pos (cdr comp))
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
397 (completion (car comp))
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
398 (completed (not (eq t (compare-strings completion nil nil
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
399 string nil nil t))))
94211
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
400 (unchanged (eq t (compare-strings completion nil nil
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
401 string nil nil nil))))
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
402 (unless unchanged
93937
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
403
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
404 ;; Insert in minibuffer the chars we got.
94211
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
405 (goto-char end)
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
406 (insert completion)
94486
ca90422b8114 (completion--do-completion): Move point even if the completion makes no change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94465
diff changeset
407 (delete-region beg end))
ca90422b8114 (completion--do-completion): Move point even if the completion makes no change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94465
diff changeset
408 ;; Move point.
ca90422b8114 (completion--do-completion): Move point even if the completion makes no change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94465
diff changeset
409 (goto-char (+ beg comp-pos))
93937
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
410
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
411 (if (not (or unchanged completed))
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
412 ;; The case of the string changed, but that's all. We're not sure
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
413 ;; whether this is a unique completion or not, so try again using
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
414 ;; the real case (this shouldn't recurse again, because the next
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
415 ;; time try-completion will return either t or the exact string).
94211
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
416 (completion--do-completion try-completion-function)
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
417
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
418 ;; It did find a match. Do we match some possibility exactly now?
94304
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
419 (let ((exact (test-completion completion
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
420 minibuffer-completion-table
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
421 minibuffer-completion-predicate)))
93937
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
422 (unless completed
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
423 ;; Show the completion table, if requested.
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
424 (cond
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
425 ((not exact)
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
426 (if (case completion-auto-help
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
427 (lazy (eq this-command last-command))
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
428 (t completion-auto-help))
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
429 (minibuffer-completion-help)
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
430 (minibuffer-message "Next char not unique")))
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
431 ;; If the last exact completion and this one were the same,
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
432 ;; it means we've already given a "Complete but not unique"
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
433 ;; message and the user's hit TAB again, so now we give him help.
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
434 ((eq this-command last-command)
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
435 (if completion-auto-help (minibuffer-completion-help)))))
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
436
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
437 (minibuffer--bitset completed t exact))))))))
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
438
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
439 (defun minibuffer-complete ()
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
440 "Complete the minibuffer contents as far as possible.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
441 Return nil if there is no valid completion, else t.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
442 If no characters can be completed, display a list of possible completions.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
443 If you repeat this command after it displayed such a list,
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
444 scroll the window of possible completions."
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
445 (interactive)
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
446 ;; If the previous command was not this,
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
447 ;; mark the completion buffer obsolete.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
448 (unless (eq this-command last-command)
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
449 (setq minibuffer-scroll-window nil))
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
450
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
451 (let ((window minibuffer-scroll-window))
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
452 ;; If there's a fresh completion window with a live buffer,
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
453 ;; and this command is repeated, scroll that window.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
454 (if (window-live-p window)
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
455 (with-current-buffer (window-buffer window)
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
456 (if (pos-visible-in-window-p (point-max) window)
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
457 ;; If end is in view, scroll up to the beginning.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
458 (set-window-start window (point-min) nil)
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
459 ;; Else scroll down one screen.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
460 (scroll-other-window))
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
461 nil)
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
462
94211
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
463 (case (completion--do-completion)
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
464 (#b000 nil)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
465 (#b001 (goto-char (field-end))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
466 (minibuffer-message "Sole completion")
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
467 t)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
468 (#b011 (goto-char (field-end))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
469 (minibuffer-message "Complete, but not unique")
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
470 t)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
471 (t t)))))
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
472
95172
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
473 (defvar completion-all-sorted-completions nil)
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
474 (make-variable-buffer-local 'completion-all-sorted-completions)
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
475
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
476 (defun completion--flush-all-sorted-completions (&rest ignore)
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
477 (setq completion-all-sorted-completions nil))
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
478
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
479 (defun completion-all-sorted-completions ()
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
480 (or completion-all-sorted-completions
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
481 (let* ((start (field-beginning))
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
482 (end (field-end))
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
483 (all (completion-all-completions (buffer-substring start end)
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
484 minibuffer-completion-table
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
485 minibuffer-completion-predicate
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
486 (- (point) start)))
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
487 (last (last all))
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
488 (base-size (or (cdr last) 0)))
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
489 (when last
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
490 (setcdr last nil)
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
491 ;; Prefer shorter completions.
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
492 (setq all (sort all (lambda (c1 c2) (< (length c1) (length c2)))))
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
493 ;; Prefer recently used completions.
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
494 (let ((hist (symbol-value minibuffer-history-variable)))
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
495 (setq all (sort all (lambda (c1 c2)
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
496 (> (length (member c1 hist))
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
497 (length (member c2 hist)))))))
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
498 ;; Cache the result. This is not just for speed, but also so that
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
499 ;; repeated calls to minibuffer-force-complete can cycle through
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
500 ;; all possibilities.
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
501 (add-hook 'after-change-functions
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
502 'completion--flush-all-sorted-completions nil t)
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
503 (setq completion-all-sorted-completions
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
504 (nconc all base-size))))))
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
505
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
506 (defun minibuffer-force-complete ()
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
507 "Complete the minibuffer to an exact match.
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
508 Repeated uses step through the possible completions."
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
509 (interactive)
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
510 ;; FIXME: Need to deal with the extra-size issue here as well.
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
511 (let* ((start (field-beginning))
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
512 (end (field-end))
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
513 (all (completion-all-sorted-completions)))
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
514 (if (not (consp all))
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
515 (minibuffer-message (if all "No more completions" "No completions"))
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
516 (goto-char end)
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
517 (insert (car all))
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
518 (delete-region (+ start (cdr (last all))) end)
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
519 ;; If completing file names, (car all) may be a directory, so we'd now
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
520 ;; have a new set of possible completions and might want to reset
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
521 ;; completion-all-sorted-completions to nil, but we prefer not to,
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
522 ;; so that repeated calls minibuffer-force-complete still cycle
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
523 ;; through the previous possible completions.
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
524 (setq completion-all-sorted-completions (cdr all)))))
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
525
100044
f42890851326 Add and use minibuffer-confirm-exit-commands variable
Miles Bader <miles@gnu.org>
parents: 100022
diff changeset
526 (defvar minibuffer-confirm-exit-commands
100052
766018471339 (minibuffer-confirm-exit-commands): Add PC-complete and
Chong Yidong <cyd@stupidchicken.com>
parents: 100044
diff changeset
527 '(minibuffer-complete minibuffer-complete-word PC-complete PC-complete-word)
100044
f42890851326 Add and use minibuffer-confirm-exit-commands variable
Miles Bader <miles@gnu.org>
parents: 100022
diff changeset
528 "A list of commands which cause an immediately following
f42890851326 Add and use minibuffer-confirm-exit-commands variable
Miles Bader <miles@gnu.org>
parents: 100022
diff changeset
529 `minibuffer-complete-and-exit' to ask for extra confirmation.")
f42890851326 Add and use minibuffer-confirm-exit-commands variable
Miles Bader <miles@gnu.org>
parents: 100022
diff changeset
530
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
531 (defun minibuffer-complete-and-exit ()
99883
494c4c7bcf01 (minibuffer-complete-and-exit): Change `confirm-only' value of
Chong Yidong <cyd@stupidchicken.com>
parents: 99232
diff changeset
532 "Exit if the minibuffer contains a valid completion.
494c4c7bcf01 (minibuffer-complete-and-exit): Change `confirm-only' value of
Chong Yidong <cyd@stupidchicken.com>
parents: 99232
diff changeset
533 Otherwise, try to complete the minibuffer contents. If
494c4c7bcf01 (minibuffer-complete-and-exit): Change `confirm-only' value of
Chong Yidong <cyd@stupidchicken.com>
parents: 99232
diff changeset
534 completion leads to a valid completion, a repetition of this
494c4c7bcf01 (minibuffer-complete-and-exit): Change `confirm-only' value of
Chong Yidong <cyd@stupidchicken.com>
parents: 99232
diff changeset
535 command will exit.
494c4c7bcf01 (minibuffer-complete-and-exit): Change `confirm-only' value of
Chong Yidong <cyd@stupidchicken.com>
parents: 99232
diff changeset
536
494c4c7bcf01 (minibuffer-complete-and-exit): Change `confirm-only' value of
Chong Yidong <cyd@stupidchicken.com>
parents: 99232
diff changeset
537 If `minibuffer-completion-confirm' is `confirm', do not try to
494c4c7bcf01 (minibuffer-complete-and-exit): Change `confirm-only' value of
Chong Yidong <cyd@stupidchicken.com>
parents: 99232
diff changeset
538 complete; instead, ask for confirmation and accept any input if
494c4c7bcf01 (minibuffer-complete-and-exit): Change `confirm-only' value of
Chong Yidong <cyd@stupidchicken.com>
parents: 99232
diff changeset
539 confirmed.
494c4c7bcf01 (minibuffer-complete-and-exit): Change `confirm-only' value of
Chong Yidong <cyd@stupidchicken.com>
parents: 99232
diff changeset
540 If `minibuffer-completion-confirm' is `confirm-after-completion',
494c4c7bcf01 (minibuffer-complete-and-exit): Change `confirm-only' value of
Chong Yidong <cyd@stupidchicken.com>
parents: 99232
diff changeset
541 do not try to complete; instead, ask for confirmation if the
494c4c7bcf01 (minibuffer-complete-and-exit): Change `confirm-only' value of
Chong Yidong <cyd@stupidchicken.com>
parents: 99232
diff changeset
542 preceding minibuffer command was `minibuffer-complete', and
494c4c7bcf01 (minibuffer-complete-and-exit): Change `confirm-only' value of
Chong Yidong <cyd@stupidchicken.com>
parents: 99232
diff changeset
543 accept the input otherwise."
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
544 (interactive)
94211
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
545 (let ((beg (field-beginning))
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
546 (end (field-end)))
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
547 (cond
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
548 ;; Allow user to specify null string
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
549 ((= beg end) (exit-minibuffer))
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
550 ((test-completion (buffer-substring beg end)
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
551 minibuffer-completion-table
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
552 minibuffer-completion-predicate)
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
553 (when completion-ignore-case
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
554 ;; Fixup case of the field, if necessary.
94242
3530bf3c1687 (minibuffer-complete-and-exit): Fix last change.
Juanma Barranquero <lekktu@gmail.com>
parents: 94218
diff changeset
555 (let* ((string (buffer-substring beg end))
94211
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
556 (compl (try-completion
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
557 string
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
558 minibuffer-completion-table
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
559 minibuffer-completion-predicate)))
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
560 (when (and (stringp compl)
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
561 ;; If it weren't for this piece of paranoia, I'd replace
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
562 ;; the whole thing with a call to do-completion.
95799
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
563 ;; This is important, e.g. when the current minibuffer's
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
564 ;; content is a directory which only contains a single
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
565 ;; file, so `try-completion' actually completes to
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
566 ;; that file.
94211
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
567 (= (length string) (length compl)))
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
568 (goto-char end)
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
569 (insert compl)
94211
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
570 (delete-region beg end))))
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
571 (exit-minibuffer))
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
572
99883
494c4c7bcf01 (minibuffer-complete-and-exit): Change `confirm-only' value of
Chong Yidong <cyd@stupidchicken.com>
parents: 99232
diff changeset
573 ((eq minibuffer-completion-confirm 'confirm)
94211
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
574 ;; The user is permitted to exit with an input that's rejected
99883
494c4c7bcf01 (minibuffer-complete-and-exit): Change `confirm-only' value of
Chong Yidong <cyd@stupidchicken.com>
parents: 99232
diff changeset
575 ;; by test-completion, after confirming her choice.
94211
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
576 (if (eq last-command this-command)
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
577 (exit-minibuffer)
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
578 (minibuffer-message "Confirm")
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
579 nil))
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
580
99883
494c4c7bcf01 (minibuffer-complete-and-exit): Change `confirm-only' value of
Chong Yidong <cyd@stupidchicken.com>
parents: 99232
diff changeset
581 ((eq minibuffer-completion-confirm 'confirm-after-completion)
494c4c7bcf01 (minibuffer-complete-and-exit): Change `confirm-only' value of
Chong Yidong <cyd@stupidchicken.com>
parents: 99232
diff changeset
582 ;; Similar to the above, but only if trying to exit immediately
494c4c7bcf01 (minibuffer-complete-and-exit): Change `confirm-only' value of
Chong Yidong <cyd@stupidchicken.com>
parents: 99232
diff changeset
583 ;; after typing TAB (this catches most minibuffer typos).
100044
f42890851326 Add and use minibuffer-confirm-exit-commands variable
Miles Bader <miles@gnu.org>
parents: 100022
diff changeset
584 (if (memq last-command minibuffer-confirm-exit-commands)
99883
494c4c7bcf01 (minibuffer-complete-and-exit): Change `confirm-only' value of
Chong Yidong <cyd@stupidchicken.com>
parents: 99232
diff changeset
585 (progn (minibuffer-message "Confirm")
494c4c7bcf01 (minibuffer-complete-and-exit): Change `confirm-only' value of
Chong Yidong <cyd@stupidchicken.com>
parents: 99232
diff changeset
586 nil)
494c4c7bcf01 (minibuffer-complete-and-exit): Change `confirm-only' value of
Chong Yidong <cyd@stupidchicken.com>
parents: 99232
diff changeset
587 (exit-minibuffer)))
494c4c7bcf01 (minibuffer-complete-and-exit): Change `confirm-only' value of
Chong Yidong <cyd@stupidchicken.com>
parents: 99232
diff changeset
588
94211
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
589 (t
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
590 ;; Call do-completion, but ignore errors.
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
591 (case (condition-case nil
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
592 (completion--do-completion)
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
593 (error 1))
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
594 ((#b001 #b011) (exit-minibuffer))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
595 (#b111 (if (not minibuffer-completion-confirm)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
596 (exit-minibuffer)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
597 (minibuffer-message "Confirm")
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
598 nil))
94211
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
599 (t nil))))))
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
600
94304
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
601 (defun completion--try-word-completion (string table predicate point)
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
602 (let ((comp (completion-try-completion string table predicate point)))
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
603 (if (not (consp comp))
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
604 comp
93937
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
605
94211
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
606 ;; If completion finds next char not unique,
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
607 ;; consider adding a space or a hyphen.
94304
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
608 (when (= (length string) (length (car comp)))
94211
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
609 (let ((exts '(" " "-"))
94304
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
610 (before (substring string 0 point))
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
611 (after (substring string point))
97607
b2300bb89e4a (completion--try-word-completion): Disable partial-completion when
Chong Yidong <cyd@stupidchicken.com>
parents: 97550
diff changeset
612 ;; Disable partial-completion for this.
b2300bb89e4a (completion--try-word-completion): Disable partial-completion when
Chong Yidong <cyd@stupidchicken.com>
parents: 97550
diff changeset
613 (completion-styles
100022
3e1f480f4b69 (completion--try-word-completion): Don't ignore
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 99883
diff changeset
614 (or (remove 'partial-completion completion-styles)
3e1f480f4b69 (completion--try-word-completion): Don't ignore
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 99883
diff changeset
615 completion-styles))
94304
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
616 tem)
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
617 (while (and exts (not (consp tem)))
94211
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
618 (setq tem (completion-try-completion
94304
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
619 (concat before (pop exts) after)
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
620 table predicate (1+ point))))
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
621 (if (consp tem) (setq comp tem))))
94211
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
622
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
623 ;; Completing a single word is actually more difficult than completing
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
624 ;; as much as possible, because we first have to find the "current
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
625 ;; position" in `completion' in order to find the end of the word
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
626 ;; we're completing. Normally, `string' is a prefix of `completion',
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
627 ;; which makes it trivial to find the position, but with fancier
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
628 ;; completion (plus env-var expansion, ...) `completion' might not
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
629 ;; look anything like `string' at all.
94304
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
630 (let* ((comppoint (cdr comp))
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
631 (completion (car comp))
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
632 (before (substring string 0 point))
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
633 (combined (concat before "\n" completion)))
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
634 ;; Find in completion the longest text that was right before point.
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
635 (when (string-match "\\(.+\\)\n.*?\\1" combined)
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
636 (let* ((prefix (match-string 1 before))
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
637 ;; We used non-greedy match to make `rem' as long as possible.
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
638 (rem (substring combined (match-end 0)))
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
639 ;; Find in the remainder of completion the longest text
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
640 ;; that was right after point.
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
641 (after (substring string point))
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
642 (suffix (if (string-match "\\`\\(.+\\).*\n.*\\1"
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
643 (concat after "\n" rem))
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
644 (match-string 1 after))))
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
645 ;; The general idea is to try and guess what text was inserted
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
646 ;; at point by the completion. Problem is: if we guess wrong,
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
647 ;; we may end up treating as "added by completion" text that was
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
648 ;; actually painfully typed by the user. So if we then cut
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
649 ;; after the first word, we may throw away things the
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
650 ;; user wrote. So let's try to be as conservative as possible:
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
651 ;; only cut after the first word, if we're reasonably sure that
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
652 ;; our guess is correct.
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
653 ;; Note: a quick survey on emacs-devel seemed to indicate that
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
654 ;; nobody actually cares about the "word-at-a-time" feature of
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
655 ;; minibuffer-complete-word, whose real raison-d'être is that it
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
656 ;; tries to add "-" or " ". One more reason to only cut after
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
657 ;; the first word, if we're really sure we're right.
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
658 (when (and (or suffix (zerop (length after)))
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
659 (string-match (concat
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
660 ;; Make submatch 1 as small as possible
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
661 ;; to reduce the risk of cutting
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
662 ;; valuable text.
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
663 ".*" (regexp-quote prefix) "\\(.*?\\)"
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
664 (if suffix (regexp-quote suffix) "\\'"))
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
665 completion)
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
666 ;; The new point in `completion' should also be just
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
667 ;; before the suffix, otherwise something more complex
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
668 ;; is going on, and we're not sure where we are.
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
669 (eq (match-end 1) comppoint)
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
670 ;; (match-beginning 1)..comppoint is now the stretch
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
671 ;; of text in `completion' that was completed at point.
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
672 (string-match "\\W" completion (match-beginning 1))
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
673 ;; Is there really something to cut?
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
674 (> comppoint (match-end 0)))
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
675 ;; Cut after the first word.
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
676 (let ((cutpos (match-end 0)))
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
677 (setq completion (concat (substring completion 0 cutpos)
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
678 (substring completion comppoint)))
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
679 (setq comppoint cutpos)))))
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
680
94304
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
681 (cons completion comppoint)))))
93937
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
682
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
683
93937
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
684 (defun minibuffer-complete-word ()
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
685 "Complete the minibuffer contents at most a single word.
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
686 After one word is completed as much as possible, a space or hyphen
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
687 is added, provided that matches some possible completion.
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
688 Return nil if there is no valid completion, else t."
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
689 (interactive)
94211
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
690 (case (completion--do-completion 'completion--try-word-completion)
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
691 (#b000 nil)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
692 (#b001 (goto-char (field-end))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
693 (minibuffer-message "Sole completion")
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
694 t)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
695 (#b011 (goto-char (field-end))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
696 (minibuffer-message "Complete, but not unique")
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
697 t)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
698 (t t)))
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
699
94211
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
700 (defun completion--insert-strings (strings)
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
701 "Insert a list of STRINGS into the current buffer.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
702 Uses columns to keep the listing readable but compact.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
703 It also eliminates runs of equal strings."
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
704 (when (consp strings)
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
705 (let* ((length (apply 'max
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
706 (mapcar (lambda (s)
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
707 (if (consp s)
94561
bbc1b1a5633e (completion--insert-strings): Use string-width rather than length.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94558
diff changeset
708 (+ (string-width (car s))
bbc1b1a5633e (completion--insert-strings): Use string-width rather than length.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94558
diff changeset
709 (string-width (cadr s)))
bbc1b1a5633e (completion--insert-strings): Use string-width rather than length.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94558
diff changeset
710 (string-width s)))
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
711 strings)))
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
712 (window (get-buffer-window (current-buffer) 0))
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
713 (wwidth (if window (1- (window-width window)) 79))
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
714 (columns (min
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
715 ;; At least 2 columns; at least 2 spaces between columns.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
716 (max 2 (/ wwidth (+ 2 length)))
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
717 ;; Don't allocate more columns than we can fill.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
718 ;; Windows can't show less than 3 lines anyway.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
719 (max 1 (/ (length strings) 2))))
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
720 (colwidth (/ wwidth columns))
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
721 (column 0)
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
722 (laststring nil))
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
723 ;; The insertion should be "sensible" no matter what choices were made
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
724 ;; for the parameters above.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
725 (dolist (str strings)
101327
b0eef2ac5a59 (completion--insert-strings): Fix up computation of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101162
diff changeset
726 (unless (equal laststring str) ; Remove (consecutive) duplicates.
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
727 (setq laststring str)
101327
b0eef2ac5a59 (completion--insert-strings): Fix up computation of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101162
diff changeset
728 (let ((length (if (consp str)
b0eef2ac5a59 (completion--insert-strings): Fix up computation of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101162
diff changeset
729 (+ (string-width (car str))
b0eef2ac5a59 (completion--insert-strings): Fix up computation of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101162
diff changeset
730 (string-width (cadr str)))
b0eef2ac5a59 (completion--insert-strings): Fix up computation of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101162
diff changeset
731 (string-width str))))
b0eef2ac5a59 (completion--insert-strings): Fix up computation of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101162
diff changeset
732 (unless (bolp)
b0eef2ac5a59 (completion--insert-strings): Fix up computation of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101162
diff changeset
733 (if (< wwidth (+ (max colwidth length) column))
b0eef2ac5a59 (completion--insert-strings): Fix up computation of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101162
diff changeset
734 ;; No space for `str' at point, move to next line.
b0eef2ac5a59 (completion--insert-strings): Fix up computation of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101162
diff changeset
735 (progn (insert "\n") (setq column 0))
b0eef2ac5a59 (completion--insert-strings): Fix up computation of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101162
diff changeset
736 (insert " \t")
b0eef2ac5a59 (completion--insert-strings): Fix up computation of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101162
diff changeset
737 ;; Leave the space unpropertized so that in the case we're
b0eef2ac5a59 (completion--insert-strings): Fix up computation of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101162
diff changeset
738 ;; already past the goal column, there is still
b0eef2ac5a59 (completion--insert-strings): Fix up computation of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101162
diff changeset
739 ;; a space displayed.
b0eef2ac5a59 (completion--insert-strings): Fix up computation of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101162
diff changeset
740 (set-text-properties (- (point) 1) (point)
b0eef2ac5a59 (completion--insert-strings): Fix up computation of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101162
diff changeset
741 ;; We can't just set tab-width, because
b0eef2ac5a59 (completion--insert-strings): Fix up computation of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101162
diff changeset
742 ;; completion-setup-function will kill all
b0eef2ac5a59 (completion--insert-strings): Fix up computation of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101162
diff changeset
743 ;; local variables :-(
b0eef2ac5a59 (completion--insert-strings): Fix up computation of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101162
diff changeset
744 `(display (space :align-to ,column)))
b0eef2ac5a59 (completion--insert-strings): Fix up computation of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101162
diff changeset
745 nil))
b0eef2ac5a59 (completion--insert-strings): Fix up computation of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101162
diff changeset
746 (if (not (consp str))
b0eef2ac5a59 (completion--insert-strings): Fix up computation of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101162
diff changeset
747 (put-text-property (point) (progn (insert str) (point))
b0eef2ac5a59 (completion--insert-strings): Fix up computation of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101162
diff changeset
748 'mouse-face 'highlight)
b0eef2ac5a59 (completion--insert-strings): Fix up computation of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101162
diff changeset
749 (put-text-property (point) (progn (insert (car str)) (point))
b0eef2ac5a59 (completion--insert-strings): Fix up computation of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101162
diff changeset
750 'mouse-face 'highlight)
b0eef2ac5a59 (completion--insert-strings): Fix up computation of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101162
diff changeset
751 (put-text-property (point) (progn (insert (cadr str)) (point))
b0eef2ac5a59 (completion--insert-strings): Fix up computation of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101162
diff changeset
752 'mouse-face nil))
b0eef2ac5a59 (completion--insert-strings): Fix up computation of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101162
diff changeset
753 ;; Next column to align to.
b0eef2ac5a59 (completion--insert-strings): Fix up computation of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101162
diff changeset
754 (setq column (+ column
b0eef2ac5a59 (completion--insert-strings): Fix up computation of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101162
diff changeset
755 ;; Round up to a whole number of columns.
b0eef2ac5a59 (completion--insert-strings): Fix up computation of
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101162
diff changeset
756 (* colwidth (ceiling length colwidth))))))))))
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
757
94464
66b02cd7b956 * minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94427
diff changeset
758 (defvar completion-common-substring nil)
66b02cd7b956 * minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94427
diff changeset
759 (make-obsolete-variable 'completion-common-substring nil "23.1")
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
760
94013
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
761 (defvar completion-setup-hook nil
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
762 "Normal hook run at the end of setting up a completion list buffer.
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
763 When this hook is run, the current buffer is the one in which the
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
764 command to display the completion list buffer was run.
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
765 The completion list buffer is available as the value of `standard-output'.
94464
66b02cd7b956 * minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94427
diff changeset
766 See also `display-completion-list'.")
66b02cd7b956 * minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94427
diff changeset
767
66b02cd7b956 * minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94427
diff changeset
768 (defface completions-first-difference
66b02cd7b956 * minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94427
diff changeset
769 '((t (:inherit bold)))
66b02cd7b956 * minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94427
diff changeset
770 "Face put on the first uncommon character in completions in *Completions* buffer."
66b02cd7b956 * minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94427
diff changeset
771 :group 'completion)
66b02cd7b956 * minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94427
diff changeset
772
66b02cd7b956 * minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94427
diff changeset
773 (defface completions-common-part
66b02cd7b956 * minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94427
diff changeset
774 '((t (:inherit default)))
66b02cd7b956 * minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94427
diff changeset
775 "Face put on the common prefix substring in completions in *Completions* buffer.
66b02cd7b956 * minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94427
diff changeset
776 The idea of `completions-common-part' is that you can use it to
66b02cd7b956 * minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94427
diff changeset
777 make the common parts less visible than normal, so that the rest
66b02cd7b956 * minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94427
diff changeset
778 of the differing parts is, by contrast, slightly highlighted."
66b02cd7b956 * minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94427
diff changeset
779 :group 'completion)
66b02cd7b956 * minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94427
diff changeset
780
100623
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
781 (defun completion-hilit-commonality (completions prefix-len base-size)
94464
66b02cd7b956 * minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94427
diff changeset
782 (when completions
100623
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
783 (let ((com-str-len (- prefix-len (or base-size 0))))
94464
66b02cd7b956 * minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94427
diff changeset
784 (nconc
66b02cd7b956 * minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94427
diff changeset
785 (mapcar
94558
9802c49152d9 (completion-hilit-commonality): Revert last change:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94487
diff changeset
786 (lambda (elem)
9802c49152d9 (completion-hilit-commonality): Revert last change:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94487
diff changeset
787 (let ((str
9802c49152d9 (completion-hilit-commonality): Revert last change:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94487
diff changeset
788 ;; Don't modify the string itself, but a copy, since the
9802c49152d9 (completion-hilit-commonality): Revert last change:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94487
diff changeset
789 ;; the string may be read-only or used for other purposes.
9802c49152d9 (completion-hilit-commonality): Revert last change:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94487
diff changeset
790 ;; Furthermore, since `completions' may come from
9802c49152d9 (completion-hilit-commonality): Revert last change:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94487
diff changeset
791 ;; display-completion-list, `elem' may be a list.
9802c49152d9 (completion-hilit-commonality): Revert last change:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94487
diff changeset
792 (if (consp elem)
9802c49152d9 (completion-hilit-commonality): Revert last change:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94487
diff changeset
793 (car (setq elem (cons (copy-sequence (car elem))
9802c49152d9 (completion-hilit-commonality): Revert last change:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94487
diff changeset
794 (cdr elem))))
9802c49152d9 (completion-hilit-commonality): Revert last change:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94487
diff changeset
795 (setq elem (copy-sequence elem)))))
100929
2677429036c3 (completion-hilit-commonality): Don't presume
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100908
diff changeset
796 (put-text-property 0
2677429036c3 (completion-hilit-commonality): Don't presume
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100908
diff changeset
797 ;; If completion-boundaries returns incorrect
2677429036c3 (completion-hilit-commonality): Don't presume
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100908
diff changeset
798 ;; values, all-completions may return strings
2677429036c3 (completion-hilit-commonality): Don't presume
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100908
diff changeset
799 ;; that don't contain the prefix.
2677429036c3 (completion-hilit-commonality): Don't presume
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100908
diff changeset
800 (min com-str-len (length str))
94558
9802c49152d9 (completion-hilit-commonality): Revert last change:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94487
diff changeset
801 'font-lock-face 'completions-common-part
9802c49152d9 (completion-hilit-commonality): Revert last change:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94487
diff changeset
802 str)
9802c49152d9 (completion-hilit-commonality): Revert last change:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94487
diff changeset
803 (if (> (length str) com-str-len)
9802c49152d9 (completion-hilit-commonality): Revert last change:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94487
diff changeset
804 (put-text-property com-str-len (1+ com-str-len)
9802c49152d9 (completion-hilit-commonality): Revert last change:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94487
diff changeset
805 'font-lock-face 'completions-first-difference
9802c49152d9 (completion-hilit-commonality): Revert last change:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94487
diff changeset
806 str)))
9802c49152d9 (completion-hilit-commonality): Revert last change:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94487
diff changeset
807 elem)
94464
66b02cd7b956 * minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94427
diff changeset
808 completions)
66b02cd7b956 * minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94427
diff changeset
809 base-size))))
94013
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
810
97478
6c4680239c3f (display-completion-list): Revert last change. Only default base-size
Chong Yidong <cyd@stupidchicken.com>
parents: 97476
diff changeset
811 (defun display-completion-list (completions &optional common-substring)
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
812 "Display the list of completions, COMPLETIONS, using `standard-output'.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
813 Each element may be just a symbol or string
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
814 or may be a list of two strings to be printed as if concatenated.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
815 If it is a list of two strings, the first is the actual completion
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
816 alternative, the second serves as annotation.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
817 `standard-output' must be a buffer.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
818 The actual completion alternatives, as inserted, are given `mouse-face'
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
819 properties of `highlight'.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
820 At the end, this runs the normal hook `completion-setup-hook'.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
821 It can find the completion buffer in `standard-output'.
97476
354026fc6299 (completion-boundaries): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 97179
diff changeset
822
97544
abca40c62d44 (display-completion-list): Re-state the obsolescence of `common-substring'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97478
diff changeset
823 The obsolete optional arg COMMON-SUBSTRING, if non-nil, should be a string
97476
354026fc6299 (completion-boundaries): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 97179
diff changeset
824 specifying a common substring for adding the faces
354026fc6299 (completion-boundaries): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 97179
diff changeset
825 `completions-first-difference' and `completions-common-part' to
97478
6c4680239c3f (display-completion-list): Revert last change. Only default base-size
Chong Yidong <cyd@stupidchicken.com>
parents: 97476
diff changeset
826 the completions buffer."
94464
66b02cd7b956 * minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94427
diff changeset
827 (if common-substring
66b02cd7b956 * minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94427
diff changeset
828 (setq completions (completion-hilit-commonality
100623
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
829 completions (length common-substring)
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
830 ;; We don't know the base-size.
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
831 nil)))
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
832 (if (not (bufferp standard-output))
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
833 ;; This *never* (ever) happens, so there's no point trying to be clever.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
834 (with-temp-buffer
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
835 (let ((standard-output (current-buffer))
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
836 (completion-setup-hook nil))
97478
6c4680239c3f (display-completion-list): Revert last change. Only default base-size
Chong Yidong <cyd@stupidchicken.com>
parents: 97476
diff changeset
837 (display-completion-list completions common-substring))
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
838 (princ (buffer-string)))
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
839
97478
6c4680239c3f (display-completion-list): Revert last change. Only default base-size
Chong Yidong <cyd@stupidchicken.com>
parents: 97476
diff changeset
840 (let ((mainbuf (current-buffer)))
6c4680239c3f (display-completion-list): Revert last change. Only default base-size
Chong Yidong <cyd@stupidchicken.com>
parents: 97476
diff changeset
841 (with-current-buffer standard-output
6c4680239c3f (display-completion-list): Revert last change. Only default base-size
Chong Yidong <cyd@stupidchicken.com>
parents: 97476
diff changeset
842 (goto-char (point-max))
6c4680239c3f (display-completion-list): Revert last change. Only default base-size
Chong Yidong <cyd@stupidchicken.com>
parents: 97476
diff changeset
843 (if (null completions)
6c4680239c3f (display-completion-list): Revert last change. Only default base-size
Chong Yidong <cyd@stupidchicken.com>
parents: 97476
diff changeset
844 (insert "There are no possible completions of what you have typed.")
6c4680239c3f (display-completion-list): Revert last change. Only default base-size
Chong Yidong <cyd@stupidchicken.com>
parents: 97476
diff changeset
845 (insert "Possible completions are:\n")
6c4680239c3f (display-completion-list): Revert last change. Only default base-size
Chong Yidong <cyd@stupidchicken.com>
parents: 97476
diff changeset
846 (let ((last (last completions)))
6c4680239c3f (display-completion-list): Revert last change. Only default base-size
Chong Yidong <cyd@stupidchicken.com>
parents: 97476
diff changeset
847 ;; Set base-size from the tail of the list.
6c4680239c3f (display-completion-list): Revert last change. Only default base-size
Chong Yidong <cyd@stupidchicken.com>
parents: 97476
diff changeset
848 (set (make-local-variable 'completion-base-size)
6c4680239c3f (display-completion-list): Revert last change. Only default base-size
Chong Yidong <cyd@stupidchicken.com>
parents: 97476
diff changeset
849 (or (cdr last)
6c4680239c3f (display-completion-list): Revert last change. Only default base-size
Chong Yidong <cyd@stupidchicken.com>
parents: 97476
diff changeset
850 (and (minibufferp mainbuf) 0)))
6c4680239c3f (display-completion-list): Revert last change. Only default base-size
Chong Yidong <cyd@stupidchicken.com>
parents: 97476
diff changeset
851 (setcdr last nil)) ; Make completions a properly nil-terminated list.
6c4680239c3f (display-completion-list): Revert last change. Only default base-size
Chong Yidong <cyd@stupidchicken.com>
parents: 97476
diff changeset
852 (completion--insert-strings completions)))))
94062
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
853
94464
66b02cd7b956 * minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94427
diff changeset
854 ;; The hilit used to be applied via completion-setup-hook, so there
66b02cd7b956 * minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94427
diff changeset
855 ;; may still be some code that uses completion-common-substring.
97476
354026fc6299 (completion-boundaries): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 97179
diff changeset
856 (with-no-warnings
354026fc6299 (completion-boundaries): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 97179
diff changeset
857 (let ((completion-common-substring common-substring))
354026fc6299 (completion-boundaries): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 97179
diff changeset
858 (run-hooks 'completion-setup-hook)))
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
859 nil)
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
860
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
861 (defun minibuffer-completion-help ()
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
862 "Display a list of possible completions of the current minibuffer contents."
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
863 (interactive)
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
864 (message "Making completion list...")
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
865 (let* ((string (field-string))
94211
81b6ecd7be01 (completion-try-completion): Change magic symbol
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94202
diff changeset
866 (completions (completion-all-completions
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
867 string
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
868 minibuffer-completion-table
94304
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
869 minibuffer-completion-predicate
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
870 (- (point) (field-beginning)))))
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
871 (message nil)
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
872 (if (and completions
94062
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
873 (or (consp (cdr completions))
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
874 (not (equal (car completions) string))))
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
875 (with-output-to-temp-buffer "*Completions*"
94062
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
876 (let* ((last (last completions))
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
877 (base-size (cdr last)))
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
878 ;; Remove the base-size tail because `sort' requires a properly
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
879 ;; nil-terminated list.
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
880 (when last (setcdr last nil))
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
881 (display-completion-list (nconc (sort completions 'string-lessp)
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
882 base-size))))
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
883
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
884 ;; If there are no completions, or if the current input is already the
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
885 ;; only possible completion, then hide (previous&stale) completions.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
886 (let ((window (and (get-buffer "*Completions*")
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
887 (get-buffer-window "*Completions*" 0))))
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
888 (when (and (window-live-p window) (window-dedicated-p window))
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
889 (condition-case ()
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
890 (delete-window window)
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
891 (error (iconify-frame (window-frame window))))))
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
892 (ding)
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
893 (minibuffer-message
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
894 (if completions "Sole completion" "No completions")))
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
895 nil))
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
896
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
897 (defun exit-minibuffer ()
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
898 "Terminate this minibuffer argument."
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
899 (interactive)
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
900 ;; If the command that uses this has made modifications in the minibuffer,
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
901 ;; we don't want them to cause deactivation of the mark in the original
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
902 ;; buffer.
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
903 ;; A better solution would be to make deactivate-mark buffer-local
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
904 ;; (or to turn it into a list of buffers, ...), but in the mean time,
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
905 ;; this should do the trick in most cases.
93937
dfe13eac745b * minibuffer.el (minibuffer): Move group from cus-edit.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93885
diff changeset
906 (setq deactivate-mark nil)
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
907 (throw 'exit nil))
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
908
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
909 (defun self-insert-and-exit ()
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
910 "Terminate minibuffer input."
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
911 (interactive)
101010
4efc7ca085ce Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents: 100929
diff changeset
912 (if (characterp last-command-event)
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
913 (call-interactively 'self-insert-command)
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
914 (ding))
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
915 (exit-minibuffer))
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
916
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
917 ;;; Key bindings.
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
918
95575
d34a432d5863 * keymap.c (Vminibuffer_local_filename_must_match_map):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95426
diff changeset
919 (define-obsolete-variable-alias 'minibuffer-local-must-match-filename-map
d34a432d5863 * keymap.c (Vminibuffer_local_filename_must_match_map):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95426
diff changeset
920 'minibuffer-local-filename-must-match-map "23.1")
d34a432d5863 * keymap.c (Vminibuffer_local_filename_must_match_map):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95426
diff changeset
921
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
922 (let ((map minibuffer-local-map))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
923 (define-key map "\C-g" 'abort-recursive-edit)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
924 (define-key map "\r" 'exit-minibuffer)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
925 (define-key map "\n" 'exit-minibuffer))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
926
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
927 (let ((map minibuffer-local-completion-map))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
928 (define-key map "\t" 'minibuffer-complete)
95172
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
929 ;; M-TAB is already abused for many other purposes, so we should find
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
930 ;; another binding for it.
894bae45bf1b (completion-all-sorted-completions): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95145
diff changeset
931 ;; (define-key map "\e\t" 'minibuffer-force-complete)
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
932 (define-key map " " 'minibuffer-complete-word)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
933 (define-key map "?" 'minibuffer-completion-help))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
934
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
935 (let ((map minibuffer-local-must-match-map))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
936 (define-key map "\r" 'minibuffer-complete-and-exit)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
937 (define-key map "\n" 'minibuffer-complete-and-exit))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
938
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
939 (let ((map minibuffer-local-filename-completion-map))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
940 (define-key map " " nil))
95575
d34a432d5863 * keymap.c (Vminibuffer_local_filename_must_match_map):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95426
diff changeset
941 (let ((map minibuffer-local-filename-must-match-map))
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
942 (define-key map " " nil))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
943
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
944 (let ((map minibuffer-local-ns-map))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
945 (define-key map " " 'exit-minibuffer)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
946 (define-key map "\t" 'exit-minibuffer)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
947 (define-key map "?" 'self-insert-and-exit))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
948
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
949 ;;; Completion tables.
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
950
93945
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
951 (defun minibuffer--double-dollars (str)
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
952 (replace-regexp-in-string "\\$" "$$" str))
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
953
94013
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
954 (defun completion--make-envvar-table ()
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
955 (mapcar (lambda (enventry)
101162
64a6da0f9aa2 * minibuffer.el (minibuffer-message): Fix regexp so it doesn't exclude
Juanma Barranquero <lekktu@gmail.com>
parents: 101010
diff changeset
956 (substring enventry 0 (string-match-p "=" enventry)))
94013
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
957 process-environment))
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
958
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
959 (defconst completion--embedded-envvar-re
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
960 (concat "\\(?:^\\|[^$]\\(?:\\$\\$\\)*\\)"
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
961 "$\\([[:alnum:]_]*\\|{\\([^}]*\\)\\)\\'"))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
962
94013
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
963 (defun completion--embedded-envvar-table (string pred action)
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
964 (if (eq (car-safe action) 'boundaries)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
965 ;; Compute the boundaries of the subfield to which this
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
966 ;; completion applies.
95228
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
967 (let ((suffix (cdr action)))
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
968 (if (string-match completion--embedded-envvar-re string)
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
969 (list* 'boundaries
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
970 (or (match-beginning 2) (match-beginning 1))
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
971 (when (string-match "[^[:alnum:]_]" suffix)
95228
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
972 (match-beginning 0)))))
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
973 (when (string-match completion--embedded-envvar-re string)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
974 (let* ((beg (or (match-beginning 2) (match-beginning 1)))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
975 (table (completion--make-envvar-table))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
976 (prefix (substring string 0 beg)))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
977 (if (eq (aref string (1- beg)) ?{)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
978 (setq table (apply-partially 'completion-table-with-terminator
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
979 "}" table)))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
980 (completion-table-with-context
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
981 prefix table (substring string beg) pred action)))))
94055
ec343c7600a2 (completion--embedded-envvar-table, read-file-name-internal):
Juanma Barranquero <lekktu@gmail.com>
parents: 94017
diff changeset
982
94218
701d10a19a8f (completion--file-name-table): Accept both the old `dir' or the new `pred' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94211
diff changeset
983 (defun completion--file-name-table (string pred action)
94202
987535788e11 (completion-table-dynamic): Fix typo, and reflow docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 94182
diff changeset
984 "Internal subroutine for `read-file-name'. Do not call this."
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
985 (cond
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
986 ((and (zerop (length string)) (eq 'lambda action))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
987 nil) ; FIXME: why?
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
988 ((eq (car-safe action) 'boundaries)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
989 ;; FIXME: Actually, this is not always right in the presence of
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
990 ;; envvars, but there's not much we can do, I think.
95228
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
991 (let ((start (length (file-name-directory string)))
101162
64a6da0f9aa2 * minibuffer.el (minibuffer-message): Fix regexp so it doesn't exclude
Juanma Barranquero <lekktu@gmail.com>
parents: 101010
diff changeset
992 (end (string-match-p "/" (cdr action))))
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
993 (list* 'boundaries start end)))
95426
92edde3e7af6 (completion-table-dynamic): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 95394
diff changeset
994
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
995 (t
94218
701d10a19a8f (completion--file-name-table): Accept both the old `dir' or the new `pred' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94211
diff changeset
996 (let* ((dir (if (stringp pred)
701d10a19a8f (completion--file-name-table): Accept both the old `dir' or the new `pred' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94211
diff changeset
997 ;; It used to be that `pred' was abused to pass `dir'
701d10a19a8f (completion--file-name-table): Accept both the old `dir' or the new `pred' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94211
diff changeset
998 ;; as an argument.
701d10a19a8f (completion--file-name-table): Accept both the old `dir' or the new `pred' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94211
diff changeset
999 (prog1 (expand-file-name pred) (setq pred nil))
701d10a19a8f (completion--file-name-table): Accept both the old `dir' or the new `pred' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94211
diff changeset
1000 default-directory))
701d10a19a8f (completion--file-name-table): Accept both the old `dir' or the new `pred' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94211
diff changeset
1001 (str (condition-case nil
94013
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
1002 (substitute-in-file-name string)
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
1003 (error string)))
93945
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1004 (name (file-name-nondirectory str))
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1005 (specdir (file-name-directory str))
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1006 (realdir (if specdir (expand-file-name specdir dir)
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1007 (file-name-as-directory dir))))
94055
ec343c7600a2 (completion--embedded-envvar-table, read-file-name-internal):
Juanma Barranquero <lekktu@gmail.com>
parents: 94017
diff changeset
1008
93945
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1009 (cond
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1010 ((null action)
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1011 (let ((comp (file-name-completion name realdir
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1012 read-file-name-predicate)))
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1013 (if (stringp comp)
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1014 ;; Requote the $s before returning the completion.
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1015 (minibuffer--double-dollars (concat specdir comp))
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1016 ;; Requote the $s before checking for changes.
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1017 (setq str (minibuffer--double-dollars str))
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1018 (if (string-equal string str)
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1019 comp
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1020 ;; If there's no real completion, but substitute-in-file-name
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1021 ;; changed the string, then return the new string.
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1022 str))))
94055
ec343c7600a2 (completion--embedded-envvar-table, read-file-name-internal):
Juanma Barranquero <lekktu@gmail.com>
parents: 94017
diff changeset
1023
93945
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1024 ((eq action t)
100623
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
1025 (let ((all (file-name-all-completions name realdir)))
94062
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
1026
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
1027 ;; Check the predicate, if necessary.
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
1028 (unless (memq read-file-name-predicate '(nil file-exists-p))
93945
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1029 (let ((comp ())
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1030 (pred
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1031 (if (eq read-file-name-predicate 'file-directory-p)
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1032 ;; Brute-force speed up for directory checking:
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1033 ;; Discard strings which don't end in a slash.
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1034 (lambda (s)
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1035 (let ((len (length s)))
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1036 (and (> len 0) (eq (aref s (1- len)) ?/))))
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1037 ;; Must do it the hard (and slow) way.
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1038 read-file-name-predicate)))
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1039 (let ((default-directory realdir))
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1040 (dolist (tem all)
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1041 (if (funcall pred tem) (push tem comp))))
94062
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
1042 (setq all (nreverse comp))))
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94055
diff changeset
1043
100623
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
1044 all))
93945
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1045
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1046 (t
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1047 ;; Only other case actually used is ACTION = lambda.
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1048 (let ((default-directory dir))
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1049 (funcall (or read-file-name-predicate 'file-exists-p) str))))))))
93945
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1050
94013
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
1051 (defalias 'read-file-name-internal
94055
ec343c7600a2 (completion--embedded-envvar-table, read-file-name-internal):
Juanma Barranquero <lekktu@gmail.com>
parents: 94017
diff changeset
1052 (completion-table-in-turn 'completion--embedded-envvar-table
94077
28e2f73174d6 (completion-table-with-terminator): Those completions
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94069
diff changeset
1053 'completion--file-name-table)
94013
bd1b8b62427b * minibuffer.el (complete-with-action, lazy-completion-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93945
diff changeset
1054 "Internal subroutine for `read-file-name'. Do not call this.")
93945
76ebfa5df8a2 * minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93944
diff changeset
1055
94300
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1056 (defvar read-file-name-function nil
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1057 "If this is non-nil, `read-file-name' does its work by calling this function.")
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1058
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1059 (defvar read-file-name-predicate nil
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1060 "Current predicate used by `read-file-name-internal'.")
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1061
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1062 (defcustom read-file-name-completion-ignore-case
97179
e99e1b5c726e (read-file-name-completion-ignore-case): Add cygwin to the list.
Chong Yidong <cyd@stupidchicken.com>
parents: 97142
diff changeset
1063 (if (memq system-type '(ms-dos windows-nt darwin cygwin))
94300
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1064 t nil)
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1065 "Non-nil means when reading a file name completion ignores case."
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1066 :group 'minibuffer
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1067 :type 'boolean
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1068 :version "22.1")
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1069
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1070 (defcustom insert-default-directory t
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1071 "Non-nil means when reading a filename start with default dir in minibuffer.
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1072
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1073 When the initial minibuffer contents show a name of a file or a directory,
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1074 typing RETURN without editing the initial contents is equivalent to typing
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1075 the default file name.
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1076
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1077 If this variable is non-nil, the minibuffer contents are always
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1078 initially non-empty, and typing RETURN without editing will fetch the
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1079 default name, if one is provided. Note however that this default name
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1080 is not necessarily the same as initial contents inserted in the minibuffer,
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1081 if the initial contents is just the default directory.
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1082
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1083 If this variable is nil, the minibuffer often starts out empty. In
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1084 that case you may have to explicitly fetch the next history element to
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1085 request the default name; typing RETURN without editing will leave
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1086 the minibuffer empty.
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1087
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1088 For some commands, exiting with an empty minibuffer has a special meaning,
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1089 such as making the current buffer visit no file in the case of
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1090 `set-visited-file-name'."
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1091 :group 'minibuffer
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1092 :type 'boolean)
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1093
94315
755dd4bba830 (x-file-dialog): Declare as function.
Glenn Morris <rgm@gnu.org>
parents: 94304
diff changeset
1094 ;; Not always defined, but only called if next-read-file-uses-dialog-p says so.
755dd4bba830 (x-file-dialog): Declare as function.
Glenn Morris <rgm@gnu.org>
parents: 94304
diff changeset
1095 (declare-function x-file-dialog "xfns.c"
755dd4bba830 (x-file-dialog): Declare as function.
Glenn Morris <rgm@gnu.org>
parents: 94304
diff changeset
1096 (prompt dir &optional default-filename mustmatch only-dir-p))
755dd4bba830 (x-file-dialog): Declare as function.
Glenn Morris <rgm@gnu.org>
parents: 94304
diff changeset
1097
94300
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1098 (defun read-file-name (prompt &optional dir default-filename mustmatch initial predicate)
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1099 "Read file name, prompting with PROMPT and completing in directory DIR.
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1100 Value is not expanded---you must call `expand-file-name' yourself.
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1101 Default name to DEFAULT-FILENAME if user exits the minibuffer with
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1102 the same non-empty string that was inserted by this function.
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1103 (If DEFAULT-FILENAME is omitted, the visited file name is used,
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1104 except that if INITIAL is specified, that combined with DIR is used.)
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1105 If the user exits with an empty minibuffer, this function returns
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1106 an empty string. (This can only happen if the user erased the
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1107 pre-inserted contents or if `insert-default-directory' is nil.)
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1108 Fourth arg MUSTMATCH non-nil means require existing file's name.
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1109 Non-nil and non-t means also require confirmation after completion.
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1110 Fifth arg INITIAL specifies text to start with.
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1111 If optional sixth arg PREDICATE is non-nil, possible completions and
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1112 the resulting file name must satisfy (funcall PREDICATE NAME).
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1113 DIR should be an absolute directory name. It defaults to the value of
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1114 `default-directory'.
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1115
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1116 If this command was invoked with the mouse, use a file dialog box if
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1117 `use-dialog-box' is non-nil, and the window system or X toolkit in use
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1118 provides a file dialog box.
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1119
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1120 See also `read-file-name-completion-ignore-case'
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1121 and `read-file-name-function'."
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1122 (unless dir (setq dir default-directory))
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1123 (unless (file-name-absolute-p dir) (setq dir (expand-file-name dir)))
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1124 (unless default-filename
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1125 (setq default-filename (if initial (expand-file-name initial dir)
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1126 buffer-file-name)))
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1127 ;; If dir starts with user's homedir, change that to ~.
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1128 (setq dir (abbreviate-file-name dir))
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1129 ;; Likewise for default-filename.
94301
9060af7294b9 (read-file-name): Don't let-bind default-directory.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94300
diff changeset
1130 (if default-filename
9060af7294b9 (read-file-name): Don't let-bind default-directory.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94300
diff changeset
1131 (setq default-filename (abbreviate-file-name default-filename)))
94300
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1132 (let ((insdef (cond
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1133 ((and insert-default-directory (stringp dir))
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1134 (if initial
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1135 (cons (minibuffer--double-dollars (concat dir initial))
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1136 (length (minibuffer--double-dollars dir)))
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1137 (minibuffer--double-dollars dir)))
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1138 (initial (cons (minibuffer--double-dollars initial) 0)))))
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1139
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1140 (if read-file-name-function
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1141 (funcall read-file-name-function
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1142 prompt dir default-filename mustmatch initial predicate)
94301
9060af7294b9 (read-file-name): Don't let-bind default-directory.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94300
diff changeset
1143 (let ((completion-ignore-case read-file-name-completion-ignore-case)
94300
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1144 (minibuffer-completing-file-name t)
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1145 (read-file-name-predicate (or predicate 'file-exists-p))
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1146 (add-to-history nil))
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1147
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1148 (let* ((val
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1149 (if (not (next-read-file-uses-dialog-p))
94301
9060af7294b9 (read-file-name): Don't let-bind default-directory.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94300
diff changeset
1150 ;; We used to pass `dir' to `read-file-name-internal' by
9060af7294b9 (read-file-name): Don't let-bind default-directory.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94300
diff changeset
1151 ;; abusing the `predicate' argument. It's better to
9060af7294b9 (read-file-name): Don't let-bind default-directory.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94300
diff changeset
1152 ;; just use `default-directory', but in order to avoid
9060af7294b9 (read-file-name): Don't let-bind default-directory.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94300
diff changeset
1153 ;; changing `default-directory' in the current buffer,
9060af7294b9 (read-file-name): Don't let-bind default-directory.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94300
diff changeset
1154 ;; we don't let-bind it.
9060af7294b9 (read-file-name): Don't let-bind default-directory.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94300
diff changeset
1155 (lexical-let ((dir (file-name-as-directory
9060af7294b9 (read-file-name): Don't let-bind default-directory.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94300
diff changeset
1156 (expand-file-name dir))))
9060af7294b9 (read-file-name): Don't let-bind default-directory.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94300
diff changeset
1157 (minibuffer-with-setup-hook
9060af7294b9 (read-file-name): Don't let-bind default-directory.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94300
diff changeset
1158 (lambda () (setq default-directory dir))
9060af7294b9 (read-file-name): Don't let-bind default-directory.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94300
diff changeset
1159 (completing-read prompt 'read-file-name-internal
9060af7294b9 (read-file-name): Don't let-bind default-directory.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94300
diff changeset
1160 nil mustmatch insdef 'file-name-history
9060af7294b9 (read-file-name): Don't let-bind default-directory.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94300
diff changeset
1161 default-filename)))
94300
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1162 ;; If DIR contains a file name, split it.
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1163 (let ((file (file-name-nondirectory dir)))
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1164 (when (and default-filename (not (zerop (length file))))
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1165 (setq default-filename file)
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1166 (setq dir (file-name-directory dir)))
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1167 (if default-filename
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1168 (setq default-filename
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1169 (expand-file-name default-filename dir)))
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1170 (setq add-to-history t)
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1171 (x-file-dialog prompt dir default-filename mustmatch
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1172 (eq predicate 'file-directory-p)))))
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1173
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1174 (replace-in-history (eq (car-safe file-name-history) val)))
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1175 ;; If completing-read returned the inserted default string itself
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1176 ;; (rather than a new string with the same contents),
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1177 ;; it has to mean that the user typed RET with the minibuffer empty.
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1178 ;; In that case, we really want to return ""
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1179 ;; so that commands such as set-visited-file-name can distinguish.
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1180 (when (eq val default-filename)
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1181 ;; In this case, completing-read has not added an element
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1182 ;; to the history. Maybe we should.
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1183 (if (not replace-in-history)
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1184 (setq add-to-history t))
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1185 (setq val ""))
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1186 (unless val (error "No file name specified"))
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1187
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1188 (if (and default-filename
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1189 (string-equal val (if (consp insdef) (car insdef) insdef)))
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1190 (setq val default-filename))
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1191 (setq val (substitute-in-file-name val))
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1192
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1193 (if replace-in-history
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1194 ;; Replace what Fcompleting_read added to the history
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1195 ;; with what we will actually return.
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1196 (let ((val1 (minibuffer--double-dollars val)))
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1197 (if history-delete-duplicates
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1198 (setcdr file-name-history
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1199 (delete val1 (cdr file-name-history))))
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1200 (setcar file-name-history val1))
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1201 (if add-to-history
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1202 ;; Add the value to the history--but not if it matches
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1203 ;; the last value already there.
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1204 (let ((val1 (minibuffer--double-dollars val)))
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1205 (unless (and (consp file-name-history)
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1206 (equal (car file-name-history) val1))
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1207 (setq file-name-history
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1208 (cons val1
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1209 (if history-delete-duplicates
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1210 (delete val1 file-name-history)
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1211 file-name-history)))))))
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1212 val)))))
b47239d57d36 * lisp/minibuffer.el (read-file-name-function, read-file-name-predicate)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94247
diff changeset
1213
94247
57c8f6a6456a (internal-complete-buffer-except): New function.
Juri Linkov <juri@jurta.org>
parents: 94242
diff changeset
1214 (defun internal-complete-buffer-except (&optional buffer)
57c8f6a6456a (internal-complete-buffer-except): New function.
Juri Linkov <juri@jurta.org>
parents: 94242
diff changeset
1215 "Perform completion on all buffers excluding BUFFER.
101999
efada72951fb * minibuffer.el (internal-complete-buffer-except): Doc fix. (Bug#2315)
Juanma Barranquero <lekktu@gmail.com>
parents: 101327
diff changeset
1216 BUFFER nil or omitted means use the current buffer.
94247
57c8f6a6456a (internal-complete-buffer-except): New function.
Juri Linkov <juri@jurta.org>
parents: 94242
diff changeset
1217 Like `internal-complete-buffer', but removes BUFFER from the completion list."
57c8f6a6456a (internal-complete-buffer-except): New function.
Juri Linkov <juri@jurta.org>
parents: 94242
diff changeset
1218 (lexical-let ((except (if (stringp buffer) buffer (buffer-name buffer))))
57c8f6a6456a (internal-complete-buffer-except): New function.
Juri Linkov <juri@jurta.org>
parents: 94242
diff changeset
1219 (apply-partially 'completion-table-with-predicate
57c8f6a6456a (internal-complete-buffer-except): New function.
Juri Linkov <juri@jurta.org>
parents: 94242
diff changeset
1220 'internal-complete-buffer
57c8f6a6456a (internal-complete-buffer-except): New function.
Juri Linkov <juri@jurta.org>
parents: 94242
diff changeset
1221 (lambda (name)
57c8f6a6456a (internal-complete-buffer-except): New function.
Juri Linkov <juri@jurta.org>
parents: 94242
diff changeset
1222 (not (equal (if (consp name) (car name) name) except)))
57c8f6a6456a (internal-complete-buffer-except): New function.
Juri Linkov <juri@jurta.org>
parents: 94242
diff changeset
1223 nil)))
57c8f6a6456a (internal-complete-buffer-except): New function.
Juri Linkov <juri@jurta.org>
parents: 94242
diff changeset
1224
95799
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1225 ;;; Old-style completion, used in Emacs-21 and Emacs-22.
94304
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
1226
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
1227 (defun completion-emacs21-try-completion (string table pred point)
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
1228 (let ((completion (try-completion string table pred)))
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
1229 (if (stringp completion)
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
1230 (cons completion (length completion))
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
1231 completion)))
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
1232
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
1233 (defun completion-emacs21-all-completions (string table pred point)
94464
66b02cd7b956 * minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94427
diff changeset
1234 (completion-hilit-commonality
95799
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1235 (all-completions string table pred)
100623
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
1236 (length string)
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
1237 (car (completion-boundaries string table pred ""))))
94304
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
1238
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
1239 (defun completion-emacs22-try-completion (string table pred point)
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
1240 (let ((suffix (substring string point))
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
1241 (completion (try-completion (substring string 0 point) table pred)))
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
1242 (if (not (stringp completion))
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
1243 completion
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
1244 ;; Merge a trailing / in completion with a / after point.
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
1245 ;; We used to only do it for word completion, but it seems to make
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
1246 ;; sense for all completions.
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1247 ;; Actually, claiming this feature was part of Emacs-22 completion
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1248 ;; is pushing it a bit: it was only done in minibuffer-completion-word,
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1249 ;; which was (by default) not bound during file completion, where such
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1250 ;; slashes are most likely to occur.
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1251 (if (and (not (zerop (length completion)))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1252 (eq ?/ (aref completion (1- (length completion))))
94304
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
1253 (not (zerop (length suffix)))
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
1254 (eq ?/ (aref suffix 0)))
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1255 ;; This leaves point after the / .
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1256 (setq suffix (substring suffix 1)))
94304
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
1257 (cons (concat completion suffix) (length completion)))))
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
1258
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
1259 (defun completion-emacs22-all-completions (string table pred point)
100623
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
1260 (let ((beforepoint (substring string 0 point)))
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
1261 (completion-hilit-commonality
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
1262 (all-completions beforepoint table pred)
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
1263 point
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
1264 (car (completion-boundaries beforepoint table pred "")))))
94304
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
1265
95799
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1266 ;;; Basic completion.
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1267
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1268 (defun completion--merge-suffix (completion point suffix)
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1269 "Merge end of COMPLETION with beginning of SUFFIX.
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1270 Simple generalization of the \"merge trailing /\" done in Emacs-22.
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1271 Return the new suffix."
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1272 (if (and (not (zerop (length suffix)))
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1273 (string-match "\\(.+\\)\n\\1" (concat completion "\n" suffix)
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1274 ;; Make sure we don't compress things to less
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1275 ;; than we started with.
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1276 point)
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1277 ;; Just make sure we didn't match some other \n.
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1278 (eq (match-end 1) (length completion)))
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1279 (substring suffix (- (match-end 1) (match-beginning 1)))
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1280 ;; Nothing to merge.
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1281 suffix))
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1282
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1283 (defun completion-basic-try-completion (string table pred point)
95799
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1284 (let* ((beforepoint (substring string 0 point))
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1285 (afterpoint (substring string point))
96294
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1286 (bounds (completion-boundaries beforepoint table pred afterpoint)))
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1287 (if (zerop (cdr bounds))
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1288 ;; `try-completion' may return a subtly different result
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1289 ;; than `all+merge', so try to use it whenever possible.
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1290 (let ((completion (try-completion beforepoint table pred)))
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1291 (if (not (stringp completion))
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1292 completion
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1293 (cons
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1294 (concat completion
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1295 (completion--merge-suffix completion point afterpoint))
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1296 (length completion))))
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1297 (let* ((suffix (substring afterpoint (cdr bounds)))
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1298 (prefix (substring beforepoint 0 (car bounds)))
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1299 (pattern (delete
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1300 "" (list (substring beforepoint (car bounds))
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1301 'point
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1302 (substring afterpoint 0 (cdr bounds)))))
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1303 (all (completion-pcm--all-completions prefix pattern table pred)))
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1304 (if minibuffer-completing-file-name
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1305 (setq all (completion-pcm--filename-try-filter all)))
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1306 (completion-pcm--merge-try pattern all prefix suffix)))))
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1307
96294
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1308 (defun completion-basic-all-completions (string table pred point)
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1309 (let* ((beforepoint (substring string 0 point))
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1310 (afterpoint (substring string point))
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1311 (bounds (completion-boundaries beforepoint table pred afterpoint))
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1312 (suffix (substring afterpoint (cdr bounds)))
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1313 (prefix (substring beforepoint 0 (car bounds)))
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1314 (pattern (delete
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1315 "" (list (substring beforepoint (car bounds))
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1316 'point
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1317 (substring afterpoint 0 (cdr bounds)))))
f12e581d977f (completion-basic-try-completion): Use the text after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95799
diff changeset
1318 (all (completion-pcm--all-completions prefix pattern table pred)))
100623
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
1319 (completion-hilit-commonality all point (car bounds))))
94304
bc48ced5cf89 (completion-try-completion): Add `point' argument. Change return value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94301
diff changeset
1320
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1321 ;;; Partial-completion-mode style completion.
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1322
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1323 (defvar completion-pcm--delim-wild-regex nil)
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1324
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1325 (defun completion-pcm--prepare-delim-re (delims)
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1326 (setq completion-pcm--delim-wild-regex (concat "[" delims "*]")))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1327
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1328 (defcustom completion-pcm-word-delimiters "-_. "
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1329 "A string of characters treated as word delimiters for completion.
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1330 Some arcane rules:
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1331 If `]' is in this string, it must come first.
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1332 If `^' is in this string, it must not come first.
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1333 If `-' is in this string, it must come first or right after `]'.
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1334 In other words, if S is this string, then `[S]' must be a valid Emacs regular
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1335 expression (not containing character ranges like `a-z')."
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1336 :set (lambda (symbol value)
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1337 (set-default symbol value)
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1338 ;; Refresh other vars.
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1339 (completion-pcm--prepare-delim-re value))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1340 :initialize 'custom-initialize-reset
94375
f8b940834bbb (completion-pcm-word-delimiters): Add :group.
Juanma Barranquero <lekktu@gmail.com>
parents: 94352
diff changeset
1341 :group 'minibuffer
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1342 :type 'string)
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1343
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1344 (defun completion-pcm--pattern-trivial-p (pattern)
100929
2677429036c3 (completion-hilit-commonality): Don't presume
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100908
diff changeset
1345 (and (stringp (car pattern))
2677429036c3 (completion-hilit-commonality): Don't presume
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100908
diff changeset
1346 ;; It can be followed by `point' and "" and still be trivial.
2677429036c3 (completion-hilit-commonality): Don't presume
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100908
diff changeset
1347 (let ((trivial t))
2677429036c3 (completion-hilit-commonality): Don't presume
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100908
diff changeset
1348 (dolist (elem (cdr pattern))
2677429036c3 (completion-hilit-commonality): Don't presume
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100908
diff changeset
1349 (unless (member elem '(point ""))
2677429036c3 (completion-hilit-commonality): Don't presume
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100908
diff changeset
1350 (setq trivial nil)))
2677429036c3 (completion-hilit-commonality): Don't presume
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100908
diff changeset
1351 trivial)))
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1352
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1353 (defun completion-pcm--string->pattern (string &optional point)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1354 "Split STRING into a pattern.
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1355 A pattern is a list where each element is either a string
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1356 or a symbol chosen among `any', `star', `point'."
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1357 (if (and point (< point (length string)))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1358 (let ((prefix (substring string 0 point))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1359 (suffix (substring string point)))
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1360 (append (completion-pcm--string->pattern prefix)
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1361 '(point)
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1362 (completion-pcm--string->pattern suffix)))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1363 (let ((pattern nil)
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1364 (p 0)
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1365 (p0 0))
94375
f8b940834bbb (completion-pcm-word-delimiters): Add :group.
Juanma Barranquero <lekktu@gmail.com>
parents: 94352
diff changeset
1366
101162
64a6da0f9aa2 * minibuffer.el (minibuffer-message): Fix regexp so it doesn't exclude
Juanma Barranquero <lekktu@gmail.com>
parents: 101010
diff changeset
1367 (while (setq p (string-match-p completion-pcm--delim-wild-regex string p))
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1368 (push (substring string p0 p) pattern)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1369 (if (eq (aref string p) ?*)
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1370 (progn
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1371 (push 'star pattern)
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1372 (setq p0 (1+ p)))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1373 (push 'any pattern)
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1374 (setq p0 p))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1375 (incf p))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1376
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1377 ;; An empty string might be erroneously added at the beginning.
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1378 ;; It should be avoided properly, but it's so easy to remove it here.
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1379 (delete "" (nreverse (cons (substring string p0) pattern))))))
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1380
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1381 (defun completion-pcm--pattern->regex (pattern &optional group)
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1382 (let ((re
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1383 (concat "\\`"
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1384 (mapconcat
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1385 (lambda (x)
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1386 (case x
97966
52f84cb577bb (completion-pcm--pattern->regex): Undo last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97934
diff changeset
1387 ((star any point)
52f84cb577bb (completion-pcm--pattern->regex): Undo last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97934
diff changeset
1388 (if (if (consp group) (memq x group) group)
52f84cb577bb (completion-pcm--pattern->regex): Undo last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97934
diff changeset
1389 "\\(.*?\\)" ".*?"))
52f84cb577bb (completion-pcm--pattern->regex): Undo last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97934
diff changeset
1390 (t (regexp-quote x))))
52f84cb577bb (completion-pcm--pattern->regex): Undo last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97934
diff changeset
1391 pattern
52f84cb577bb (completion-pcm--pattern->regex): Undo last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97934
diff changeset
1392 ""))))
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1393 ;; Avoid pathological backtracking.
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1394 (while (string-match "\\.\\*\\?\\(?:\\\\[()]\\)*\\(\\.\\*\\?\\)" re)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1395 (setq re (replace-match "" t t re 1)))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1396 re))
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1397
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1398 (defun completion-pcm--all-completions (prefix pattern table pred)
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1399 "Find all completions for PATTERN in TABLE obeying PRED.
94375
f8b940834bbb (completion-pcm-word-delimiters): Add :group.
Juanma Barranquero <lekktu@gmail.com>
parents: 94352
diff changeset
1400 PATTERN is as returned by `completion-pcm--string->pattern'."
100623
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
1401 ;; (assert (= (car (completion-boundaries prefix table pred ""))
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
1402 ;; (length prefix)))
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1403 ;; Find an initial list of possible completions.
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1404 (if (completion-pcm--pattern-trivial-p pattern)
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1405
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1406 ;; Minibuffer contains no delimiters -- simple case!
100623
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
1407 (all-completions (concat prefix (car pattern)) table pred)
94375
f8b940834bbb (completion-pcm-word-delimiters): Add :group.
Juanma Barranquero <lekktu@gmail.com>
parents: 94352
diff changeset
1408
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1409 ;; Use all-completions to do an initial cull. This is a big win,
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1410 ;; since all-completions is written in C!
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1411 (let* (;; Convert search pattern to a standard regular expression.
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1412 (regex (completion-pcm--pattern->regex pattern))
97966
52f84cb577bb (completion-pcm--pattern->regex): Undo last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97934
diff changeset
1413 (case-fold-search completion-ignore-case)
52f84cb577bb (completion-pcm--pattern->regex): Undo last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97934
diff changeset
1414 (completion-regexp-list (cons regex completion-regexp-list))
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1415 (compl (all-completions
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1416 (concat prefix (if (stringp (car pattern)) (car pattern) ""))
100623
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100052
diff changeset
1417 table pred)))
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1418 (if (not (functionp table))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1419 ;; The internal functions already obeyed completion-regexp-list.
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1420 compl
97966
52f84cb577bb (completion-pcm--pattern->regex): Undo last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97934
diff changeset
1421 (let ((poss ()))
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1422 (dolist (c compl)
101162
64a6da0f9aa2 * minibuffer.el (minibuffer-message): Fix regexp so it doesn't exclude
Juanma Barranquero <lekktu@gmail.com>
parents: 101010
diff changeset
1423 (when (string-match-p regex c) (push c poss)))
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1424 poss)))))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1425
94465
e2562e0fe05e (completion-hilit-commonality): Remove leftover code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94464
diff changeset
1426 (defun completion-pcm--hilit-commonality (pattern completions)
e2562e0fe05e (completion-hilit-commonality): Remove leftover code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94464
diff changeset
1427 (when completions
e2562e0fe05e (completion-hilit-commonality): Remove leftover code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94464
diff changeset
1428 (let* ((re (completion-pcm--pattern->regex pattern '(point)))
100929
2677429036c3 (completion-hilit-commonality): Don't presume
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100908
diff changeset
1429 (case-fold-search completion-ignore-case))
94465
e2562e0fe05e (completion-hilit-commonality): Remove leftover code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94464
diff changeset
1430 ;; Remove base-size during mapcar, and add it back later.
100929
2677429036c3 (completion-hilit-commonality): Don't presume
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100908
diff changeset
1431 (mapcar
2677429036c3 (completion-hilit-commonality): Don't presume
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100908
diff changeset
1432 (lambda (str)
2677429036c3 (completion-hilit-commonality): Don't presume
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100908
diff changeset
1433 ;; Don't modify the string itself.
2677429036c3 (completion-hilit-commonality): Don't presume
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100908
diff changeset
1434 (setq str (copy-sequence str))
2677429036c3 (completion-hilit-commonality): Don't presume
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100908
diff changeset
1435 (unless (string-match re str)
2677429036c3 (completion-hilit-commonality): Don't presume
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100908
diff changeset
1436 (error "Internal error: %s does not match %s" re str))
2677429036c3 (completion-hilit-commonality): Don't presume
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100908
diff changeset
1437 (let ((pos (or (match-beginning 1) (match-end 0))))
2677429036c3 (completion-hilit-commonality): Don't presume
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100908
diff changeset
1438 (put-text-property 0 pos
2677429036c3 (completion-hilit-commonality): Don't presume
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100908
diff changeset
1439 'font-lock-face 'completions-common-part
2677429036c3 (completion-hilit-commonality): Don't presume
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100908
diff changeset
1440 str)
2677429036c3 (completion-hilit-commonality): Don't presume
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100908
diff changeset
1441 (if (> (length str) pos)
2677429036c3 (completion-hilit-commonality): Don't presume
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100908
diff changeset
1442 (put-text-property pos (1+ pos)
2677429036c3 (completion-hilit-commonality): Don't presume
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100908
diff changeset
1443 'font-lock-face 'completions-first-difference
2677429036c3 (completion-hilit-commonality): Don't presume
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100908
diff changeset
1444 str)))
2677429036c3 (completion-hilit-commonality): Don't presume
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100908
diff changeset
1445 str)
2677429036c3 (completion-hilit-commonality): Don't presume
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100908
diff changeset
1446 completions))))
94465
e2562e0fe05e (completion-hilit-commonality): Remove leftover code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94464
diff changeset
1447
95799
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1448 (defun completion-pcm--find-all-completions (string table pred point
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1449 &optional filter)
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1450 "Find all completions for STRING at POINT in TABLE, satisfying PRED.
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1451 POINT is a position inside STRING.
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1452 FILTER is a function applied to the return value, that can be used, e.g. to
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1453 filter out additional entries (because TABLE migth not obey PRED)."
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1454 (unless filter (setq filter 'identity))
95228
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
1455 (let* ((beforepoint (substring string 0 point))
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
1456 (afterpoint (substring string point))
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
1457 (bounds (completion-boundaries beforepoint table pred afterpoint))
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
1458 (prefix (substring beforepoint 0 (car bounds)))
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
1459 (suffix (substring afterpoint (cdr bounds)))
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1460 firsterror)
95228
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
1461 (setq string (substring string (car bounds) (+ point (cdr bounds))))
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
1462 (let* ((relpoint (- point (car bounds)))
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
1463 (pattern (completion-pcm--string->pattern string relpoint))
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1464 (all (condition-case err
95799
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1465 (funcall filter
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1466 (completion-pcm--all-completions
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1467 prefix pattern table pred))
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1468 (error (unless firsterror (setq firsterror err)) nil))))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1469 (when (and (null all)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1470 (> (car bounds) 0)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1471 (null (ignore-errors (try-completion prefix table pred))))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1472 ;; The prefix has no completions at all, so we should try and fix
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1473 ;; that first.
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1474 (let ((substring (substring prefix 0 -1)))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1475 (destructuring-bind (subpat suball subprefix subsuffix)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1476 (completion-pcm--find-all-completions
95799
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1477 substring table pred (length substring) filter)
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1478 (let ((sep (aref prefix (1- (length prefix))))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1479 ;; Text that goes between the new submatches and the
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1480 ;; completion substring.
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1481 (between nil))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1482 ;; Eliminate submatches that don't end with the separator.
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1483 (dolist (submatch (prog1 suball (setq suball ())))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1484 (when (eq sep (aref submatch (1- (length submatch))))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1485 (push submatch suball)))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1486 (when suball
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1487 ;; Update the boundaries and corresponding pattern.
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1488 ;; We assume that all submatches result in the same boundaries
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1489 ;; since we wouldn't know how to merge them otherwise anyway.
95228
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
1490 ;; FIXME: COMPLETE REWRITE!!!
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
1491 (let* ((newbeforepoint
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
1492 (concat subprefix (car suball)
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
1493 (substring string 0 relpoint)))
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
1494 (leftbound (+ (length subprefix) (length (car suball))))
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1495 (newbounds (completion-boundaries
95228
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
1496 newbeforepoint table pred afterpoint)))
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
1497 (unless (or (and (eq (cdr bounds) (cdr newbounds))
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
1498 (eq (car newbounds) leftbound))
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1499 ;; Refuse new boundaries if they step over
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1500 ;; the submatch.
95228
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
1501 (< (car newbounds) leftbound))
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1502 ;; The new completed prefix does change the boundaries
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1503 ;; of the completed substring.
95228
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
1504 (setq suffix (substring afterpoint (cdr newbounds)))
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
1505 (setq string
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
1506 (concat (substring newbeforepoint (car newbounds))
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
1507 (substring afterpoint 0 (cdr newbounds))))
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
1508 (setq between (substring newbeforepoint leftbound
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1509 (car newbounds)))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1510 (setq pattern (completion-pcm--string->pattern
95228
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
1511 string
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
1512 (- (length newbeforepoint)
451f4028c096 * minibuffer.el (completion-boundaries): Change calling convention, so
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95192
diff changeset
1513 (car newbounds)))))
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1514 (dolist (submatch suball)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1515 (setq all (nconc (mapcar
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1516 (lambda (s) (concat submatch between s))
95799
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1517 (funcall filter
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1518 (completion-pcm--all-completions
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1519 (concat subprefix submatch between)
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1520 pattern table pred)))
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1521 all)))
95192
042486c3318c (completion-pcm--find-all-completions): Don't add pseudo-completions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95172
diff changeset
1522 ;; FIXME: This can come in handy for try-completion,
042486c3318c (completion-pcm--find-all-completions): Don't add pseudo-completions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95172
diff changeset
1523 ;; but isn't right for all-completions, since it lists
042486c3318c (completion-pcm--find-all-completions): Don't add pseudo-completions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95172
diff changeset
1524 ;; invalid completions.
042486c3318c (completion-pcm--find-all-completions): Don't add pseudo-completions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95172
diff changeset
1525 ;; (unless all
042486c3318c (completion-pcm--find-all-completions): Don't add pseudo-completions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95172
diff changeset
1526 ;; ;; Even though we found expansions in the prefix, none
042486c3318c (completion-pcm--find-all-completions): Don't add pseudo-completions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95172
diff changeset
1527 ;; ;; leads to a valid completion.
042486c3318c (completion-pcm--find-all-completions): Don't add pseudo-completions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95172
diff changeset
1528 ;; ;; Let's keep the expansions, tho.
042486c3318c (completion-pcm--find-all-completions): Don't add pseudo-completions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95172
diff changeset
1529 ;; (dolist (submatch suball)
042486c3318c (completion-pcm--find-all-completions): Don't add pseudo-completions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95172
diff changeset
1530 ;; (push (concat submatch between newsubstring) all)))
042486c3318c (completion-pcm--find-all-completions): Don't add pseudo-completions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95172
diff changeset
1531 ))
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1532 (setq pattern (append subpat (list 'any (string sep))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1533 (if between (list between)) pattern))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1534 (setq prefix subprefix)))))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1535 (if (and (null all) firsterror)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1536 (signal (car firsterror) (cdr firsterror))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1537 (list pattern all prefix suffix)))))
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1538
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1539 (defun completion-pcm-all-completions (string table pred point)
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1540 (destructuring-bind (pattern all &optional prefix suffix)
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1541 (completion-pcm--find-all-completions string table pred point)
95394
119c6508d4f8 (completion-pcm-all-completions): Add the base-size.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95228
diff changeset
1542 (when all
119c6508d4f8 (completion-pcm-all-completions): Add the base-size.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95228
diff changeset
1543 (nconc (completion-pcm--hilit-commonality pattern all)
119c6508d4f8 (completion-pcm-all-completions): Add the base-size.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95228
diff changeset
1544 (length prefix)))))
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1545
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1546 (defun completion-pcm--merge-completions (strs pattern)
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1547 "Extract the commonality in STRS, with the help of PATTERN."
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1548 (cond
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1549 ((null (cdr strs)) (list (car strs)))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1550 (t
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1551 (let ((re (completion-pcm--pattern->regex pattern 'group))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1552 (ccs ())) ;Chopped completions.
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1553
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1554 ;; First chop each string into the parts corresponding to each
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1555 ;; non-constant element of `pattern', using regexp-matching.
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1556 (let ((case-fold-search completion-ignore-case))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1557 (dolist (str strs)
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1558 (unless (string-match re str)
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1559 (error "Internal error: %s doesn't match %s" str re))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1560 (let ((chopped ())
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1561 (i 1))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1562 (while (match-beginning i)
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1563 (push (match-string i str) chopped)
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1564 (setq i (1+ i)))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1565 ;; Add the text corresponding to the implicit trailing `any'.
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1566 (push (substring str (match-end 0)) chopped)
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1567 (push (nreverse chopped) ccs))))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1568
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1569 ;; Then for each of those non-constant elements, extract the
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1570 ;; commonality between them.
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1571 (let ((res ()))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1572 ;; Make the implicit `any' explicit. We could make it explicit
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1573 ;; everywhere, but it would slow down regexp-matching a little bit.
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1574 (dolist (elem (append pattern '(any)))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1575 (if (stringp elem)
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1576 (push elem res)
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1577 (let ((comps ()))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1578 (dolist (cc (prog1 ccs (setq ccs nil)))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1579 (push (car cc) comps)
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1580 (push (cdr cc) ccs))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1581 (let* ((prefix (try-completion "" comps))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1582 (unique (or (and (eq prefix t) (setq prefix ""))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1583 (eq t (try-completion prefix comps)))))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1584 (unless (equal prefix "") (push prefix res))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1585 ;; If there's only one completion, `elem' is not useful
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1586 ;; any more: it can only match the empty string.
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1587 ;; FIXME: in some cases, it may be necessary to turn an
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1588 ;; `any' into a `star' because the surrounding context has
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1589 ;; changed such that string->pattern wouldn't add an `any'
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1590 ;; here any more.
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1591 (unless unique (push elem res))))))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1592 ;; We return it in reverse order.
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1593 res)))))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1594
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1595 (defun completion-pcm--pattern->string (pattern)
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1596 (mapconcat (lambda (x) (cond
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1597 ((stringp x) x)
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1598 ((eq x 'star) "*")
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1599 ((eq x 'any) "")
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1600 ((eq x 'point) "")))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1601 pattern
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1602 ""))
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1603
95799
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1604 ;; We want to provide the functionality of `try', but we use `all'
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1605 ;; and then merge it. In most cases, this works perfectly, but
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1606 ;; if the completion table doesn't consider the same completions in
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1607 ;; `try' as in `all', then we have a problem. The most common such
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1608 ;; case is for filename completion where completion-ignored-extensions
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1609 ;; is only obeyed by the `try' code. We paper over the difference
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1610 ;; here. Note that it is not quite right either: if the completion
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1611 ;; table uses completion-table-in-turn, this filtering may take place
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1612 ;; too late to correctly fallback from the first to the
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1613 ;; second alternative.
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1614 (defun completion-pcm--filename-try-filter (all)
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1615 "Filter to adjust `all' file completion to the behavior of `try'."
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1616 (when all
95799
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1617 (let ((try ())
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1618 (re (concat "\\(?:\\`\\.\\.?/\\|"
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1619 (regexp-opt completion-ignored-extensions)
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1620 "\\)\\'")))
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1621 (dolist (f all)
101162
64a6da0f9aa2 * minibuffer.el (minibuffer-message): Fix regexp so it doesn't exclude
Juanma Barranquero <lekktu@gmail.com>
parents: 101010
diff changeset
1622 (unless (string-match-p re f) (push f try)))
95799
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1623 (or try all))))
101162
64a6da0f9aa2 * minibuffer.el (minibuffer-message): Fix regexp so it doesn't exclude
Juanma Barranquero <lekktu@gmail.com>
parents: 101010
diff changeset
1624
95799
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1625
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1626 (defun completion-pcm--merge-try (pattern all prefix suffix)
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1627 (cond
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1628 ((not (consp all)) all)
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1629 ((and (not (consp (cdr all))) ;Only one completion.
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1630 ;; Ignore completion-ignore-case here.
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1631 (equal (completion-pcm--pattern->string pattern) (car all)))
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1632 t)
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1633 (t
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1634 (let* ((mergedpat (completion-pcm--merge-completions all pattern))
94486
ca90422b8114 (completion--do-completion): Move point even if the completion makes no change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94465
diff changeset
1635 ;; `mergedpat' is in reverse order. Place new point (by
ca90422b8114 (completion--do-completion): Move point even if the completion makes no change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94465
diff changeset
1636 ;; order of preference) either at the old point, or at
ca90422b8114 (completion--do-completion): Move point even if the completion makes no change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94465
diff changeset
1637 ;; the last place where there's something to choose, or
ca90422b8114 (completion--do-completion): Move point even if the completion makes no change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94465
diff changeset
1638 ;; at the very end.
ca90422b8114 (completion--do-completion): Move point even if the completion makes no change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94465
diff changeset
1639 (pointpat (or (memq 'point mergedpat) (memq 'any mergedpat)
94487
432e68e359fa (completion-pcm-try-completion): Typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94486
diff changeset
1640 mergedpat))
94486
ca90422b8114 (completion--do-completion): Move point even if the completion makes no change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94465
diff changeset
1641 ;; New pos from the start.
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1642 (newpos (length (completion-pcm--pattern->string pointpat)))
94486
ca90422b8114 (completion--do-completion): Move point even if the completion makes no change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94465
diff changeset
1643 ;; Do it afterwards because it changes `pointpat' by sideeffect.
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1644 (merged (completion-pcm--pattern->string (nreverse mergedpat))))
95799
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1645
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1646 (setq suffix (completion--merge-suffix merged newpos suffix))
95145
096cfec41046 (completion-boundaries): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94736
diff changeset
1647 (cons (concat prefix merged suffix) (+ newpos (length prefix)))))))
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1648
95799
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1649 (defun completion-pcm-try-completion (string table pred point)
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1650 (destructuring-bind (pattern all prefix suffix)
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1651 (completion-pcm--find-all-completions
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1652 string table pred point
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1653 (if minibuffer-completing-file-name
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1654 'completion-pcm--filename-try-filter))
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1655 (completion-pcm--merge-try pattern all prefix suffix)))
b0653ad2932d (completion--merge-suffix): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95671
diff changeset
1656
94352
add0e6cf4336 (completion-table-with-context): Fix `pred' for the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94315
diff changeset
1657
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1658 (provide 'minibuffer)
94144
40901fec25aa Add arch tagline
Miles Bader <miles@gnu.org>
parents: 94134
diff changeset
1659
40901fec25aa Add arch tagline
Miles Bader <miles@gnu.org>
parents: 94134
diff changeset
1660 ;; arch-tag: ef8a0a15-1080-4790-a754-04017c02f08f
93885
6c6216b3b878 * lisp/minibuffer.el: New file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1661 ;;; minibuffer.el ends here