Mercurial > emacs
annotate lisp/icomplete.el @ 110410:f2e111723c3a
Merge changes made in Gnus trunk.
Reimplement nnimap, and do tweaks to the rest of the code to support that.
* gnus-int.el (gnus-finish-retrieve-group-infos)
(gnus-retrieve-group-data-early): New functions.
* gnus-range.el (gnus-range-nconcat): New function.
* gnus-start.el (gnus-get-unread-articles): Support early retrieval of
data.
(gnus-read-active-for-groups): Support finishing the early retrieval of
data.
* gnus-sum.el (gnus-summary-move-article): Pass the move-to group name
if the move is internal, so that nnimap can do fast internal moves.
* gnus.el (gnus-article-special-mark-lists): Add uid/active tuples, for
nnimap usage.
* nnimap.el: Rewritten.
* nnmail.el (nnmail-inhibit-default-split-group): New internal variable
to allow the mail splitting to not return a default group. This is
useful for nnimap, which will leave unmatched mail in the inbox.
* utf7.el (utf7-encode): Autoload.
Implement shell connection.
* nnimap.el (nnimap-open-shell-stream): New function.
(nnimap-open-connection): Use it.
Get the number of lines by using BODYSTRUCTURE.
(nnimap-transform-headers): Get the number of lines in each message.
(nnimap-retrieve-headers): Query for BODYSTRUCTURE so that we get the
number of lines.
Not all servers return UIDNEXT. Work past this problem.
Remove junk from end of file.
Fix typo in "bogus" section.
Make capabilties be case-insensitive.
Require cl when compiling.
Don't bug out if the LIST command doesn't have any parameters.
2010-09-17 Knut Anders Hatlen <kahatlen@gmail.com> (tiny change)
* nnimap.el (nnimap-get-groups): Don't bug out if the LIST command
doesn't have any parameters.
(mm-text-html-renderer): Document gnus-article-html.
2010-09-17 Julien Danjou <julien@danjou.info> (tiny fix)
* mm-decode.el (mm-text-html-renderer): Document gnus-article-html.
* dgnushack.el: Define netrc-credentials.
If the user doesn't have a /etc/services, supply some sensible port defaults.
Have `unseen-or-unread' select an unread unseen article first.
(nntp-open-server): Return whether the open was successful or not.
Throughout all files, replace (save-excursion (set-buffer ...)) with (with-current-buffer ... ).
Save result so that it doesn't say "failed" all the time.
Add ~/.authinfo to the default, since that's probably most useful for users.
Don't use the "finish" method when we're reading from the agent.
Add some more nnimap-relevant agent stuff to nnagent.el.
* nnimap.el (nnimap-with-process-buffer): Removed.
Revert one line that was changed by mistake in the last checkin.
(nnimap-open-connection): Don't error out when we can't make a connection
nnimap-related changes to avoid bugging out if we can't contact a server.
* gnus-start.el (gnus-get-unread-articles): Don't try to scan groups
from methods that are denied.
* nnimap.el (nnimap-possibly-change-group): Return nil if we can't log
in.
(nnimap-finish-retrieve-group-infos): Make sure we're not waiting for
nothing.
* gnus-sum.el (gnus-select-newsgroup): Indent.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Sat, 18 Sep 2010 10:02:19 +0000 |
parents | 1545dcb1c3b7 |
children | 417b1e4d63cd |
rev | line source |
---|---|
29154 | 1 ;;; icomplete.el --- minibuffer completion incremental feedback |
8871
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
2 |
64762
41bb365f41c4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64091
diff
changeset
|
3 ;; Copyright (C) 1992, 1993, 1994, 1997, 1999, 2001, 2002, 2003, |
106815 | 4 ;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
5147 | 5 |
26516
d9368f38a7b5
(icomplete-completions): Use an explicit variable
Gerd Moellmann <gerd@gnu.org>
parents:
24644
diff
changeset
|
6 ;; Author: Ken Manheimer <klm@i.am> |
d9368f38a7b5
(icomplete-completions): Use an explicit variable
Gerd Moellmann <gerd@gnu.org>
parents:
24644
diff
changeset
|
7 ;; Maintainer: Ken Manheimer <klm@i.am> |
d9368f38a7b5
(icomplete-completions): Use an explicit variable
Gerd Moellmann <gerd@gnu.org>
parents:
24644
diff
changeset
|
8 ;; Created: Mar 1993 Ken Manheimer, klm@nist.gov - first release to usenet |
d9368f38a7b5
(icomplete-completions): Use an explicit variable
Gerd Moellmann <gerd@gnu.org>
parents:
24644
diff
changeset
|
9 ;; Last update: Ken Manheimer <klm@i.am>, 11/18/1999. |
13337 | 10 ;; Keywords: help, abbrev |
5147 | 11 |
8871
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
12 ;; This file is part of GNU Emacs. |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
13 |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93101
diff
changeset
|
14 ;; GNU Emacs is free software: you can redistribute it and/or modify |
8871
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
15 ;; it under the terms of the GNU General Public License as published by |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93101
diff
changeset
|
16 ;; the Free Software Foundation, either version 3 of the License, or |
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93101
diff
changeset
|
17 ;; (at your option) any later version. |
8871
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
18 |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
19 ;; GNU Emacs is distributed in the hope that it will be useful, |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
20 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
21 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
22 ;; GNU General Public License for more details. |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
23 |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
24 ;; 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:
93101
diff
changeset
|
25 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
8871
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
26 |
5147 | 27 ;;; Commentary: |
28 | |
14169 | 29 ;; Loading this package implements a more fine-grained minibuffer |
30 ;; completion feedback scheme. Prospective completions are concisely | |
31 ;; indicated within the minibuffer itself, with each successive | |
32 ;; keystroke. | |
8871
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
33 |
20764 | 34 ;; See `icomplete-completions' docstring for a description of the |
14169 | 35 ;; icomplete display format. |
8871
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
36 |
14169 | 37 ;; See the `icomplete-minibuffer-setup-hook' docstring for a means to |
38 ;; customize icomplete setup for interoperation with other | |
39 ;; minibuffer-oriented packages. | |
5147 | 40 |
26516
d9368f38a7b5
(icomplete-completions): Use an explicit variable
Gerd Moellmann <gerd@gnu.org>
parents:
24644
diff
changeset
|
41 ;; To activate icomplete mode, load the package and use the |
d9368f38a7b5
(icomplete-completions): Use an explicit variable
Gerd Moellmann <gerd@gnu.org>
parents:
24644
diff
changeset
|
42 ;; `icomplete-mode' function. You can subsequently deactivate it by |
d9368f38a7b5
(icomplete-completions): Use an explicit variable
Gerd Moellmann <gerd@gnu.org>
parents:
24644
diff
changeset
|
43 ;; invoking the function icomplete-mode with a negative prefix-arg |
d9368f38a7b5
(icomplete-completions): Use an explicit variable
Gerd Moellmann <gerd@gnu.org>
parents:
24644
diff
changeset
|
44 ;; (C-U -1 ESC-x icomplete-mode). Also, you can prevent activation of |
d9368f38a7b5
(icomplete-completions): Use an explicit variable
Gerd Moellmann <gerd@gnu.org>
parents:
24644
diff
changeset
|
45 ;; the mode during package load by first setting the variable |
d9368f38a7b5
(icomplete-completions): Use an explicit variable
Gerd Moellmann <gerd@gnu.org>
parents:
24644
diff
changeset
|
46 ;; `icomplete-mode' to nil. Icompletion can be enabled any time after |
d9368f38a7b5
(icomplete-completions): Use an explicit variable
Gerd Moellmann <gerd@gnu.org>
parents:
24644
diff
changeset
|
47 ;; the package is loaded by invoking icomplete-mode without a prefix |
d9368f38a7b5
(icomplete-completions): Use an explicit variable
Gerd Moellmann <gerd@gnu.org>
parents:
24644
diff
changeset
|
48 ;; arg. |
18029
82a56bdb2381
Integrated Emacs 19.34 and XEmacs 19.15
Karl Heuer <kwzh@gnu.org>
parents:
15302
diff
changeset
|
49 |
14169 | 50 ;; Thanks to everyone for their suggestions for refinements of this |
51 ;; package. I particularly have to credit Michael Cook, who | |
52 ;; implemented an incremental completion style in his 'iswitch' | |
53 ;; functions that served as a model for icomplete. Some other | |
20764 | 54 ;; contributors: Noah Friedman (restructuring as minor mode), Colin |
18251
e0327e90d706
Don't call icomplete-mode; let the user do that.
Richard M. Stallman <rms@gnu.org>
parents:
18060
diff
changeset
|
55 ;; Rafferty (lemacs reconciliation), Lars Lindberg, RMS, and others. |
8871
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
56 |
14169 | 57 ;; klm. |
5147 | 58 |
59 ;;; Code: | |
60 | |
8871
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
61 ;;;_* Provide |
5147 | 62 (provide 'icomplete) |
63 | |
20764 | 64 |
65 (defgroup icomplete nil | |
66 "Show completions dynamically in minibuffer." | |
67 :prefix "icomplete-" | |
68 :group 'minibuffer) | |
69 | |
95386
9d7e990b655a
(icomplete-prospects-length): Make obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95187
diff
changeset
|
70 (defvar icomplete-prospects-length 80) |
9d7e990b655a
(icomplete-prospects-length): Make obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95187
diff
changeset
|
71 (make-obsolete-variable |
9d7e990b655a
(icomplete-prospects-length): Make obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95187
diff
changeset
|
72 'icomplete-prospects-length 'icomplete-prospects-height "23.1") |
9d7e990b655a
(icomplete-prospects-length): Make obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95187
diff
changeset
|
73 |
26516
d9368f38a7b5
(icomplete-completions): Use an explicit variable
Gerd Moellmann <gerd@gnu.org>
parents:
24644
diff
changeset
|
74 ;;;_* User Customization variables |
95386
9d7e990b655a
(icomplete-prospects-length): Make obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95187
diff
changeset
|
75 (defcustom icomplete-prospects-height |
9d7e990b655a
(icomplete-prospects-length): Make obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95187
diff
changeset
|
76 ;; 20 is an estimated common size for the prompt + minibuffer content, to |
9d7e990b655a
(icomplete-prospects-length): Make obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95187
diff
changeset
|
77 ;; try to guess the number of lines used up by icomplete-prospects-length. |
9d7e990b655a
(icomplete-prospects-length): Make obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95187
diff
changeset
|
78 (+ 1 (/ (+ icomplete-prospects-length 20) (window-width))) |
9d7e990b655a
(icomplete-prospects-length): Make obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95187
diff
changeset
|
79 "Maximum number of lines to use in the minibuffer." |
95391
436059aff075
(icomplete-prospects-height): Add :group.
Juanma Barranquero <lekktu@gmail.com>
parents:
95390
diff
changeset
|
80 :type 'integer |
100439
5de002dfa264
* face-remap.el (text-scale-mode-step, buffer-face-mode-face):
Juanma Barranquero <lekktu@gmail.com>
parents:
95448
diff
changeset
|
81 :group 'icomplete |
5de002dfa264
* face-remap.el (text-scale-mode-step, buffer-face-mode-face):
Juanma Barranquero <lekktu@gmail.com>
parents:
95448
diff
changeset
|
82 :version "23.1") |
26516
d9368f38a7b5
(icomplete-completions): Use an explicit variable
Gerd Moellmann <gerd@gnu.org>
parents:
24644
diff
changeset
|
83 |
20764 | 84 (defcustom icomplete-compute-delay .3 |
93099
898c706f1ace
(icomplete-prospects-length, icomplete-max-delay-chars,
Juanma Barranquero <lekktu@gmail.com>
parents:
92743
diff
changeset
|
85 "Completions-computation stall, used only with large-number completions. |
898c706f1ace
(icomplete-prospects-length, icomplete-max-delay-chars,
Juanma Barranquero <lekktu@gmail.com>
parents:
92743
diff
changeset
|
86 See `icomplete-delay-completions-threshold'." |
20764 | 87 :type 'number |
88 :group 'icomplete) | |
89 | |
90 (defcustom icomplete-delay-completions-threshold 400 | |
93099
898c706f1ace
(icomplete-prospects-length, icomplete-max-delay-chars,
Juanma Barranquero <lekktu@gmail.com>
parents:
92743
diff
changeset
|
91 "Pending-completions number over which to apply `icomplete-compute-delay'." |
20764 | 92 :type 'integer |
93 :group 'icomplete) | |
8871
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
94 |
20764 | 95 (defcustom icomplete-max-delay-chars 3 |
93099
898c706f1ace
(icomplete-prospects-length, icomplete-max-delay-chars,
Juanma Barranquero <lekktu@gmail.com>
parents:
92743
diff
changeset
|
96 "Maximum number of initial chars to apply icomplete compute delay." |
20764 | 97 :type 'integer |
98 :group 'icomplete) | |
99 | |
100 (defcustom icomplete-show-key-bindings t | |
93099
898c706f1ace
(icomplete-prospects-length, icomplete-max-delay-chars,
Juanma Barranquero <lekktu@gmail.com>
parents:
92743
diff
changeset
|
101 "If non-nil, show key bindings as well as completion for sole matches." |
20764 | 102 :type 'boolean |
103 :group 'icomplete) | |
104 | |
105 (defcustom icomplete-minibuffer-setup-hook nil | |
93099
898c706f1ace
(icomplete-prospects-length, icomplete-max-delay-chars,
Juanma Barranquero <lekktu@gmail.com>
parents:
92743
diff
changeset
|
106 "Icomplete-specific customization of minibuffer setup. |
8871
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
107 |
78492
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
108 This hook is run during minibuffer setup if icomplete is active. |
8871
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
109 It is intended for use in customizing icomplete for interoperation |
35467
d9a298a82b9a
(icomplete-minibuffer-setup-hook): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
29154
diff
changeset
|
110 with other features and packages. For instance: |
8871
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
111 |
18029
82a56bdb2381
Integrated Emacs 19.34 and XEmacs 19.15
Karl Heuer <kwzh@gnu.org>
parents:
15302
diff
changeset
|
112 \(add-hook 'icomplete-minibuffer-setup-hook |
8871
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
113 \(function |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
114 \(lambda () |
35467
d9a298a82b9a
(icomplete-minibuffer-setup-hook): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
29154
diff
changeset
|
115 \(make-local-variable 'max-mini-window-height) |
d9a298a82b9a
(icomplete-minibuffer-setup-hook): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
29154
diff
changeset
|
116 \(setq max-mini-window-height 3)))) |
8871
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
117 |
35467
d9a298a82b9a
(icomplete-minibuffer-setup-hook): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
29154
diff
changeset
|
118 will constrain Emacs to a maximum minibuffer height of 3 lines when |
20764 | 119 icompletion is occurring." |
120 :type 'hook | |
121 :group 'icomplete) | |
122 | |
123 | |
124 ;;;_* Initialization | |
5147 | 125 |
5375
0e30cf7aa525
(icomplete-pre-command-hook): Reconciled with keyboard macro operation.
Richard M. Stallman <rms@gnu.org>
parents:
5147
diff
changeset
|
126 ;;;_ + Internal Variables |
60805
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
127 ;;;_ = icomplete-eoinput nil |
95187
ee32b9c9936c
(icomplete-eoinput): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95141
diff
changeset
|
128 (defvar icomplete-overlay (make-overlay (point-min) (point-min) nil t t) |
ee32b9c9936c
(icomplete-eoinput): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95141
diff
changeset
|
129 "Overlay used to display the list of completions.") |
ee32b9c9936c
(icomplete-eoinput): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95141
diff
changeset
|
130 |
8871
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
131 ;;;_ = icomplete-pre-command-hook |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
132 (defvar icomplete-pre-command-hook nil |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
133 "Incremental-minibuffer-completion pre-command-hook. |
5375
0e30cf7aa525
(icomplete-pre-command-hook): Reconciled with keyboard macro operation.
Richard M. Stallman <rms@gnu.org>
parents:
5147
diff
changeset
|
134 |
8871
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
135 Is run in minibuffer before user input when `icomplete-mode' is non-nil. |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
136 Use `icomplete-mode' function to set it up properly for incremental |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
137 minibuffer completion.") |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
138 (add-hook 'icomplete-pre-command-hook 'icomplete-tidy) |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
139 ;;;_ = icomplete-post-command-hook |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
140 (defvar icomplete-post-command-hook nil |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
141 "Incremental-minibuffer-completion post-command-hook. |
5147 | 142 |
8871
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
143 Is run in minibuffer after user input when `icomplete-mode' is non-nil. |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
144 Use `icomplete-mode' function to set it up properly for incremental |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
145 minibuffer completion.") |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
146 (add-hook 'icomplete-post-command-hook 'icomplete-exhibit) |
5375
0e30cf7aa525
(icomplete-pre-command-hook): Reconciled with keyboard macro operation.
Richard M. Stallman <rms@gnu.org>
parents:
5147
diff
changeset
|
147 |
18029
82a56bdb2381
Integrated Emacs 19.34 and XEmacs 19.15
Karl Heuer <kwzh@gnu.org>
parents:
15302
diff
changeset
|
148 (defun icomplete-get-keys (func-name) |
95448
27c911ed0a73
(icomplete-get-keys): Doc fix. Use `when'.
Juanma Barranquero <lekktu@gmail.com>
parents:
95391
diff
changeset
|
149 "Return strings naming keys bound to FUNC-NAME, or nil if none. |
18251
e0327e90d706
Don't call icomplete-mode; let the user do that.
Richard M. Stallman <rms@gnu.org>
parents:
18060
diff
changeset
|
150 Examines the prior, not current, buffer, presuming that current buffer |
e0327e90d706
Don't call icomplete-mode; let the user do that.
Richard M. Stallman <rms@gnu.org>
parents:
18060
diff
changeset
|
151 is minibuffer." |
95448
27c911ed0a73
(icomplete-get-keys): Doc fix. Use `when'.
Juanma Barranquero <lekktu@gmail.com>
parents:
95391
diff
changeset
|
152 (when (commandp func-name) |
18029
82a56bdb2381
Integrated Emacs 19.34 and XEmacs 19.15
Karl Heuer <kwzh@gnu.org>
parents:
15302
diff
changeset
|
153 (save-excursion |
82a56bdb2381
Integrated Emacs 19.34 and XEmacs 19.15
Karl Heuer <kwzh@gnu.org>
parents:
15302
diff
changeset
|
154 (let* ((sym (intern func-name)) |
68983
064f4da012f5
(icomplete-get-keys): Use `t' for the second arg `visible-ok'
Juri Linkov <juri@jurta.org>
parents:
68866
diff
changeset
|
155 (buf (other-buffer nil t)) |
79872
63a2e3bc921c
(icomplete-get-keys): Look up KEYS using all maps in proper buffer.
Richard M. Stallman <rms@gnu.org>
parents:
79721
diff
changeset
|
156 (keys (with-current-buffer buf (where-is-internal sym)))) |
95448
27c911ed0a73
(icomplete-get-keys): Doc fix. Use `when'.
Juanma Barranquero <lekktu@gmail.com>
parents:
95391
diff
changeset
|
157 (when keys |
27c911ed0a73
(icomplete-get-keys): Doc fix. Use `when'.
Juanma Barranquero <lekktu@gmail.com>
parents:
95391
diff
changeset
|
158 (concat "<" |
27c911ed0a73
(icomplete-get-keys): Doc fix. Use `when'.
Juanma Barranquero <lekktu@gmail.com>
parents:
95391
diff
changeset
|
159 (mapconcat 'key-description |
27c911ed0a73
(icomplete-get-keys): Doc fix. Use `when'.
Juanma Barranquero <lekktu@gmail.com>
parents:
95391
diff
changeset
|
160 (sort keys |
27c911ed0a73
(icomplete-get-keys): Doc fix. Use `when'.
Juanma Barranquero <lekktu@gmail.com>
parents:
95391
diff
changeset
|
161 #'(lambda (x y) |
27c911ed0a73
(icomplete-get-keys): Doc fix. Use `when'.
Juanma Barranquero <lekktu@gmail.com>
parents:
95391
diff
changeset
|
162 (< (length x) (length y)))) |
27c911ed0a73
(icomplete-get-keys): Doc fix. Use `when'.
Juanma Barranquero <lekktu@gmail.com>
parents:
95391
diff
changeset
|
163 ", ") |
27c911ed0a73
(icomplete-get-keys): Doc fix. Use `when'.
Juanma Barranquero <lekktu@gmail.com>
parents:
95391
diff
changeset
|
164 ">")))))) |
73078
4bf12abbb384
2006-09-23 Ken Manheimer <ken.manheimer@gmail.com>
Chong Yidong <cyd@stupidchicken.com>
parents:
68983
diff
changeset
|
165 ;;;_ = icomplete-with-completion-tables |
4bf12abbb384
2006-09-23 Ken Manheimer <ken.manheimer@gmail.com>
Chong Yidong <cyd@stupidchicken.com>
parents:
68983
diff
changeset
|
166 (defvar icomplete-with-completion-tables '(internal-complete-buffer) |
4bf12abbb384
2006-09-23 Ken Manheimer <ken.manheimer@gmail.com>
Chong Yidong <cyd@stupidchicken.com>
parents:
68983
diff
changeset
|
167 "Specialized completion tables with which icomplete should operate. |
4bf12abbb384
2006-09-23 Ken Manheimer <ken.manheimer@gmail.com>
Chong Yidong <cyd@stupidchicken.com>
parents:
68983
diff
changeset
|
168 |
4bf12abbb384
2006-09-23 Ken Manheimer <ken.manheimer@gmail.com>
Chong Yidong <cyd@stupidchicken.com>
parents:
68983
diff
changeset
|
169 Icomplete does not operate with any specialized completion tables |
4bf12abbb384
2006-09-23 Ken Manheimer <ken.manheimer@gmail.com>
Chong Yidong <cyd@stupidchicken.com>
parents:
68983
diff
changeset
|
170 except those on this list.") |
18029
82a56bdb2381
Integrated Emacs 19.34 and XEmacs 19.15
Karl Heuer <kwzh@gnu.org>
parents:
15302
diff
changeset
|
171 |
8871
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
172 ;;;_ > icomplete-mode (&optional prefix) |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
173 ;;;###autoload |
60805
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
174 (define-minor-mode icomplete-mode |
37171
b2411ccdbf22
(icomplete-mode): Treat an argument like other
Gerd Moellmann <gerd@gnu.org>
parents:
35467
diff
changeset
|
175 "Toggle incremental minibuffer completion for this Emacs session. |
78492
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
176 With a numeric argument, turn Icomplete mode on if ARG is positive, |
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
177 otherwise turn it off." |
60805
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
178 :global t :group 'icomplete |
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
179 (if icomplete-mode |
37171
b2411ccdbf22
(icomplete-mode): Treat an argument like other
Gerd Moellmann <gerd@gnu.org>
parents:
35467
diff
changeset
|
180 ;; The following is not really necessary after first time - |
b2411ccdbf22
(icomplete-mode): Treat an argument like other
Gerd Moellmann <gerd@gnu.org>
parents:
35467
diff
changeset
|
181 ;; no great loss. |
60805
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
182 (add-hook 'minibuffer-setup-hook 'icomplete-minibuffer-setup) |
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
183 (remove-hook 'minibuffer-setup-hook 'icomplete-minibuffer-setup))) |
5147 | 184 |
8871
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
185 ;;;_ > icomplete-simple-completing-p () |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
186 (defun icomplete-simple-completing-p () |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
187 "Non-nil if current window is minibuffer that's doing simple completion. |
8434
36da3d480ccd
(icomplete-prime-minibuffer): Copy the hook lists after making them local.
Richard M. Stallman <rms@gnu.org>
parents:
5375
diff
changeset
|
188 |
8871
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
189 Conditions are: |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
190 the selected window is a minibuffer, |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
191 and not in the middle of macro execution, |
60805
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
192 and `minibuffer-completion-table' is not a symbol (which would |
13989
d60fffb9acd1
(icomplete-simple-completing-p, icomplete-completions):
Karl Heuer <kwzh@gnu.org>
parents:
13337
diff
changeset
|
193 indicate some non-standard, non-simple completion mechanism, |
8871
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
194 like file-name and other custom-func completions)." |
5375
0e30cf7aa525
(icomplete-pre-command-hook): Reconciled with keyboard macro operation.
Richard M. Stallman <rms@gnu.org>
parents:
5147
diff
changeset
|
195 |
8871
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
196 (and (window-minibuffer-p (selected-window)) |
15302
c23c9712ef5c
Use executing-kbd-macro, not executing-macro.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
197 (not executing-kbd-macro) |
60853
53a24edea9ee
(icomplete-simple-completing-p): Don't turn on icomplete
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60805
diff
changeset
|
198 minibuffer-completion-table |
73078
4bf12abbb384
2006-09-23 Ken Manheimer <ken.manheimer@gmail.com>
Chong Yidong <cyd@stupidchicken.com>
parents:
68983
diff
changeset
|
199 (or (not (functionp minibuffer-completion-table)) |
95121
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
200 (eq icomplete-with-completion-tables t) |
73078
4bf12abbb384
2006-09-23 Ken Manheimer <ken.manheimer@gmail.com>
Chong Yidong <cyd@stupidchicken.com>
parents:
68983
diff
changeset
|
201 (member minibuffer-completion-table |
73095
9566558723f8
* icomplete.el (icomplete-simple-completing-p): Use the correct
Chong Yidong <cyd@stupidchicken.com>
parents:
73078
diff
changeset
|
202 icomplete-with-completion-tables)))) |
12933
61f11030ecc9
(icomplete-minibuffer-setup): Use make-local-hook
Richard M. Stallman <rms@gnu.org>
parents:
11035
diff
changeset
|
203 |
8871
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
204 ;;;_ > icomplete-minibuffer-setup () |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
205 (defun icomplete-minibuffer-setup () |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
206 "Run in minibuffer on activation to establish incremental completion. |
12933
61f11030ecc9
(icomplete-minibuffer-setup): Use make-local-hook
Richard M. Stallman <rms@gnu.org>
parents:
11035
diff
changeset
|
207 Usually run by inclusion in `minibuffer-setup-hook'." |
60805
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
208 (when (and icomplete-mode (icomplete-simple-completing-p)) |
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
209 (add-hook 'pre-command-hook |
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
210 (lambda () (run-hooks 'icomplete-pre-command-hook)) |
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
211 nil t) |
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
212 (add-hook 'post-command-hook |
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
213 (lambda () (run-hooks 'icomplete-post-command-hook)) |
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
214 nil t) |
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
215 (run-hooks 'icomplete-minibuffer-setup-hook))) |
26516
d9368f38a7b5
(icomplete-completions): Use an explicit variable
Gerd Moellmann <gerd@gnu.org>
parents:
24644
diff
changeset
|
216 ; |
d9368f38a7b5
(icomplete-completions): Use an explicit variable
Gerd Moellmann <gerd@gnu.org>
parents:
24644
diff
changeset
|
217 |
d9368f38a7b5
(icomplete-completions): Use an explicit variable
Gerd Moellmann <gerd@gnu.org>
parents:
24644
diff
changeset
|
218 |
8871
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
219 ;;;_* Completion |
5375
0e30cf7aa525
(icomplete-pre-command-hook): Reconciled with keyboard macro operation.
Richard M. Stallman <rms@gnu.org>
parents:
5147
diff
changeset
|
220 |
8871
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
221 ;;;_ > icomplete-tidy () |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
222 (defun icomplete-tidy () |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
223 "Remove completions display \(if any) prior to new user input. |
12933
61f11030ecc9
(icomplete-minibuffer-setup): Use make-local-hook
Richard M. Stallman <rms@gnu.org>
parents:
11035
diff
changeset
|
224 Should be run in on the minibuffer `pre-command-hook'. See `icomplete-mode' |
8871
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
225 and `minibuffer-setup-hook'." |
95187
ee32b9c9936c
(icomplete-eoinput): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95141
diff
changeset
|
226 (delete-overlay icomplete-overlay)) |
12933
61f11030ecc9
(icomplete-minibuffer-setup): Use make-local-hook
Richard M. Stallman <rms@gnu.org>
parents:
11035
diff
changeset
|
227 |
8871
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
228 ;;;_ > icomplete-exhibit () |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
229 (defun icomplete-exhibit () |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
230 "Insert icomplete completions display. |
12933
61f11030ecc9
(icomplete-minibuffer-setup): Use make-local-hook
Richard M. Stallman <rms@gnu.org>
parents:
11035
diff
changeset
|
231 Should be run via minibuffer `post-command-hook'. See `icomplete-mode' |
8871
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
232 and `minibuffer-setup-hook'." |
74296
9e75cb6ef88c
(icomplete-tidy, icomplete-exhibit): Check that
Kim F. Storm <storm@cua.dk>
parents:
73095
diff
changeset
|
233 (when (and icomplete-mode (icomplete-simple-completing-p)) |
60805
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
234 (save-excursion |
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
235 (goto-char (point-max)) |
5147 | 236 ; Insert the match-status information: |
60805
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
237 (if (and (> (point-max) (minibuffer-prompt-end)) |
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
238 buffer-undo-list ; Wait for some user input. |
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
239 (or |
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
240 ;; Don't bother with delay after certain number of chars: |
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
241 (> (- (point) (field-beginning)) icomplete-max-delay-chars) |
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
242 ;; Don't delay if alternatives number is small enough: |
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
243 (and (sequencep minibuffer-completion-table) |
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
244 (< (length minibuffer-completion-table) |
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
245 icomplete-delay-completions-threshold)) |
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
246 ;; Delay - give some grace time for next keystroke, before |
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
247 ;; embarking on computing completions: |
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
248 (sit-for icomplete-compute-delay))) |
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
249 (let ((text (while-no-input |
64793
2898eac3abad
(icomplete-exhibit): Adapt to new while-no-input calling convention.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
250 (icomplete-completions |
2898eac3abad
(icomplete-exhibit): Adapt to new while-no-input calling convention.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
251 (field-string) |
2898eac3abad
(icomplete-exhibit): Adapt to new while-no-input calling convention.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
252 minibuffer-completion-table |
2898eac3abad
(icomplete-exhibit): Adapt to new while-no-input calling convention.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
253 minibuffer-completion-predicate |
95187
ee32b9c9936c
(icomplete-eoinput): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95141
diff
changeset
|
254 (not minibuffer-completion-confirm)))) |
76442
b7ca30840f44
(icomplete-tidy, icomplete-exhibit): Bind deactivate-mark to nil.
Eli Zaretskii <eliz@gnu.org>
parents:
75347
diff
changeset
|
255 (buffer-undo-list t) |
b7ca30840f44
(icomplete-tidy, icomplete-exhibit): Bind deactivate-mark to nil.
Eli Zaretskii <eliz@gnu.org>
parents:
75347
diff
changeset
|
256 deactivate-mark) |
64793
2898eac3abad
(icomplete-exhibit): Adapt to new while-no-input calling convention.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
257 ;; Do nothing if while-no-input was aborted. |
95187
ee32b9c9936c
(icomplete-eoinput): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95141
diff
changeset
|
258 (when (stringp text) |
ee32b9c9936c
(icomplete-eoinput): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95141
diff
changeset
|
259 (move-overlay icomplete-overlay (point) (point) (current-buffer)) |
ee32b9c9936c
(icomplete-eoinput): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95141
diff
changeset
|
260 ;; The current C cursor code doesn't know to use the overlay's |
ee32b9c9936c
(icomplete-eoinput): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95141
diff
changeset
|
261 ;; marker's stickiness to figure out whether to place the cursor |
ee32b9c9936c
(icomplete-eoinput): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95141
diff
changeset
|
262 ;; before or after the string, so let's spoon-feed it the pos. |
ee32b9c9936c
(icomplete-eoinput): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95141
diff
changeset
|
263 (put-text-property 0 1 'cursor t text) |
ee32b9c9936c
(icomplete-eoinput): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95141
diff
changeset
|
264 (overlay-put icomplete-overlay 'after-string text))))))) |
12933
61f11030ecc9
(icomplete-minibuffer-setup): Use make-local-hook
Richard M. Stallman <rms@gnu.org>
parents:
11035
diff
changeset
|
265 |
8871
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
266 ;;;_ > icomplete-completions (name candidates predicate require-match) |
299cfe0a6069
Major rewrite to behave more like a minor mode.
Richard M. Stallman <rms@gnu.org>
parents:
8434
diff
changeset
|
267 (defun icomplete-completions (name candidates predicate require-match) |
5147 | 268 "Identify prospective candidates for minibuffer completion. |
269 | |
5375
0e30cf7aa525
(icomplete-pre-command-hook): Reconciled with keyboard macro operation.
Richard M. Stallman <rms@gnu.org>
parents:
5147
diff
changeset
|
270 The display is updated with each minibuffer keystroke during |
5147 | 271 minibuffer completion. |
272 | |
273 Prospective completion suffixes (if any) are displayed, bracketed by | |
274 one of \(), \[], or \{} pairs. The choice of brackets is as follows: | |
275 | |
276 \(...) - a single prospect is identified and matching is enforced, | |
277 \[...] - a single prospect is identified but matching is optional, or | |
278 \{...} - multiple prospects, separated by commas, are indicated, and | |
13989
d60fffb9acd1
(icomplete-simple-completing-p, icomplete-completions):
Karl Heuer <kwzh@gnu.org>
parents:
13337
diff
changeset
|
279 further input is required to distinguish a single one. |
5147 | 280 |
13989
d60fffb9acd1
(icomplete-simple-completing-p, icomplete-completions):
Karl Heuer <kwzh@gnu.org>
parents:
13337
diff
changeset
|
281 The displays for unambiguous matches have ` [Matched]' appended |
12933
61f11030ecc9
(icomplete-minibuffer-setup): Use make-local-hook
Richard M. Stallman <rms@gnu.org>
parents:
11035
diff
changeset
|
282 \(whether complete or not), or ` \[No matches]', if no eligible |
18251
e0327e90d706
Don't call icomplete-mode; let the user do that.
Richard M. Stallman <rms@gnu.org>
parents:
18060
diff
changeset
|
283 matches exist. \(Keybindings for uniquely matched commands |
18029
82a56bdb2381
Integrated Emacs 19.34 and XEmacs 19.15
Karl Heuer <kwzh@gnu.org>
parents:
15302
diff
changeset
|
284 are exhibited within the square braces.)" |
82a56bdb2381
Integrated Emacs 19.34 and XEmacs 19.15
Karl Heuer <kwzh@gnu.org>
parents:
15302
diff
changeset
|
285 |
108033 | 286 (let* ((non-essential t) |
287 (comps (completion-all-sorted-completions)) | |
95187
ee32b9c9936c
(icomplete-eoinput): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95141
diff
changeset
|
288 (last (if (consp comps) (last comps))) |
ee32b9c9936c
(icomplete-eoinput): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95141
diff
changeset
|
289 (base-size (cdr last)) |
95121
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
290 (open-bracket (if require-match "(" "[")) |
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
291 (close-bracket (if require-match ")" "]"))) |
95386
9d7e990b655a
(icomplete-prospects-length): Make obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95187
diff
changeset
|
292 ;; `concat'/`mapconcat' is the slow part. |
95187
ee32b9c9936c
(icomplete-eoinput): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95141
diff
changeset
|
293 (if (not (consp comps)) |
95121
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
294 (format " %sNo matches%s" open-bracket close-bracket) |
95187
ee32b9c9936c
(icomplete-eoinput): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95141
diff
changeset
|
295 (if last (setcdr last nil)) |
95141
17032874a3da
(icomplete-completions): Don't use `predicate' with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95121
diff
changeset
|
296 (let* ((most-try |
17032874a3da
(icomplete-completions): Don't use `predicate' with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95121
diff
changeset
|
297 (if (and base-size (> base-size 0)) |
17032874a3da
(icomplete-completions): Don't use `predicate' with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95121
diff
changeset
|
298 (completion-try-completion |
17032874a3da
(icomplete-completions): Don't use `predicate' with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95121
diff
changeset
|
299 name candidates predicate (length name)) |
17032874a3da
(icomplete-completions): Don't use `predicate' with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95121
diff
changeset
|
300 ;; If the `comps' are 0-based, the result should be |
17032874a3da
(icomplete-completions): Don't use `predicate' with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95121
diff
changeset
|
301 ;; the same with `comps'. |
17032874a3da
(icomplete-completions): Don't use `predicate' with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95121
diff
changeset
|
302 (completion-try-completion |
17032874a3da
(icomplete-completions): Don't use `predicate' with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95121
diff
changeset
|
303 name comps nil (length name)))) |
95187
ee32b9c9936c
(icomplete-eoinput): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95141
diff
changeset
|
304 (most (if (consp most-try) (car most-try) |
ee32b9c9936c
(icomplete-eoinput): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95141
diff
changeset
|
305 (if most-try (car comps) ""))) |
95121
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
306 ;; Compare name and most, so we can determine if name is |
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
307 ;; a prefix of most, or something else. |
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
308 (compare (compare-strings name nil nil |
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
309 most nil nil completion-ignore-case)) |
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
310 (determ (unless (or (eq t compare) (eq t most-try) |
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
311 (= (setq compare (1- (abs compare))) |
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
312 (length most))) |
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
313 (concat open-bracket |
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
314 (cond |
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
315 ((= compare (length name)) |
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
316 ;; Typical case: name is a prefix. |
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
317 (substring most compare)) |
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
318 ((< compare 5) most) |
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
319 (t (concat "..." (substring most compare)))) |
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
320 close-bracket))) |
60805
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
321 ;;"-prospects" - more than one candidate |
95386
9d7e990b655a
(icomplete-prospects-length): Make obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95187
diff
changeset
|
322 (prospects-len (+ (length determ) 6 ;; take {,...} into account |
9d7e990b655a
(icomplete-prospects-length): Make obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95187
diff
changeset
|
323 (string-width (buffer-string)))) |
9d7e990b655a
(icomplete-prospects-length): Make obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95187
diff
changeset
|
324 (prospects-max |
9d7e990b655a
(icomplete-prospects-length): Make obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95187
diff
changeset
|
325 ;; Max total length to use, including the minibuffer content. |
95390
dbcab9d8dd2a
(icomplete-completions): Typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95386
diff
changeset
|
326 (* (+ icomplete-prospects-height |
95386
9d7e990b655a
(icomplete-prospects-length): Make obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95187
diff
changeset
|
327 ;; If the minibuffer content already uses up more than |
9d7e990b655a
(icomplete-prospects-length): Make obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95187
diff
changeset
|
328 ;; one line, increase the allowable space accordingly. |
9d7e990b655a
(icomplete-prospects-length): Make obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95187
diff
changeset
|
329 (/ prospects-len (window-width))) |
9d7e990b655a
(icomplete-prospects-length): Make obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95187
diff
changeset
|
330 (window-width))) |
95121
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
331 (prefix-len |
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
332 ;; Find the common prefix among `comps'. |
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
333 (if (eq t (compare-strings (car comps) nil (length most) |
95187
ee32b9c9936c
(icomplete-eoinput): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95141
diff
changeset
|
334 most nil nil completion-ignore-case)) |
95121
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
335 ;; Common case. |
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
336 (length most) |
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
337 ;; Else, use try-completion. |
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
338 (let ((comps-prefix (try-completion "" comps))) |
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
339 (and (stringp comps-prefix) |
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
340 (length comps-prefix))))) |
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
341 |
93101
98814f79eb94
(icomplete-completions): While collecting the list of prospective candidates,
Juanma Barranquero <lekktu@gmail.com>
parents:
93099
diff
changeset
|
342 prospects most-is-exact comp limit) |
95187
ee32b9c9936c
(icomplete-eoinput): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95141
diff
changeset
|
343 (if (eq most-try t) ;; (or (null (cdr comps)) |
26516
d9368f38a7b5
(icomplete-completions): Use an explicit variable
Gerd Moellmann <gerd@gnu.org>
parents:
24644
diff
changeset
|
344 (setq prospects nil) |
93101
98814f79eb94
(icomplete-completions): While collecting the list of prospective candidates,
Juanma Barranquero <lekktu@gmail.com>
parents:
93099
diff
changeset
|
345 (while (and comps (not limit)) |
95121
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
346 (setq comp |
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
347 (if prefix-len (substring (car comps) prefix-len) (car comps)) |
26516
d9368f38a7b5
(icomplete-completions): Use an explicit variable
Gerd Moellmann <gerd@gnu.org>
parents:
24644
diff
changeset
|
348 comps (cdr comps)) |
d9368f38a7b5
(icomplete-completions): Use an explicit variable
Gerd Moellmann <gerd@gnu.org>
parents:
24644
diff
changeset
|
349 (cond ((string-equal comp "") (setq most-is-exact t)) |
d9368f38a7b5
(icomplete-completions): Use an explicit variable
Gerd Moellmann <gerd@gnu.org>
parents:
24644
diff
changeset
|
350 ((member comp prospects)) |
95386
9d7e990b655a
(icomplete-prospects-length): Make obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95187
diff
changeset
|
351 (t (setq prospects-len |
9d7e990b655a
(icomplete-prospects-length): Make obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95187
diff
changeset
|
352 (+ (string-width comp) 1 prospects-len)) |
9d7e990b655a
(icomplete-prospects-length): Make obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95187
diff
changeset
|
353 (if (< prospects-len prospects-max) |
95187
ee32b9c9936c
(icomplete-eoinput): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95141
diff
changeset
|
354 (push comp prospects) |
93101
98814f79eb94
(icomplete-completions): While collecting the list of prospective candidates,
Juanma Barranquero <lekktu@gmail.com>
parents:
93099
diff
changeset
|
355 (setq limit t)))))) |
95187
ee32b9c9936c
(icomplete-eoinput): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95141
diff
changeset
|
356 ;; Restore the base-size info, since completion-all-sorted-completions |
ee32b9c9936c
(icomplete-eoinput): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95141
diff
changeset
|
357 ;; is cached. |
ee32b9c9936c
(icomplete-eoinput): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95141
diff
changeset
|
358 (if last (setcdr last base-size)) |
26516
d9368f38a7b5
(icomplete-completions): Use an explicit variable
Gerd Moellmann <gerd@gnu.org>
parents:
24644
diff
changeset
|
359 (if prospects |
d9368f38a7b5
(icomplete-completions): Use an explicit variable
Gerd Moellmann <gerd@gnu.org>
parents:
24644
diff
changeset
|
360 (concat determ |
60805
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
361 "{" |
26516
d9368f38a7b5
(icomplete-completions): Use an explicit variable
Gerd Moellmann <gerd@gnu.org>
parents:
24644
diff
changeset
|
362 (and most-is-exact ",") |
95187
ee32b9c9936c
(icomplete-eoinput): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95141
diff
changeset
|
363 (mapconcat 'identity (nreverse prospects) ",") |
ee32b9c9936c
(icomplete-eoinput): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95141
diff
changeset
|
364 (and limit ",...") |
60805
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
365 "}") |
26516
d9368f38a7b5
(icomplete-completions): Use an explicit variable
Gerd Moellmann <gerd@gnu.org>
parents:
24644
diff
changeset
|
366 (concat determ |
d9368f38a7b5
(icomplete-completions): Use an explicit variable
Gerd Moellmann <gerd@gnu.org>
parents:
24644
diff
changeset
|
367 " [Matched" |
d9368f38a7b5
(icomplete-completions): Use an explicit variable
Gerd Moellmann <gerd@gnu.org>
parents:
24644
diff
changeset
|
368 (let ((keys (and icomplete-show-key-bindings |
d9368f38a7b5
(icomplete-completions): Use an explicit variable
Gerd Moellmann <gerd@gnu.org>
parents:
24644
diff
changeset
|
369 (commandp (intern-soft most)) |
d9368f38a7b5
(icomplete-completions): Use an explicit variable
Gerd Moellmann <gerd@gnu.org>
parents:
24644
diff
changeset
|
370 (icomplete-get-keys most)))) |
60805
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
371 (if keys (concat "; " keys) "")) |
26516
d9368f38a7b5
(icomplete-completions): Use an explicit variable
Gerd Moellmann <gerd@gnu.org>
parents:
24644
diff
changeset
|
372 "]")))))) |
5147 | 373 |
95121
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
374 ;;_* Local emacs vars. |
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
375 ;;Local variables: |
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
376 ;;allout-layout: (-2 :) |
cc51187bbc1d
(icomplete-simple-completing-p):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
377 ;;End: |
5147 | 378 |
60805
aba5f8c41ae0
Don't forcibly turn on the mode upon load.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
379 ;; arch-tag: 339ec25a-0741-4eb6-be63-997532e89b0f |
5147 | 380 ;;; icomplete.el ends here |