annotate lisp/minibuf.el @ 510:5bdbc721d46a

[xemacs-hg @ 2001-05-06 08:33:35 by ben] implement printing the selection when it's selected. force redisplay when set-charset-ccl-program called. if bytecomp or byte-optimize need recompiling, then load the .el version of them first, recompile them, and reload the .elc versions to recompile everything else (so we won't be waiting until the cows come home).
author ben
date Sun, 06 May 2001 08:33:41 +0000
parents 7039e6323819
children 685b588e92d8
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1 ;;; minibuf.el --- Minibuffer functions for XEmacs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3 ;; Copyright (C) 1992, 1993, 1994, 1997 Free Software Foundation, Inc.
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
4 ;; Copyright (C) 1995 Tinker Systems.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5 ;; Copyright (C) 1995, 1996, 2000 Ben Wing.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7 ;; Author: Richard Mlynarik
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8 ;; Created: 2-Oct-92
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9 ;; Maintainer: XEmacs Development Team
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10 ;; Keywords: internal, dumped
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
11
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
12 ;; This file is part of XEmacs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
13
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
14 ;; XEmacs is free software; you can redistribute it and/or modify it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
15 ;; under the terms of the GNU General Public License as published by
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
16 ;; the Free Software Foundation; either version 2, or (at your option)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
17 ;; any later version.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
18
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
19 ;; XEmacs is distributed in the hope that it will be useful, but
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
20 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
21 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
22 ;; General Public License for more details.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
23
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
24 ;; You should have received a copy of the GNU General Public License
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
25 ;; along with XEmacs; see the file COPYING. If not, write to the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
26 ;; Free Software Foundation, 59 Temple Place - Suite 330,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
27 ;; Boston, MA 02111-1307, USA.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
28
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
29 ;;; Synched up with: all the minibuffer history stuff is synched with
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
30 ;;; 19.30. Not sure about the rest.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
31
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
32 ;;; Commentary:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
33
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
34 ;; This file is dumped with XEmacs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
35
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
36 ;; Written by Richard Mlynarik 2-Oct-92
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
37
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
38 ;; 06/11/1997 - Use char-(after|before) instead of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
39 ;; (following|preceding)-char. -slb
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
40
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
41 ;;; Code:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
42
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
43 (defgroup minibuffer nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
44 "Controling the behavior of the minibuffer."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
45 :group 'environment)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
46
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
47
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
48 (defcustom insert-default-directory t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
49 "*Non-nil means when reading a filename start with default dir in minibuffer."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
50 :type 'boolean
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
51 :group 'minibuffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
52
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
53 (defcustom minibuffer-history-uniquify t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
54 "*Non-nil means when adding an item to a minibuffer history, remove
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
55 previous occurrences of the same item from the history list first,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
56 rather than just consing the new element onto the front of the list."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
57 :type 'boolean
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
58 :group 'minibuffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
59
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
60 (defvar minibuffer-completion-table nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
61 "Alist or obarray used for completion in the minibuffer.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
62 This becomes the ALIST argument to `try-completion' and `all-completions'.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
63
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
64 The value may alternatively be a function, which is given three arguments:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
65 STRING, the current buffer contents;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
66 PREDICATE, the predicate for filtering possible matches;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
67 CODE, which says what kind of things to do.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
68 CODE can be nil, t or `lambda'.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
69 nil means to return the best completion of STRING, nil if there is none,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
70 or t if it is already a unique completion.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
71 t means to return a list of all possible completions of STRING.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
72 `lambda' means to return t if STRING is a valid completion as it stands.")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
73
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
74 (defvar minibuffer-completion-predicate nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
75 "Within call to `completing-read', this holds the PREDICATE argument.")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
76
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
77 (defvar minibuffer-completion-confirm nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
78 "Non-nil => demand confirmation of completion before exiting minibuffer.")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
79
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
80 (defcustom minibuffer-confirm-incomplete nil
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
81 "If true, then in contexts where completing-read allows answers which
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
82 are not valid completions, an extra RET must be typed to confirm the
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
83 response. This is helpful for catching typos, etc."
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
84 :type 'boolean
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
85 :group 'minibuffer)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
86
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
87 (defcustom completion-auto-help t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
88 "*Non-nil means automatically provide help for invalid completion input."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
89 :type 'boolean
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
90 :group 'minibuffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
91
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
92 (defcustom enable-recursive-minibuffers nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
93 "*Non-nil means to allow minibuffer commands while in the minibuffer.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
94 More precisely, this variable makes a difference when the minibuffer window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
95 is the selected window. If you are in some other window, minibuffer commands
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
96 are allowed even if a minibuffer is active."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
97 :type 'boolean
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
98 :group 'minibuffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
99
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
100 (defcustom minibuffer-max-depth 1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
101 ;; See comment in #'minibuffer-max-depth-exceeded
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
102 "*Global maximum number of minibuffers allowed;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
103 compare to enable-recursive-minibuffers, which is only consulted when the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
104 minibuffer is reinvoked while it is the selected window."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
105 :type '(choice integer
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
106 (const :tag "Indefinite" nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
107 :group 'minibuffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
108
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
109 ;; Moved to C. The minibuffer prompt must be setup before this is run
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
110 ;; and that can only be done from the C side.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
111 ;(defvar minibuffer-setup-hook nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
112 ; "Normal hook run just after entry to minibuffer.")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
113
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
114 ;; see comment at list-mode-hook.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
115 (put 'minibuffer-setup-hook 'permanent-local t)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
116
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
117 (defvar minibuffer-exit-hook nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
118 "Normal hook run just after exit from minibuffer.")
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
119 (put 'minibuffer-exit-hook 'permanent-local t)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
120
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
121 (defvar minibuffer-help-form nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
122 "Value that `help-form' takes on inside the minibuffer.")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
123
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
124 (defvar minibuffer-default nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
125 "Default value for minibuffer input.")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
126
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
127 (defvar minibuffer-local-map
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
128 (let ((map (make-sparse-keymap 'minibuffer-local-map)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
129 map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
130 "Default keymap to use when reading from the minibuffer.")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
131
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
132 (defvar minibuffer-local-completion-map
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
133 (let ((map (make-sparse-keymap 'minibuffer-local-completion-map)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
134 (set-keymap-parents map (list minibuffer-local-map))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
135 map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
136 "Local keymap for minibuffer input with completion.")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
137
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
138 (defvar minibuffer-local-must-match-map
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
139 (let ((map (make-sparse-keymap 'minibuffer-must-match-map)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
140 (set-keymap-parents map (list minibuffer-local-completion-map))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
141 map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
142 "Local keymap for minibuffer input with completion, for exact match.")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
143
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
144 ;; (define-key minibuffer-local-map "\C-g" 'abort-recursive-edit)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
145 (define-key minibuffer-local-map "\C-g" 'minibuffer-keyboard-quit) ;; moved here from pending-del.el
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
146 (define-key minibuffer-local-map "\r" 'exit-minibuffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
147 (define-key minibuffer-local-map "\n" 'exit-minibuffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
148
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
149 ;; Historical crock. Unused by anything but user code, if even that
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
150 ;(defvar minibuffer-local-ns-map
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
151 ; (let ((map (make-sparse-keymap 'minibuffer-local-ns-map)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
152 ; (set-keymap-parents map (list minibuffer-local-map))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
153 ; map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
154 ; "Local keymap for the minibuffer when spaces are not allowed.")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
155 ;(define-key minibuffer-local-ns-map [space] 'exit-minibuffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
156 ;(define-key minibuffer-local-ns-map [tab] 'exit-minibuffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
157 ;(define-key minibuffer-local-ns-map [?\?] 'self-insert-and-exit)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
158
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
159 (define-key minibuffer-local-completion-map "\t" 'minibuffer-complete)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
160 (define-key minibuffer-local-completion-map " " 'minibuffer-complete-word)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
161 (define-key minibuffer-local-completion-map "?" 'minibuffer-completion-help)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
162 (define-key minibuffer-local-must-match-map "\r" 'minibuffer-complete-and-exit)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
163 (define-key minibuffer-local-must-match-map "\n" 'minibuffer-complete-and-exit)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
164
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
165 (define-key minibuffer-local-map "\M-n" 'next-history-element)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
166 (define-key minibuffer-local-map "\M-p" 'previous-history-element)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
167 (define-key minibuffer-local-map '[next] "\M-n")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
168 (define-key minibuffer-local-map '[prior] "\M-p")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
169 (define-key minibuffer-local-map "\M-r" 'previous-matching-history-element)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
170 (define-key minibuffer-local-map "\M-s" 'next-matching-history-element)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
171 (define-key minibuffer-local-must-match-map [next]
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
172 'next-complete-history-element)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
173 (define-key minibuffer-local-must-match-map [prior]
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
174 'previous-complete-history-element)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
175
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
176 ;; This is an experiment--make up and down arrows do history.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
177 (define-key minibuffer-local-map [up] 'previous-history-element)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
178 (define-key minibuffer-local-map [down] 'next-history-element)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
179 (define-key minibuffer-local-completion-map [up] 'previous-history-element)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
180 (define-key minibuffer-local-completion-map [down] 'next-history-element)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
181 (define-key minibuffer-local-must-match-map [up] 'previous-history-element)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
182 (define-key minibuffer-local-must-match-map [down] 'next-history-element)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
183
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
184 (defvar read-expression-map (let ((map (make-sparse-keymap
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
185 'read-expression-map)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
186 (set-keymap-parents map
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
187 (list minibuffer-local-map))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
188 (define-key map "\M-\t" 'lisp-complete-symbol)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
189 map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
190 "Minibuffer keymap used for reading Lisp expressions.")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
191
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
192 (defvar read-shell-command-map
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
193 (let ((map (make-sparse-keymap 'read-shell-command-map)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
194 (set-keymap-parents map (list minibuffer-local-map))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
195 (define-key map "\t" 'comint-dynamic-complete)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
196 (define-key map "\M-\t" 'comint-dynamic-complete)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
197 (define-key map "\M-?" 'comint-dynamic-list-completions)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
198 map)
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
199 "Minibuffer keymap used by `shell-command' and related commands.")
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
200
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
201 (defcustom use-dialog-box t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
202 "*Variable controlling usage of the dialog box.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
203 If nil, the dialog box will never be used, even in response to mouse events."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
204 :type 'boolean
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
205 :group 'minibuffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
206
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
207 (defcustom minibuffer-electric-file-name-behavior t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
208 "*If non-nil, slash and tilde in certain places cause immediate deletion.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
209 These are the same places where this behavior would occur later on anyway,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
210 in `substitute-in-file-name'."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
211 :type 'boolean
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
212 :group 'minibuffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
213
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
214 ;; originally by Stig@hackvan.com
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
215 (defun minibuffer-electric-separator ()
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
216 (interactive)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
217 (let ((c last-command-char))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
218 (and minibuffer-electric-file-name-behavior
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
219 (eq c directory-sep-char)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
220 (eq c (char-before (point)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
221 (not (save-excursion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
222 (goto-char (point-min))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
223 (and (looking-at "/.+:~?[^/]*/.+")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
224 (re-search-forward "^/.+:~?[^/]*" nil t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
225 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
226 (delete-region (point) (point-max))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
227 t))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
228 (not (save-excursion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
229 (goto-char (point-min))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
230 (and (looking-at ".+://[^/]*/.+")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
231 (re-search-forward "^.+:/" nil t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
232 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
233 (delete-region (point) (point-max))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
234 t))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
235 ;; permit `//hostname/path/to/file'
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
236 (not (eq (point) (1+ (point-min))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
237 ;; permit `http://url/goes/here'
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
238 (or (not (eq ?: (char-after (- (point) 2))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
239 (eq ?/ (char-after (point-min))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
240 (delete-region (point-min) (point)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
241 (insert c)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
242
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
243 (defun minibuffer-electric-tilde ()
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
244 (interactive)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
245 (and minibuffer-electric-file-name-behavior
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
246 (eq directory-sep-char (char-before (point)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
247 ;; permit URL's with //, for e.g. http://hostname/~user
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
248 (not (save-excursion (search-backward "//" nil t)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
249 (delete-region (point-min) (point)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
250 (insert ?~))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
251
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
252
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
253 (defvar read-file-name-map
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
254 (let ((map (make-sparse-keymap 'read-file-name-map)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
255 (set-keymap-parents map (list minibuffer-local-completion-map))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
256 (define-key map (vector directory-sep-char) 'minibuffer-electric-separator)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
257 (define-key map "~" 'minibuffer-electric-tilde)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
258 map
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
259 ))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
260
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
261 (defvar read-file-name-must-match-map
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
262 (let ((map (make-sparse-keymap 'read-file-name-map)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
263 (set-keymap-parents map (list minibuffer-local-must-match-map))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
264 (define-key map (vector directory-sep-char) 'minibuffer-electric-separator)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
265 (define-key map "~" 'minibuffer-electric-tilde)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
266 map
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
267 ))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
268
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
269 (defun minibuffer-keyboard-quit ()
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
270 "Abort recursive edit.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
271 If `zmacs-regions' is true, and the zmacs region is active in this buffer,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
272 then this key deactivates the region without beeping."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
273 (interactive)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
274 (if (and (region-active-p)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
275 (eq (current-buffer) (zmacs-region-buffer)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
276 ;; pseudo-zmacs compatibility: don't beep if this ^G is simply
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
277 ;; deactivating the region. If it is inactive, beep.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
278 nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
279 (abort-recursive-edit)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
280
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
281 ;;;; Guts of minibuffer invocation
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
282
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
283 ;;#### The only things remaining in C are
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
284 ;; "Vminibuf_prompt" and the display junk
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
285 ;; "minibuf_prompt_width" and "minibuf_prompt_pix_width"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
286 ;; Also "active_frame", though I suspect I could already
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
287 ;; hack that in Lisp if I could make any sense of the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
288 ;; complete mess of frame/frame code in XEmacs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
289 ;; Vminibuf_prompt could easily be made Lisp-bindable.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
290 ;; I suspect that minibuf_prompt*_width are actually recomputed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
291 ;; by redisplay as needed -- or could be arranged to be so --
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
292 ;; and that there could be need for read-minibuffer-internal to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
293 ;; save and restore them.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
294 ;;#### The only other thing which read-from-minibuffer-internal does
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
295 ;; which we can't presently do in Lisp is move the frame cursor
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
296 ;; to the start of the minibuffer line as it returns. This is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
297 ;; a rather nice touch and should be preserved -- probably by
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
298 ;; providing some Lisp-level mechanism (extension to cursor-in-echo-area ?)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
299 ;; to effect it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
300
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
301
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
302 ;; Like reset_buffer in FSF's buffer.c
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
303 ;; (Except that kill-all-local-variables doesn't nuke 'permanent-local
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
304 ;; variables -- we preserve them, reset_buffer doesn't.)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
305 (defun reset-buffer (buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
306 (with-current-buffer buffer
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
307 ;(if (fboundp 'unlock-buffer) (unlock-buffer))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
308 (kill-all-local-variables)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
309 (setq buffer-read-only nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
310 ;; don't let read only text yanked into the minibuffer
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
311 ;; permanently wedge it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
312 (make-local-variable 'inhibit-read-only)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
313 (setq inhibit-read-only t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
314 (erase-buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
315 ;(setq default-directory nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
316 (setq buffer-file-name nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
317 (setq buffer-file-truename nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
318 (set-buffer-modified-p nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
319 (setq buffer-backed-up nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
320 (setq buffer-auto-save-file-name nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
321 (set-buffer-dedicated-frame buffer nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
322 buffer))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
323
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
324 (defvar minibuffer-history-variable 'minibuffer-history
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
325 "History list symbol to add minibuffer values to.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
326 Each minibuffer output is added with
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
327 (set minibuffer-history-variable
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
328 (cons STRING (symbol-value minibuffer-history-variable)))")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
329 (defvar minibuffer-history-position)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
330
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
331 ;; Added by hniksic:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
332 (defvar initial-minibuffer-history-position)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
333 (defvar current-minibuffer-contents)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
334 (defvar current-minibuffer-point)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
335
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
336 (defcustom minibuffer-history-minimum-string-length nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
337 "*If this variable is non-nil, a string will not be added to the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
338 minibuffer history if its length is less than that value."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
339 :type '(choice (const :tag "Any" nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
340 integer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
341 :group 'minibuffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
342
510
5bdbc721d46a [xemacs-hg @ 2001-05-06 08:33:35 by ben]
ben
parents: 502
diff changeset
343 (define-error 'input-error "Keyboard input error" 'io-error)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
344
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
345 (defun read-from-minibuffer (prompt &optional initial-contents
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
346 keymap
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
347 readp
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
348 history
430
a5df635868b2 Import from CVS: tag r21-2-23
cvs
parents: 428
diff changeset
349 abbrev-table
a5df635868b2 Import from CVS: tag r21-2-23
cvs
parents: 428
diff changeset
350 default)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
351 "Read a string from the minibuffer, prompting with string PROMPT.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
352 If optional second arg INITIAL-CONTENTS is non-nil, it is a string
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
353 to be inserted into the minibuffer before reading input.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
354 If INITIAL-CONTENTS is (STRING . POSITION), the initial input
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
355 is STRING, but point is placed POSITION characters into the string.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
356 Third arg KEYMAP is a keymap to use while reading;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
357 if omitted or nil, the default is `minibuffer-local-map'.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
358 If fourth arg READ is non-nil, then interpret the result as a lisp object
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
359 and return that object:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
360 in other words, do `(car (read-from-string INPUT-STRING))'
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
361 Fifth arg HISTORY, if non-nil, specifies a history list
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
362 and optionally the initial position in the list.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
363 It can be a symbol, which is the history list variable to use,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
364 or it can be a cons cell (HISTVAR . HISTPOS).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
365 In that case, HISTVAR is the history list variable to use,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
366 and HISTPOS is the initial position (the position in the list
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
367 which INITIAL-CONTENTS corresponds to).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
368 If HISTORY is `t', no history will be recorded.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
369 Positions are counted starting from 1 at the beginning of the list.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
370 Sixth arg ABBREV-TABLE, if non-nil, becomes the value of `local-abbrev-table'
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
371 in the minibuffer.
430
a5df635868b2 Import from CVS: tag r21-2-23
cvs
parents: 428
diff changeset
372 Seventh arg DEFAULT, if non-nil, will be returned when user enters
a5df635868b2 Import from CVS: tag r21-2-23
cvs
parents: 428
diff changeset
373 an empty string.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
374
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
375 See also the variable `completion-highlight-first-word-only' for
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
376 control over completion display."
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
377 (if (and (not enable-recursive-minibuffers)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
378 (> (minibuffer-depth) 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
379 (eq (selected-window) (minibuffer-window)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
380 (error "Command attempted to use minibuffer while in minibuffer"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
381
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
382 (if (and minibuffer-max-depth
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
383 (> minibuffer-max-depth 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
384 (>= (minibuffer-depth) minibuffer-max-depth))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
385 (minibuffer-max-depth-exceeded))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
386
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
387 ;; catch this error before the poor user has typed something...
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
388 (if history
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
389 (if (symbolp history)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
390 (or (boundp history)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
391 (error "History list %S is unbound" history))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
392 (or (boundp (car history))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
393 (error "History list %S is unbound" (car history)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
394
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
395 (if (noninteractive)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
396 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
397 ;; XEmacs in -batch mode calls minibuffer: print the prompt.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
398 (message "%s" (gettext prompt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
399 ;;#### force-output
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
400
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
401 ;;#### Should this even be falling though to the code below?
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
402 ;;#### How does this stuff work now, anyway?
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
403 ))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
404 (let* ((dir default-directory)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
405 (owindow (selected-window))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
406 (oframe (selected-frame))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
407 (window (minibuffer-window))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
408 (buffer (if (eq (minibuffer-depth) 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
409 (window-buffer window)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
410 (get-buffer-create (format " *Minibuf-%d"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
411 (minibuffer-depth)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
412 (frame (window-frame window))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
413 (mconfig (if (eq frame (selected-frame))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
414 nil (current-window-configuration frame)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
415 (oconfig (current-window-configuration))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
416 ;; dynamic scope sucks sucks sucks sucks sucks sucks.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
417 ;; `M-x doctor' makes history a local variable, and thus
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
418 ;; our binding above is buffer-local and doesn't apply
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
419 ;; once we switch buffers!!!! We demand better scope!
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
420 (_history_ history)
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
421 (minibuffer-default default))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
422 (unwind-protect
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
423 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
424 (set-buffer (reset-buffer buffer))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
425 (setq default-directory dir)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
426 (make-local-variable 'print-escape-newlines)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
427 (setq print-escape-newlines t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
428 (make-local-variable 'current-minibuffer-contents)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
429 (make-local-variable 'current-minibuffer-point)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
430 (make-local-variable 'initial-minibuffer-history-position)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
431 (setq current-minibuffer-contents ""
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
432 current-minibuffer-point 1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
433 (if (not minibuffer-smart-completion-tracking-behavior)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
434 nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
435 (make-local-variable 'mode-motion-hook)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
436 (or mode-motion-hook
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
437 ;;####disgusting
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
438 (setq mode-motion-hook 'minibuffer-smart-mouse-tracker))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
439 (make-local-variable 'mouse-track-click-hook)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
440 (add-hook 'mouse-track-click-hook
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
441 'minibuffer-smart-maybe-select-highlighted-completion))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
442 (set-window-buffer window buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
443 (select-window window)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
444 (set-window-hscroll window 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
445 (buffer-enable-undo buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
446 (message nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
447 (if initial-contents
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
448 (if (consp initial-contents)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
449 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
450 (insert (car initial-contents))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
451 (goto-char (1+ (cdr initial-contents)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
452 (setq current-minibuffer-contents (car initial-contents)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
453 current-minibuffer-point (cdr initial-contents)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
454 (insert initial-contents)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
455 (setq current-minibuffer-contents initial-contents
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
456 current-minibuffer-point (point))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
457 (use-local-map (help-keymap-with-help-key
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
458 (or keymap minibuffer-local-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
459 minibuffer-help-form))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
460 (let ((mouse-grabbed-buffer
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
461 (and minibuffer-smart-completion-tracking-behavior
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
462 (current-buffer)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
463 (current-prefix-arg current-prefix-arg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
464 ;; (help-form minibuffer-help-form)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
465 (minibuffer-history-variable (cond ((not _history_)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
466 'minibuffer-history)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
467 ((consp _history_)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
468 (car _history_))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
469 (t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
470 _history_)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
471 (minibuffer-history-position (cond ((consp _history_)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
472 (cdr _history_))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
473 (t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
474 0)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
475 (minibuffer-scroll-window owindow))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
476 (setq initial-minibuffer-history-position
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
477 minibuffer-history-position)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
478 (if abbrev-table
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
479 (setq local-abbrev-table abbrev-table
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
480 abbrev-mode t))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
481 ;; This is now run from read-minibuffer-internal
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
482 ;(if minibuffer-setup-hook
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
483 ; (run-hooks 'minibuffer-setup-hook))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
484 ;(message nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
485 (if (eq 't
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
486 (catch 'exit
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
487 (if (> (recursion-depth) (minibuffer-depth))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
488 (let ((standard-output t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
489 (standard-input t))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
490 (read-minibuffer-internal prompt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
491 (read-minibuffer-internal prompt))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
492 ;; Translate an "abort" (throw 'exit 't)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
493 ;; into a real quit
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
494 (signal 'quit '())
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
495 ;; return value
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
496 (let* ((val (progn (set-buffer buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
497 (if minibuffer-exit-hook
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
498 (run-hooks 'minibuffer-exit-hook))
430
a5df635868b2 Import from CVS: tag r21-2-23
cvs
parents: 428
diff changeset
499 (if (and (eq (char-after (point-min)) nil)
a5df635868b2 Import from CVS: tag r21-2-23
cvs
parents: 428
diff changeset
500 default)
a5df635868b2 Import from CVS: tag r21-2-23
cvs
parents: 428
diff changeset
501 default
a5df635868b2 Import from CVS: tag r21-2-23
cvs
parents: 428
diff changeset
502 (buffer-string))))
a5df635868b2 Import from CVS: tag r21-2-23
cvs
parents: 428
diff changeset
503 (histval (if (and default (string= val ""))
a5df635868b2 Import from CVS: tag r21-2-23
cvs
parents: 428
diff changeset
504 default
a5df635868b2 Import from CVS: tag r21-2-23
cvs
parents: 428
diff changeset
505 val))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
506 (err nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
507 (if readp
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
508 (condition-case e
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
509 (let ((v (read-from-string val)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
510 (if (< (cdr v) (length val))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
511 (save-match-data
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
512 (or (string-match "[ \t\n]*\\'" val (cdr v))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
513 (error "Trailing garbage following expression"))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
514 (setq v (car v))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
515 ;; total total kludge
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
516 (if (stringp v) (setq v (list 'quote v)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
517 (setq val v))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
518 (end-of-file
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
519 (setq err
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
520 '(input-error "End of input before end of expression")))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
521 (error (setq err e))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
522 ;; Add the value to the appropriate history list unless
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
523 ;; it's already the most recent element, or it's only
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
524 ;; two characters long.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
525 (if (and (symbolp minibuffer-history-variable)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
526 (boundp minibuffer-history-variable))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
527 (let ((list (symbol-value minibuffer-history-variable)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
528 (or (eq list t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
529 (null val)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
530 (and list (equal histval (car list)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
531 (and (stringp val)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
532 minibuffer-history-minimum-string-length
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
533 (< (length val)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
534 minibuffer-history-minimum-string-length))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
535 (set minibuffer-history-variable
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
536 (if minibuffer-history-uniquify
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
537 (cons histval (remove histval list))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
538 (cons histval list))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
539 (if err (signal (car err) (cdr err)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
540 val))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
541 ;; stupid display code requires this for some reason
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
542 (set-buffer buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
543 (buffer-disable-undo buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
544 (setq buffer-read-only nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
545 (erase-buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
546
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
547 ;; restore frame configurations
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
548 (if (and mconfig (frame-live-p oframe)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
549 (eq frame (selected-frame)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
550 ;; if we changed frames (due to surrogate minibuffer),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
551 ;; and we're still on the new frame, go back to the old one.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
552 (select-frame oframe))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
553 (if mconfig (set-window-configuration mconfig))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
554 (set-window-configuration oconfig))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
555
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
556
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
557 (defun minibuffer-max-depth-exceeded ()
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
558 ;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
559 ;; This signals an error if an Nth minibuffer is invoked while N-1 are
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
560 ;; already active, whether the minibuffer window is selected or not.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
561 ;; Since, under X, it's easy to jump out of the minibuffer (by doing M-x,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
562 ;; getting distracted, and clicking elsewhere) many many novice users have
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
563 ;; had the problem of having multiple minibuffers build up, even to the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
564 ;; point of exceeding max-lisp-eval-depth. Since the variable
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
565 ;; enable-recursive-minibuffers historically/crockishly is only consulted
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
566 ;; when the minibuffer is currently active (like typing M-x M-x) it doesn't
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
567 ;; help in this situation.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
568 ;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
569 ;; This routine also offers to edit .emacs for you to get rid of this
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
570 ;; complaint, like `disabled' commands do, since it's likely that non-novice
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
571 ;; users will be annoyed by this change, so we give them an easy way to get
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
572 ;; rid of it forever.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
573 ;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
574 (beep t 'minibuffer-limit-exceeded)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
575 (message
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
576 "Minibuffer already active: abort it with `^]', enable new one with `n': ")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
577 (let ((char (let ((cursor-in-echo-area t)) ; #### doesn't always work??
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
578 (read-char))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
579 (cond
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
580 ((eq char ?n)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
581 (cond
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
582 ((y-or-n-p "Enable recursive minibuffers for other sessions too? ")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
583 ;; This is completely disgusting, but it's basically what novice.el
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
584 ;; does. This kind of thing should be generalized.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
585 (setq minibuffer-max-depth nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
586 (save-excursion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
587 (set-buffer
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
588 (find-file-noselect
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
589 (substitute-in-file-name custom-file)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
590 (goto-char (point-min))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
591 (if (re-search-forward
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
592 "^(setq minibuffer-max-depth \\([0-9]+\\|'?nil\\|'?()\\))\n"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
593 nil t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
594 (delete-region (match-beginning 0 ) (match-end 0))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
595 ;; Must have been disabled by default.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
596 (goto-char (point-max)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
597 (insert"\n(setq minibuffer-max-depth nil)\n")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
598 (save-buffer))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
599 (message "Multiple minibuffers enabled")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
600 (sit-for 1))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
601 ((eq char ?)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
602 (abort-recursive-edit))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
603 (t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
604 (error "Minibuffer already active")))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
605
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
606
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
607 ;;;; Guts of minibuffer completion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
608
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
609
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
610 ;; Used by minibuffer-do-completion
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
611 (defvar last-exact-completion nil)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
612
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
613 (defun temp-minibuffer-message (m)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
614 (let ((savemax (point-max)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
615 (save-excursion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
616 (goto-char (point-max))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
617 (message nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
618 (insert m))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
619 (let ((inhibit-quit t))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
620 (sit-for 2)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
621 (delete-region savemax (point-max))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
622 ;; If the user types a ^G while we're in sit-for, then quit-flag
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
623 ;; gets set. In this case, we want that ^G to be interpreted
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
624 ;; as a normal character, and act just like typeahead.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
625 (if (and quit-flag (not unread-command-event))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
626 (setq unread-command-event (character-to-event (quit-char))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
627 quit-flag nil)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
628
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
629
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
630 ;; Determines whether buffer-string is an exact completion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
631 (defun exact-minibuffer-completion-p (buffer-string)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
632 (cond ((not minibuffer-completion-table)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
633 ;; Empty alist
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
634 nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
635 ((vectorp minibuffer-completion-table)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
636 (let ((tem (intern-soft buffer-string
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
637 minibuffer-completion-table)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
638 (if (or tem
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
639 (and (string-equal buffer-string "nil")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
640 ;; intern-soft loses for 'nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
641 (catch 'found
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
642 (mapatoms #'(lambda (s)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
643 (if (string-equal
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
644 (symbol-name s)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
645 buffer-string)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
646 (throw 'found t)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
647 minibuffer-completion-table)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
648 nil)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
649 (if minibuffer-completion-predicate
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
650 (funcall minibuffer-completion-predicate
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
651 tem)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
652 t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
653 nil)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
654 ((and (consp minibuffer-completion-table)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
655 ;;#### Emacs-Lisp truly sucks!
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
656 ;; lambda, autoload, etc
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
657 (not (symbolp (car minibuffer-completion-table))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
658 (if (not completion-ignore-case)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
659 (assoc buffer-string minibuffer-completion-table)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
660 (let ((s (upcase buffer-string))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
661 (tail minibuffer-completion-table)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
662 tem)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
663 (while tail
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
664 (setq tem (car (car tail)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
665 (if (or (equal tem buffer-string)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
666 (equal tem s)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
667 (if tem (equal (upcase tem) s)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
668 (setq s 'win
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
669 tail nil) ;exit
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
670 (setq tail (cdr tail))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
671 (eq s 'win))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
672 (t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
673 (funcall minibuffer-completion-table
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
674 buffer-string
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
675 minibuffer-completion-predicate
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
676 'lambda)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
677 )
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
678
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
679 ;; 0 'none no possible completion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
680 ;; 1 'unique was already an exact and unique completion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
681 ;; 3 'exact was already an exact (but nonunique) completion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
682 ;; NOT USED 'completed-exact-unique completed to an exact and completion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
683 ;; 4 'completed-exact completed to an exact (but nonunique) completion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
684 ;; 5 'completed some completion happened
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
685 ;; 6 'uncompleted no completion happened
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
686 (defun minibuffer-do-completion-1 (buffer-string completion)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
687 (cond ((not completion)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
688 'none)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
689 ((eq completion t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
690 ;; exact and unique match
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
691 'unique)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
692 (t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
693 ;; It did find a match. Do we match some possibility exactly now?
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
694 (let ((completedp (not (string-equal completion buffer-string))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
695 (if completedp
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
696 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
697 ;; Some completion happened
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
698 (erase-buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
699 (insert completion)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
700 (setq buffer-string completion)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
701 (if (exact-minibuffer-completion-p buffer-string)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
702 ;; An exact completion was possible
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
703 (if completedp
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
704 ;; Since no callers need to know the difference, don't bother
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
705 ;; with this (potentially expensive) discrimination.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
706 ;; (if (eq (try-completion completion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
707 ;; minibuffer-completion-table
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
708 ;; minibuffer-completion-predicate)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
709 ;; 't)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
710 ;; 'completed-exact-unique
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
711 'completed-exact
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
712 ;; )
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
713 'exact)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
714 ;; Not an exact match
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
715 (if completedp
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
716 'completed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
717 'uncompleted))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
718
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
719
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
720 (defun minibuffer-do-completion (buffer-string)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
721 (let* ((completion (try-completion buffer-string
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
722 minibuffer-completion-table
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
723 minibuffer-completion-predicate))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
724 (status (minibuffer-do-completion-1 buffer-string completion))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
725 (last last-exact-completion))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
726 (setq last-exact-completion nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
727 (cond ((eq status 'none)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
728 ;; No completions
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
729 (ding nil 'no-completion)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
730 (temp-minibuffer-message " [No match]"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
731 ((eq status 'unique)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
732 )
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
733 (t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
734 ;; It did find a match. Do we match some possibility exactly now?
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
735 (if (not (string-equal completion buffer-string))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
736 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
737 ;; Some completion happened
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
738 (erase-buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
739 (insert completion)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
740 (setq buffer-string completion)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
741 (cond ((eq status 'exact)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
742 ;; If the last exact completion and this one were
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
743 ;; the same, it means we've already given a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
744 ;; "Complete but not unique" message and that the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
745 ;; user's hit TAB again, so now we give help.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
746 (setq last-exact-completion completion)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
747 (if (equal buffer-string last)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
748 (minibuffer-completion-help)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
749 ((eq status 'uncompleted)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
750 (if completion-auto-help
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
751 (minibuffer-completion-help)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
752 (temp-minibuffer-message " [Next char not unique]")))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
753 (t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
754 nil))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
755 status))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
756
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
757
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
758 ;;;; completing-read
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
759
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
760 (defun completing-read (prompt table
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
761 &optional predicate require-match
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
762 initial-contents history default)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
763 "Read a string in the minibuffer, with completion.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
764 Args: PROMPT, TABLE, PREDICATE, REQUIRE-MATCH, INITIAL-CONTENTS, HISTORY.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
765 PROMPT is a string to prompt with; normally it ends in a colon and a space.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
766 TABLE is an alist whose elements' cars are strings, or an obarray.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
767 PREDICATE limits completion to a subset of TABLE.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
768 See `try-completion' for more details on completion, TABLE, and PREDICATE.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
769 If REQUIRE-MATCH is non-nil, the user is not allowed to exit unless
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
770 the input is (or completes to) an element of TABLE or is null.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
771 If it is also not t, Return does not exit if it does non-null completion.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
772 If INITIAL-CONTENTS is non-nil, insert it in the minibuffer initially.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
773 If it is (STRING . POSITION), the initial input
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
774 is STRING, but point is placed POSITION characters into the string.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
775 HISTORY, if non-nil, specifies a history list
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
776 and optionally the initial position in the list.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
777 It can be a symbol, which is the history list variable to use,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
778 or it can be a cons cell (HISTVAR . HISTPOS).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
779 In that case, HISTVAR is the history list variable to use,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
780 and HISTPOS is the initial position (the position in the list
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
781 which INITIAL-CONTENTS corresponds to).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
782 If HISTORY is `t', no history will be recorded.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
783 Positions are counted starting from 1 at the beginning of the list.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
784 DEFAULT, if non-nil, is the default value.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
785 Completion ignores case if the ambient value of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
786 `completion-ignore-case' is non-nil."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
787 (let ((minibuffer-completion-table table)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
788 (minibuffer-completion-predicate predicate)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
789 (minibuffer-completion-confirm (if (eq require-match 't) nil t))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
790 (last-exact-completion nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
791 ret)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
792 (setq ret (read-from-minibuffer prompt
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
793 initial-contents
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
794 (if (not require-match)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
795 minibuffer-local-completion-map
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
796 minibuffer-local-must-match-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
797 nil
430
a5df635868b2 Import from CVS: tag r21-2-23
cvs
parents: 428
diff changeset
798 history
a5df635868b2 Import from CVS: tag r21-2-23
cvs
parents: 428
diff changeset
799 nil
a5df635868b2 Import from CVS: tag r21-2-23
cvs
parents: 428
diff changeset
800 default))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
801 (if (and (string= ret "")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
802 default)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
803 default
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
804 ret)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
805
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
806
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
807 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
808 ;;;; Minibuffer completion commands ;;;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
809 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
810
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
811
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
812 (defun minibuffer-complete ()
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
813 "Complete the minibuffer contents as far as possible.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
814 Return nil if there is no valid completion, else t.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
815 If no characters can be completed, display a list of possible completions.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
816 If you repeat this command after it displayed such a list,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
817 scroll the window of possible completions."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
818 (interactive)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
819 ;; If the previous command was not this, then mark the completion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
820 ;; buffer obsolete.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
821 (or (eq last-command this-command)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
822 (setq minibuffer-scroll-window nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
823 (let ((window minibuffer-scroll-window))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
824 (if (and window (windowp window) (window-buffer window)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
825 (buffer-name (window-buffer window)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
826 ;; If there's a fresh completion window with a live buffer
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
827 ;; and this command is repeated, scroll that window.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
828 (let ((obuf (current-buffer)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
829 (unwind-protect
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
830 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
831 (set-buffer (window-buffer window))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
832 (if (pos-visible-in-window-p (point-max) window)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
833 ;; If end is in view, scroll up to the beginning.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
834 (set-window-start window (point-min))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
835 ;; Else scroll down one frame.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
836 (scroll-other-window)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
837 (set-buffer obuf))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
838 nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
839 (let ((status (minibuffer-do-completion (buffer-string))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
840 (if (eq status 'none)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
841 nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
842 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
843 (cond ((eq status 'unique)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
844 (temp-minibuffer-message
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
845 " [Sole completion]"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
846 ((eq status 'exact)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
847 (temp-minibuffer-message
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
848 " [Complete, but not unique]")))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
849 t))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
850
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
851
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
852 (defun minibuffer-complete-and-exit ()
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
853 "Complete the minibuffer contents, and maybe exit.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
854 Exit if the name is valid with no completion needed.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
855 If name was completed to a valid match,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
856 a repetition of this command will exit."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
857 (interactive)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
858 (if (= (point-min) (point-max))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
859 ;; Crockishly allow user to specify null string
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
860 (throw 'exit nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
861 (let ((buffer-string (buffer-string)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
862 ;; Short-cut -- don't call minibuffer-do-completion if we already
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
863 ;; have an (possibly nonunique) exact completion.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
864 (if (exact-minibuffer-completion-p buffer-string)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
865 (throw 'exit nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
866 (let ((status (minibuffer-do-completion buffer-string)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
867 (if (or (eq status 'unique)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
868 (eq status 'exact)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
869 (if (or (eq status 'completed-exact)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
870 (eq status 'completed-exact-unique))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
871 (if minibuffer-completion-confirm
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
872 (progn (temp-minibuffer-message " [Confirm]")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
873 nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
874 t)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
875 (throw 'exit nil)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
876
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
877
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
878 (defun self-insert-and-exit ()
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
879 "Terminate minibuffer input."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
880 (interactive)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
881 (self-insert-command 1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
882 (throw 'exit nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
883
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
884 (defun exit-minibuffer ()
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
885 "Terminate this minibuffer argument.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
886 If minibuffer-confirm-incomplete is true, and we are in a completing-read
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
887 of some kind, and the contents of the minibuffer is not an existing
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
888 completion, requires an additional RET before the minibuffer will be exited
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
889 \(assuming that RET was the character that invoked this command:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
890 the character in question must be typed again)."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
891 (interactive)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
892 (if (not minibuffer-confirm-incomplete)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
893 (throw 'exit nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
894 (let ((buffer-string (buffer-string)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
895 (if (exact-minibuffer-completion-p buffer-string)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
896 (throw 'exit nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
897 (let ((completion (if (not minibuffer-completion-table)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
898 t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
899 (try-completion buffer-string
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
900 minibuffer-completion-table
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
901 minibuffer-completion-predicate))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
902 (if (or (eq completion 't)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
903 ;; Crockishly allow user to specify null string
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
904 (string-equal buffer-string ""))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
905 (throw 'exit nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
906 (if completion ;; rewritten for I18N3 snarfing
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
907 (temp-minibuffer-message " [incomplete; confirm]")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
908 (temp-minibuffer-message " [no completions; confirm]"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
909 (let ((event (let ((inhibit-quit t))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
910 (prog1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
911 (next-command-event)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
912 (setq quit-flag nil)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
913 (cond ((equal event last-command-event)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
914 (throw 'exit nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
915 ((equal (quit-char) (event-to-character event))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
916 ;; Minibuffer abort.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
917 (throw 'exit t)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
918 (dispatch-event event)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
919
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
920 ;;;; minibuffer-complete-word
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
921
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
922
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
923 ;;;#### I think I have done this correctly; it certainly is simpler
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
924 ;;;#### than what the C code seemed to be trying to do.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
925 (defun minibuffer-complete-word ()
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
926 "Complete the minibuffer contents at most a single word.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
927 After one word is completed as much as possible, a space or hyphen
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
928 is added, provided that matches some possible completion.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
929 Return nil if there is no valid completion, else t."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
930 (interactive)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
931 (let* ((buffer-string (buffer-string))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
932 (completion (try-completion buffer-string
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
933 minibuffer-completion-table
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
934 minibuffer-completion-predicate))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
935 (status (minibuffer-do-completion-1 buffer-string completion)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
936 (cond ((eq status 'none)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
937 (ding nil 'no-completion)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
938 (temp-minibuffer-message " [No match]")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
939 nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
940 ((eq status 'unique)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
941 ;; New message, only in this new Lisp code
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
942 (temp-minibuffer-message " [Sole completion]")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
943 t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
944 (t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
945 (cond ((or (eq status 'uncompleted)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
946 (eq status 'exact))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
947 (let ((foo #'(lambda (s)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
948 (condition-case nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
949 (if (try-completion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
950 (concat buffer-string s)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
951 minibuffer-completion-table
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
952 minibuffer-completion-predicate)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
953 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
954 (goto-char (point-max))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
955 (insert s)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
956 t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
957 nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
958 (error nil))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
959 (char last-command-char))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
960 ;; Try to complete by adding a word-delimiter
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
961 (or (and (characterp char) (> char 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
962 (funcall foo (char-to-string char)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
963 (and (not (eq char ?\ ))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
964 (funcall foo " "))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
965 (and (not (eq char ?\-))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
966 (funcall foo "-"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
967 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
968 (if completion-auto-help
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
969 (minibuffer-completion-help)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
970 ;; New message, only in this new Lisp code
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
971 ;; rewritten for I18N3 snarfing
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
972 (if (eq status 'exact)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
973 (temp-minibuffer-message
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
974 " [Complete, but not unique]")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
975 (temp-minibuffer-message " [Ambiguous]")))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
976 nil))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
977 (t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
978 (erase-buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
979 (insert completion)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
980 ;; First word-break in stuff found by completion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
981 (goto-char (point-min))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
982 (let ((len (length buffer-string))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
983 n)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
984 (if (and (< len (length completion))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
985 (catch 'match
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
986 (setq n 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
987 (while (< n len)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
988 (if (char-equal
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
989 (upcase (aref buffer-string n))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
990 (upcase (aref completion n)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
991 (setq n (1+ n))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
992 (throw 'match nil)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
993 t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
994 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
995 (goto-char (point-min))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
996 (forward-char len)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
997 (re-search-forward "\\W" nil t)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
998 (delete-region (point) (point-max))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
999 (goto-char (point-max))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1000 t))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1001
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1002
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1003 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1004 ;;;; "Smart minibuffer" hackery ;;;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1005 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1006
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1007 ;;; ("Kludgy minibuffer hackery" is perhaps a better name)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1008
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1009 ;; This works by setting `mouse-grabbed-buffer' to the minibuffer,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1010 ;; defining button2 in the minibuffer keymap to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1011 ;; `minibuffer-smart-select-highlighted-completion', and setting the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1012 ;; mode-motion-hook of the minibuffer to `minibuffer-mouse-tracker'.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1013 ;; By setting `mouse-grabbed-buffer', the minibuffer's keymap and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1014 ;; mode-motion-hook apply (for mouse motion and presses) no matter
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1015 ;; what buffer the mouse is over. Then, `minibuffer-mouse-tracker'
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1016 ;; examines the text under the mouse looking for something that looks
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1017 ;; like a completion, and causes it to be highlighted, and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1018 ;; `minibuffer-smart-select-highlighted-completion' looks for a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1019 ;; flagged completion under the mouse and inserts it. This has the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1020 ;; following advantages:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1021 ;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1022 ;; -- filenames and such in any buffer can be inserted by clicking,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1023 ;; not just completions
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1024 ;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1025 ;; but the following disadvantages:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1026 ;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1027 ;; -- unless you're aware of the "filename in any buffer" feature,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1028 ;; the fact that strings in arbitrary buffers get highlighted appears
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1029 ;; as a bug
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1030 ;; -- mouse motion can cause ange-ftp actions -- bad bad bad.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1031 ;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1032 ;; There's some hackery in minibuffer-mouse-tracker to try to avoid the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1033 ;; ange-ftp stuff, but it doesn't work.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1034 ;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1035
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1036 (defcustom minibuffer-smart-completion-tracking-behavior nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1037 "*If non-nil, look for completions under mouse in all buffers.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1038 This allows you to click on something that looks like a completion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1039 and have it selected, regardless of what buffer it is in.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1040
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1041 This is not enabled by default because
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1042
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1043 -- The \"mysterious\" highlighting in normal buffers is confusing to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1044 people not expecting it, and looks like a bug
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1045 -- If ange-ftp is enabled, this tracking sometimes causes ange-ftp
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1046 action as a result of mouse motion, which is *bad bad bad*.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1047 Hopefully this bug will be fixed at some point."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1048 :type 'boolean
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1049 :group 'minibuffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1050
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1051 (defun minibuffer-smart-mouse-tracker (event)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1052 ;; Used as the mode-motion-hook of the minibuffer window, which is the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1053 ;; value of `mouse-grabbed-buffer' while the minibuffer is active. If
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1054 ;; the word under the mouse is a valid minibuffer completion, then it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1055 ;; is highlighted.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1056 ;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1057 ;; We do some special voodoo when we're reading a pathname, because
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1058 ;; the way filename completion works is funny. Possibly there's some
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1059 ;; more general way this could be dealt with...
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1060 ;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1061 ;; We do some further voodoo when reading a pathname that is an
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1062 ;; ange-ftp or efs path, because causing FTP activity as a result of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1063 ;; mouse motion is a really bad time.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1064 ;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1065 (and minibuffer-smart-completion-tracking-behavior
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1066 (event-point event)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1067 ;; avoid conflict with display-completion-list extents
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1068 (not (extent-at (event-point event)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1069 (event-buffer event)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1070 'list-mode-item))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1071 (let ((filename-kludge-p (eq minibuffer-completion-table
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1072 'read-file-name-internal)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1073 (mode-motion-highlight-internal
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1074 event
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1075 #'(lambda () (default-mouse-track-beginning-of-word
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1076 (if filename-kludge-p 'nonwhite t)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1077 #'(lambda ()
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1078 (let ((p (point))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1079 (string ""))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1080 (default-mouse-track-end-of-word
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1081 (if filename-kludge-p 'nonwhite t))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1082 (if (and (/= p (point)) minibuffer-completion-table)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1083 (setq string (buffer-substring p (point))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1084 (if (string-match "\\`[ \t\n]*\\'" string)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1085 (goto-char p)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1086 (if filename-kludge-p
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1087 (setq string (minibuffer-smart-select-kludge-filename
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1088 string)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1089 ;; try-completion bogusly returns a string even when
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1090 ;; that string is complete if that string is also a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1091 ;; prefix for other completions. This means that we
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1092 ;; can't just do the obvious thing, (eq t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1093 ;; (try-completion ...)).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1094 (let (comp)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1095 (if (and filename-kludge-p
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1096 ;; #### evil evil evil evil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1097 (or (and (fboundp 'ange-ftp-ftp-path)
502
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 462
diff changeset
1098 (declare-fboundp
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 462
diff changeset
1099 (ange-ftp-ftp-path string)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1100 (and (fboundp 'efs-ftp-path)
502
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 462
diff changeset
1101 (declare-fboundp
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 462
diff changeset
1102 (efs-ftp-path string)))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1103 (setq comp t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1104 (setq comp
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1105 (try-completion string
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1106 minibuffer-completion-table
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1107 minibuffer-completion-predicate)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1108 (or (eq comp t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1109 (and (equal comp string)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1110 (or (null minibuffer-completion-predicate)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1111 (stringp
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1112 minibuffer-completion-predicate) ; ???
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1113 (funcall minibuffer-completion-predicate
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1114 (if (vectorp
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1115 minibuffer-completion-table)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1116 (intern-soft
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1117 string
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1118 minibuffer-completion-table)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1119 string))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1120 (goto-char p))))))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1121
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1122 (defun minibuffer-smart-select-kludge-filename (string)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1123 (save-excursion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1124 (set-buffer mouse-grabbed-buffer) ; the minibuf
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1125 (let ((kludge-string (concat (buffer-string) string)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1126 (if (or (and (fboundp 'ange-ftp-ftp-path)
502
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 462
diff changeset
1127 (declare-fboundp (ange-ftp-ftp-path kludge-string)))
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 462
diff changeset
1128 (and (fboundp 'efs-ftp-path)
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 462
diff changeset
1129 (declare-fboundp (efs-ftp-path kludge-string))))
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 462
diff changeset
1130 ;; #### evil evil evil, but more so.
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 462
diff changeset
1131 string
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 462
diff changeset
1132 (append-expand-filename (buffer-string) string)))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1133
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1134 (defun minibuffer-smart-select-highlighted-completion (event)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1135 "Select the highlighted text under the mouse as a minibuffer response.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1136 When the minibuffer is being used to prompt the user for a completion,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1137 any valid completions which are visible on the frame will highlight
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1138 when the mouse moves over them. Clicking \\<minibuffer-local-map>\
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1139 \\[minibuffer-smart-select-highlighted-completion] will select the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1140 highlighted completion under the mouse.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1141
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1142 If the mouse is clicked while not over a highlighted completion,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1143 then the global binding of \\[minibuffer-smart-select-highlighted-completion] \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1144 will be executed instead. In this\nway you can get at the normal global \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1145 behavior of \\[minibuffer-smart-select-highlighted-completion] as well as
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1146 the special minibuffer behavior."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1147 (interactive "e")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1148 (if minibuffer-smart-completion-tracking-behavior
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1149 (minibuffer-smart-select-highlighted-completion-1 event t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1150 (let ((command (lookup-key global-map
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1151 (vector current-mouse-event))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1152 (if command (call-interactively command)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1153
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1154 (defun minibuffer-smart-select-highlighted-completion-1 (event global-p)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1155 (let* ((filename-kludge-p (eq minibuffer-completion-table
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1156 'read-file-name-internal))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1157 completion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1158 command-p
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1159 (evpoint (event-point event))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1160 (evextent (and evpoint (extent-at evpoint (event-buffer event)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1161 'list-mode-item))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1162 (if evextent
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1163 ;; avoid conflict with display-completion-list extents.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1164 ;; if we find one, do that behavior instead.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1165 (list-mode-item-selected-1 evextent event)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1166 (save-excursion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1167 (let* ((buffer (window-buffer (event-window event)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1168 (p (event-point event))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1169 (extent (and p (extent-at p buffer 'mouse-face))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1170 (set-buffer buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1171 (if (not (and (extent-live-p extent)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1172 (eq (extent-object extent) (current-buffer))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1173 (not (extent-detached-p extent))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1174 (setq command-p t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1175 ;; ...else user has selected a highlighted completion.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1176 (setq completion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1177 (buffer-substring (extent-start-position extent)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1178 (extent-end-position extent)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1179 (if filename-kludge-p
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1180 (setq completion (minibuffer-smart-select-kludge-filename
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1181 completion)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1182 ;; remove the extent so that it's not hanging around in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1183 ;; *Completions*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1184 (detach-extent extent)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1185 (set-buffer mouse-grabbed-buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1186 (erase-buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1187 (insert completion))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1188 ;; we need to execute the command or do the throw outside of the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1189 ;; save-excursion.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1190 (cond ((and command-p global-p)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1191 (let ((command (lookup-key global-map
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1192 (vector current-mouse-event))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1193 (if command
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1194 (call-interactively command)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1195 (if minibuffer-completion-table
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1196 (error
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1197 "Highlighted words are valid completions. You may select one.")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1198 (error "no completions")))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1199 ((not command-p)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1200 ;; things get confused if the minibuffer is terminated while
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1201 ;; not selected.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1202 (select-window (minibuffer-window))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1203 (if (and filename-kludge-p (file-directory-p completion))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1204 ;; if the user clicked middle on a directory name, display the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1205 ;; files in that directory.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1206 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1207 (goto-char (point-max))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1208 (minibuffer-completion-help))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1209 ;; otherwise, terminate input
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1210 (throw 'exit nil)))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1211
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1212 (defun minibuffer-smart-maybe-select-highlighted-completion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1213 (event &optional click-count)
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
1214 "Like `minibuffer-smart-select-highlighted-completion' but does nothing if
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1215 there is no completion (as opposed to executing the global binding). Useful
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1216 as the value of `mouse-track-click-hook'."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1217 (interactive "e")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1218 (minibuffer-smart-select-highlighted-completion-1 event nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1219
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1220 (define-key minibuffer-local-map 'button2
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1221 'minibuffer-smart-select-highlighted-completion)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1222
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1223
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1224 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1225 ;;;; Minibuffer History ;;;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1226 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1227
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1228 (defvar minibuffer-history '()
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1229 "Default minibuffer history list.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1230 This is used for all minibuffer input except when an alternate history
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1231 list is specified.")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1232
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1233 ;; Some other history lists:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1234 ;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1235 (defvar minibuffer-history-search-history '())
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1236 (defvar function-history '())
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1237 (defvar variable-history '())
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1238 (defvar buffer-history '())
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1239 (defvar shell-command-history '())
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1240 (defvar file-name-history '())
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1241
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1242 (defvar read-expression-history nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1243
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1244 (defvar minibuffer-history-sexp-flag nil ;weird FSF Emacs kludge
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1245 "Non-nil when doing history operations on `command-history'.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1246 More generally, indicates that the history list being acted on
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1247 contains expressions rather than strings.")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1248
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1249 (defun previous-matching-history-element (regexp n)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1250 "Find the previous history element that matches REGEXP.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1251 \(Previous history elements refer to earlier actions.)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1252 With prefix argument N, search for Nth previous match.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1253 If N is negative, find the next or Nth next match."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1254 (interactive
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1255 (let ((enable-recursive-minibuffers t)
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
1256 (minibuffer-history-sexp-flag nil)
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
1257 (minibuffer-max-depth (and minibuffer-max-depth
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
1258 (1+ minibuffer-max-depth))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1259 (if (eq 't (symbol-value minibuffer-history-variable))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1260 (error "History is not being recorded in this context"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1261 (list (read-from-minibuffer "Previous element matching (regexp): "
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1262 (car minibuffer-history-search-history)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1263 minibuffer-local-map
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1264 nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1265 'minibuffer-history-search-history)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1266 (prefix-numeric-value current-prefix-arg))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1267 (let ((history (symbol-value minibuffer-history-variable))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1268 prevpos
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1269 (pos minibuffer-history-position))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1270 (if (eq history t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1271 (error "History is not being recorded in this context"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1272 (while (/= n 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1273 (setq prevpos pos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1274 (setq pos (min (max 1 (+ pos (if (< n 0) -1 1))) (length history)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1275 (if (= pos prevpos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1276 (if (= pos 1) ;; rewritten for I18N3 snarfing
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1277 (error "No later matching history item")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1278 (error "No earlier matching history item")))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1279 (if (string-match regexp
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1280 (if minibuffer-history-sexp-flag
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1281 (let ((print-level nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1282 (prin1-to-string (nth (1- pos) history)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1283 (nth (1- pos) history)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1284 (setq n (+ n (if (< n 0) 1 -1)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1285 (setq minibuffer-history-position pos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1286 (setq current-minibuffer-contents (buffer-string)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1287 current-minibuffer-point (point))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1288 (erase-buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1289 (let ((elt (nth (1- pos) history)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1290 (insert (if minibuffer-history-sexp-flag
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1291 (let ((print-level nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1292 (prin1-to-string elt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1293 elt)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1294 (goto-char (point-min)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1295 (if (or (eq (car (car command-history)) 'previous-matching-history-element)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1296 (eq (car (car command-history)) 'next-matching-history-element))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1297 (setq command-history (cdr command-history))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1298
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1299 (defun next-matching-history-element (regexp n)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1300 "Find the next history element that matches REGEXP.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1301 \(The next history element refers to a more recent action.)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1302 With prefix argument N, search for Nth next match.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1303 If N is negative, find the previous or Nth previous match."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1304 (interactive
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1305 (let ((enable-recursive-minibuffers t)
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
1306 (minibuffer-history-sexp-flag nil)
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
1307 (minibuffer-max-depth (and minibuffer-max-depth
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
1308 (1+ minibuffer-max-depth))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1309 (if (eq t (symbol-value minibuffer-history-variable))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1310 (error "History is not being recorded in this context"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1311 (list (read-from-minibuffer "Next element matching (regexp): "
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1312 (car minibuffer-history-search-history)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1313 minibuffer-local-map
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1314 nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1315 'minibuffer-history-search-history)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1316 (prefix-numeric-value current-prefix-arg))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1317 (previous-matching-history-element regexp (- n)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1318
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1319 (defun next-history-element (n)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1320 "Insert the next element of the minibuffer history into the minibuffer."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1321 (interactive "p")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1322 (if (eq 't (symbol-value minibuffer-history-variable))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1323 (error "History is not being recorded in this context"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1324 (unless (zerop n)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1325 (when (eq minibuffer-history-position
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1326 initial-minibuffer-history-position)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1327 (setq current-minibuffer-contents (buffer-string)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1328 current-minibuffer-point (point)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1329 (let ((narg (- minibuffer-history-position n))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1330 (minimum (if minibuffer-default -1 0)))
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1331 ;; a weird special case here; when in repeat-complex-command, we're
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1332 ;; trying to edit the top command, and minibuffer-history-position
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1333 ;; points to 1, the next-to-top command. in this case, the top
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1334 ;; command in the history is suppressed in favor of the one being
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1335 ;; edited, and there is no more command below it, except maybe the
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1336 ;; default.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1337 (if (and (zerop narg) (eq minibuffer-history-position
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1338 initial-minibuffer-history-position))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1339 (setq minimum (1+ minimum)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1340 (cond ((< narg minimum)
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1341 (error (if minibuffer-default
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1342 "No following item in %s"
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1343 "No following item in %s; no default available")
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1344 minibuffer-history-variable))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1345 ((> narg (length (symbol-value minibuffer-history-variable)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1346 (error "No preceding item in %s" minibuffer-history-variable)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1347 (erase-buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1348 (setq minibuffer-history-position narg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1349 (if (eq narg initial-minibuffer-history-position)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1350 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1351 (insert current-minibuffer-contents)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1352 (goto-char current-minibuffer-point))
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1353 (let ((elt (if (> narg 0)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1354 (nth (1- minibuffer-history-position)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1355 (symbol-value minibuffer-history-variable))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1356 minibuffer-default)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1357 (insert
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1358 (if (not (stringp elt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1359 (let ((print-level nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1360 (condition-case nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1361 (let ((print-readably t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1362 (print-escape-newlines t))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1363 (prin1-to-string elt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1364 (error (prin1-to-string elt))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1365 elt)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1366 ;; FSF has point-min here.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1367 (goto-char (point-max))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1368
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1369 (defun previous-history-element (n)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1370 "Insert the previous element of the minibuffer history into the minibuffer."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1371 (interactive "p")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1372 (next-history-element (- n)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1373
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1374 (defun next-complete-history-element (n)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1375 "Get next element of history which is a completion of minibuffer contents."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1376 (interactive "p")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1377 (let ((point-at-start (point)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1378 (next-matching-history-element
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1379 (concat "^" (regexp-quote (buffer-substring (point-min) (point)))) n)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1380 ;; next-matching-history-element always puts us at (point-min).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1381 ;; Move to the position we were at before changing the buffer contents.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1382 ;; This is still sensical, because the text before point has not changed.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1383 (goto-char point-at-start)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1384
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1385 (defun previous-complete-history-element (n)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1386 "Get previous element of history which is a completion of minibuffer contents."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1387 (interactive "p")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1388 (next-complete-history-element (- n)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1389
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1390
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1391 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1392 ;;;; reading various things from a minibuffer ;;;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1393 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1394
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1395 (defun read-expression (prompt &optional initial-contents history default-value)
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1396 "Return a Lisp object read using the minibuffer, prompting with PROMPT.
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1397 If non-nil, optional second arg INITIAL-CONTENTS is a string to insert
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1398 in the minibuffer before reading.
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1399 Third arg HISTORY, if non-nil, specifies a history list.
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1400 Fourth arg DEFAULT-VALUE is the default value. If non-nil, it is used
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1401 for history command, and as the value to return if the user enters the
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1402 empty string."
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1403 (let ((minibuffer-history-sexp-flag t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1404 ;; Semi-kludge to get around M-x C-x o M-ESC trying to do completion.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1405 (minibuffer-completion-table nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1406 (read-from-minibuffer prompt
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1407 initial-contents
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1408 read-expression-map
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1409 t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1410 (or history 'read-expression-history)
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1411 lisp-mode-abbrev-table
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1412 default-value)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1413
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1414 (defun read-string (prompt &optional initial-contents history default-value)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1415 "Return a string from the minibuffer, prompting with string PROMPT.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1416 If non-nil, optional second arg INITIAL-CONTENTS is a string to insert
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1417 in the minibuffer before reading.
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1418 Third arg HISTORY, if non-nil, specifies a history list.
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1419 Fourth arg DEFAULT-VALUE is the default value. If non-nil, it is used
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1420 for history command, and as the value to return if the user enters the
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1421 empty string."
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1422 (let ((minibuffer-completion-table nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1423 (read-from-minibuffer prompt
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1424 initial-contents
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1425 minibuffer-local-map
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1426 nil history nil default-value)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1427
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1428 (defun eval-minibuffer (prompt &optional initial-contents history default-value)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1429 "Return value of Lisp expression read using the minibuffer.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1430 Prompt with PROMPT. If non-nil, optional second arg INITIAL-CONTENTS
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1431 is a string to insert in the minibuffer before reading.
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1432 Third arg HISTORY, if non-nil, specifies a history list.
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1433 Fourth arg DEFAULT-VALUE is the default value. If non-nil, it is used
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1434 for history command, and as the value to return if the user enters the
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1435 empty string."
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1436 (eval (read-expression prompt initial-contents history default-value)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1437
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1438 ;; The name `command-history' is already taken
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1439 (defvar read-command-history '())
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1440
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1441 (defun read-command (prompt &optional default-value)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1442 "Read the name of a command and return as a symbol.
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1443 Prompts with PROMPT. By default, return DEFAULT-VALUE."
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1444 (intern (completing-read prompt obarray 'commandp t nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1445 ;; 'command-history is not right here: that's a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1446 ;; list of evalable forms, not a history list.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1447 'read-command-history
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1448 default-value)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1449
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1450 (defun read-function (prompt &optional default-value)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1451 "Read the name of a function and return as a symbol.
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1452 Prompts with PROMPT. By default, return DEFAULT-VALUE."
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1453 (intern (completing-read prompt obarray 'fboundp t nil
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1454 'function-history default-value)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1455
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1456 (defun read-variable (prompt &optional default-value)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1457 "Read the name of a user variable and return it as a symbol.
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1458 Prompts with PROMPT. By default, return DEFAULT-VALUE.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1459 A user variable is one whose documentation starts with a `*' character."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1460 (intern (completing-read prompt obarray 'user-variable-p t nil
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1461 'variable-history
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1462 (if (symbolp default-value)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1463 (symbol-name default-value)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1464 default-value))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1465
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1466 (defun read-buffer (prompt &optional default require-match)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1467 "Read the name of a buffer and return as a string.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1468 Prompts with PROMPT. Optional second arg DEFAULT is value to return if user
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1469 enters an empty line. If optional third arg REQUIRE-MATCH is non-nil,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1470 only existing buffer names are allowed."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1471 (let ((prompt (if default
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1472 (format "%s(default %s) "
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1473 (gettext prompt) (if (bufferp default)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1474 (buffer-name default)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1475 default))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1476 prompt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1477 (alist (mapcar #'(lambda (b) (cons (buffer-name b) b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1478 (buffer-list)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1479 result)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1480 (while (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1481 (setq result (completing-read prompt alist nil require-match
430
a5df635868b2 Import from CVS: tag r21-2-23
cvs
parents: 428
diff changeset
1482 nil 'buffer-history
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
1483 (if (bufferp default)
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
1484 (buffer-name default)
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
1485 default)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1486 (cond ((not (equal result ""))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1487 nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1488 ((not require-match)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1489 (setq result default)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1490 nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1491 ((not default)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1492 t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1493 ((not (get-buffer default))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1494 t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1495 (t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1496 (setq result default)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1497 nil))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1498 (if (bufferp result)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1499 (buffer-name result)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1500 result)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1501
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1502 (defun read-number (prompt &optional integers-only default-value)
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1503 "Read a number from the minibuffer, prompting with PROMPT.
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1504 If optional second argument INTEGERS-ONLY is non-nil, accept
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1505 only integer input.
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1506 If DEFAULT-VALUE is non-nil, return that if user enters an empty
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1507 line."
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1508 (let ((pred (if integers-only 'integerp 'numberp))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1509 num)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1510 (while (not (funcall pred num))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1511 (setq num (condition-case ()
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1512 (let ((minibuffer-completion-table nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1513 (read-from-minibuffer
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1514 prompt (if num (prin1-to-string num)) nil t
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1515 nil nil default-value))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1516 (input-error nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1517 (invalid-read-syntax nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1518 (end-of-file nil)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1519 (or (funcall pred num) (beep)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1520 num))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1521
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1522 (defun read-shell-command (prompt &optional initial-input history default-value)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1523 "Just like read-string, but uses read-shell-command-map:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1524 \\{read-shell-command-map}"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1525 (let ((minibuffer-completion-table nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1526 (read-from-minibuffer prompt initial-input read-shell-command-map
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1527 nil (or history 'shell-command-history)
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1528 nil default-value)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1529
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1530
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1531 ;;; This read-file-name stuff probably belongs in files.el
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1532
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1533 ;; Quote "$" as "$$" to get it past substitute-in-file-name
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1534 (defun un-substitute-in-file-name (string)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1535 (let ((regexp "\\$")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1536 (olen (length string))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1537 new
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1538 n o ch)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1539 (if (not (string-match regexp string))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1540 string
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1541 (setq n 1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1542 (while (string-match regexp string (match-end 0))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1543 (setq n (1+ n)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1544 (setq new (make-string (+ olen n) ?$))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1545 (setq n 0 o 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1546 (while (< o olen)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1547 (setq ch (aref string o))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1548 (aset new n ch)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1549 (setq o (1+ o) n (1+ n))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1550 (if (eq ch ?$)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1551 ;; already aset by make-string initial-value
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1552 (setq n (1+ n))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1553 new)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1554
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1555
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1556 ;; Wrapper for `directory-files' for use in generating completion lists.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1557 ;; Generates output in the same format as `file-name-all-completions'.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1558 ;;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1559 ;; The EFS replacement for `directory-files' doesn't support the FILES-ONLY
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1560 ;; option, so it has to be faked. The listing cache will hopefully
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1561 ;; improve the performance of this operation.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1562 (defun minibuf-directory-files (dir &optional match-regexp files-only)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1563 (let ((want-file (or (eq files-only nil) (eq files-only t)))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1564 (want-dirs (or (eq files-only nil) (not (eq files-only t)))))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1565 (delete nil
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1566 (mapcar (function (lambda (f)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1567 (if (file-directory-p (expand-file-name f dir))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1568 (and want-dirs (file-name-as-directory f))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1569 (and want-file f))))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1570 (delete "." (directory-files dir nil match-regexp))))))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1571
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1572
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1573 (defun read-file-name-2 (history prompt dir default
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1574 must-match initial-contents
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1575 completer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1576 (if (not dir)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1577 (setq dir default-directory))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1578 (setq dir (abbreviate-file-name dir t))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1579 (let* ((insert (cond ((and (not insert-default-directory)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1580 (not initial-contents))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1581 "")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1582 (initial-contents
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1583 (cons (un-substitute-in-file-name
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1584 (concat dir initial-contents))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1585 (length dir)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1586 (t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1587 (un-substitute-in-file-name dir))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1588 (val
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1589 ;; Hateful, broken, case-sensitive un*x
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1590 ;;; (completing-read prompt
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1591 ;;; completer
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1592 ;;; dir
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1593 ;;; must-match
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1594 ;;; insert
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1595 ;;; history)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1596 ;; #### - this is essentially the guts of completing read.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1597 ;; There should be an elegant way to pass a pair of keymaps to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1598 ;; completing read, but this will do for now. All sins are
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1599 ;; relative. --Stig
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1600 (let ((minibuffer-completion-table completer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1601 (minibuffer-completion-predicate dir)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1602 (minibuffer-completion-confirm (if (eq must-match 't)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1603 nil t))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1604 (last-exact-completion nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1605 (read-from-minibuffer prompt
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1606 insert
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1607 (if (not must-match)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1608 read-file-name-map
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1609 read-file-name-must-match-map)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1610 nil
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
1611 history
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
1612 nil
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
1613 default))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1614 ;;; ;; Kludge! Put "/foo/bar" on history rather than "/default//foo/bar"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1615 ;;; (let ((hist (cond ((not history) 'minibuffer-history)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1616 ;;; ((consp history) (car history))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1617 ;;; (t history))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1618 ;;; (if (and val
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1619 ;;; hist
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1620 ;;; (not (eq hist 't))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1621 ;;; (boundp hist)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1622 ;;; (equal (car-safe (symbol-value hist)) val))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1623 ;;; (let ((e (condition-case nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1624 ;;; (expand-file-name val)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1625 ;;; (error nil))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1626 ;;; (if (and e (not (equal e val)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1627 ;;; (set hist (cons e (cdr (symbol-value hist))))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1628
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1629 (cond ((not val)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1630 (error "No file name specified"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1631 ((and default
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1632 (equal val (if (consp insert) (car insert) insert)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1633 default)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1634 (t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1635 (substitute-in-file-name val)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1636
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1637 ;; #### this function should use minibuffer-completion-table
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1638 ;; or something. But that is sloooooow.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1639 ;; #### all this shit needs better documentation!!!!!!!!
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1640 (defun read-file-name-activate-callback (event extent dir-p)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1641 ;; used as the activate-callback of the filename list items
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1642 ;; in the completion buffer, in place of default-choose-completion.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1643 ;; if a regular file was selected, we call default-choose-completion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1644 ;; (which just inserts the string in the minibuffer and calls
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1645 ;; exit-minibuffer). If a directory was selected, we display
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1646 ;; the contents of the directory.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1647 (let* ((file (extent-string extent))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1648 (completion-buf (extent-object extent))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1649 (minibuf (symbol-value-in-buffer 'completion-reference-buffer
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1650 completion-buf))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1651 (in-dir (file-name-directory (buffer-substring nil nil minibuf)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1652 (full (expand-file-name file in-dir)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1653 (if (not (file-directory-p full))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1654 (default-choose-completion event extent minibuf)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1655 (erase-buffer minibuf)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1656 (insert-string (file-name-as-directory
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1657 (abbreviate-file-name full t)) minibuf)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1658 (reset-buffer completion-buf)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1659 (let ((standard-output completion-buf))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1660 (display-completion-list
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1661 (minibuf-directory-files full nil (if dir-p 'directory))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1662 :user-data dir-p
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1663 :reference-buffer minibuf
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1664 :activate-callback 'read-file-name-activate-callback)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1665 (goto-char (point-min) completion-buf)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1666
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1667 (defun read-file-name-1 (history prompt dir default
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1668 must-match initial-contents
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1669 completer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1670 (if (should-use-dialog-box-p)
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1671 (condition-case nil
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1672 (let ((file
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1673 (apply #'make-dialog-box
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1674 'file `(:title ,(capitalize-string-as-title
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1675 ;; Kludge: Delete ": " off the end.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1676 (replace-in-string prompt ": $" ""))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1677 ,@(and dir (list :initial-directory
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1678 dir))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1679 :file-must-exist ,must-match
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1680 ,@(and initial-contents
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1681 (list :initial-filename
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1682 initial-contents))))))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1683 ;; hack -- until we implement reading a directory properly,
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1684 ;; allow a file as indicating the directory it's in
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1685 (if (and (eq completer 'read-directory-name-internal)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1686 (not (file-directory-p file)))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1687 (file-name-directory file)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1688 file))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1689 (unimplemented
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1690 ;; this calls read-file-name-2
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1691 (mouse-read-file-name-1 history prompt dir default must-match
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1692 initial-contents completer)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1693 ))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1694 (add-one-shot-hook
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1695 'minibuffer-setup-hook
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1696 (lambda ()
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1697 ;; #### SCREAM! Create a `file-system-ignore-case'
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1698 ;; function, so this kind of stuff is generalized!
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1699 (and (eq system-type 'windows-nt)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1700 (set (make-local-variable 'completion-ignore-case) t))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1701 (set
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1702 (make-local-variable
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1703 'completion-display-completion-list-function)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1704 #'(lambda (completions)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1705 (display-completion-list
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1706 completions
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1707 :user-data (not (eq completer 'read-file-name-internal))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1708 :activate-callback
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1709 'read-file-name-activate-callback)))))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1710 (read-file-name-2 history prompt dir default must-match
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1711 initial-contents completer)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1712
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1713 (defun read-file-name (prompt
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1714 &optional dir default must-match initial-contents
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1715 history)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1716 "Read file name, prompting with PROMPT and completing in directory DIR.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1717 This will prompt with a dialog box if appropriate, according to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1718 `should-use-dialog-box-p'.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1719 Value is not expanded---you must call `expand-file-name' yourself.
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
1720 Value is subject to interpretation by `substitute-in-file-name' however.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1721 Default name to DEFAULT if user enters a null string.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1722 (If DEFAULT is omitted, the visited file name is used,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1723 except that if INITIAL-CONTENTS is specified, that combined with DIR is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1724 used.)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1725 Fourth arg MUST-MATCH non-nil means require existing file's name.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1726 Non-nil and non-t means also require confirmation after completion.
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1727 Fifth arg INITIAL-CONTENTS specifies text to start with. If this is not
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1728 specified, and `insert-default-directory' is non-nil, DIR or the current
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1729 directory will be used.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1730 Sixth arg HISTORY specifies the history list to use. Default is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1731 `file-name-history'.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1732 DIR defaults to current buffer's directory default."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1733 (read-file-name-1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1734 (or history 'file-name-history)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1735 prompt dir (or default
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1736 (and initial-contents
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1737 (abbreviate-file-name (expand-file-name
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1738 initial-contents dir) t))
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1739 (and buffer-file-truename
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1740 (abbreviate-file-name buffer-file-name t)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1741 must-match initial-contents
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1742 ;; A separate function (not an anonymous lambda-expression)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1743 ;; and passed as a symbol because of disgusting kludges in various
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1744 ;; places which do stuff like (let ((filename-kludge-p (eq minibuffer-completion-table 'read-file-name-internal))) ...)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1745 'read-file-name-internal))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1746
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1747 (defun read-directory-name (prompt
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1748 &optional dir default must-match initial-contents
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1749 history)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1750 "Read directory name, prompting with PROMPT and completing in directory DIR.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1751 This will prompt with a dialog box if appropriate, according to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1752 `should-use-dialog-box-p'.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1753 Value is not expanded---you must call `expand-file-name' yourself.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1754 Value is subject to interpreted by substitute-in-file-name however.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1755 Default name to DEFAULT if user enters a null string.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1756 (If DEFAULT is omitted, the current buffer's default directory is used.)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1757 Fourth arg MUST-MATCH non-nil means require existing directory's name.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1758 Non-nil and non-t means also require confirmation after completion.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1759 Fifth arg INITIAL-CONTENTS specifies text to start with.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1760 Sixth arg HISTORY specifies the history list to use. Default is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1761 `file-name-history'.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1762 DIR defaults to current buffer's directory default."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1763 (read-file-name-1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1764 (or history 'file-name-history)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1765 prompt dir (or default default-directory) must-match initial-contents
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1766 'read-directory-name-internal))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1767
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1768
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1769 ;; Environment-variable and ~username completion hack
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1770 (defun read-file-name-internal-1 (string dir action completer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1771 (if (not (string-match
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1772 "\\([^$]\\|\\`\\)\\(\\$\\$\\)*\\$\\([A-Za-z0-9_]*\\|{[^}]*\\)\\'"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1773 string))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1774 ;; Not doing environment-variable completion hack
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1775 (let* ((orig (if (equal string "") nil string))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1776 (sstring (if orig (substitute-in-file-name string) string))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1777 (specdir (if orig (file-name-directory sstring) nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1778 (name (if orig (file-name-nondirectory sstring) string))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1779 (direct (if specdir (expand-file-name specdir dir) dir)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1780 ;; ~username completion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1781 (if (and (fboundp 'user-name-completion-1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1782 (string-match "^[~]" name))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1783 (let ((user (substring name 1)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1784 (cond ((eq action 'lambda)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1785 (file-directory-p name))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1786 ((eq action 't)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1787 ;; all completions
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1788 (mapcar #'(lambda (p) (concat "~" p))
502
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 462
diff changeset
1789 (declare-fboundp
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 462
diff changeset
1790 (user-name-all-completions user))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1791 (t;; 'nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1792 ;; complete
502
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 462
diff changeset
1793 (let* ((val+uniq (declare-fboundp
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 462
diff changeset
1794 (user-name-completion-1 user)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1795 (val (car val+uniq))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1796 (uniq (cdr val+uniq)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1797 (cond ((stringp val)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1798 (if uniq
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1799 (file-name-as-directory (concat "~" val))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1800 (concat "~" val)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1801 ((eq val t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1802 (file-name-as-directory name))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1803 (t nil))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1804 (funcall completer
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1805 action
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1806 orig
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1807 sstring
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1808 specdir
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1809 direct
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1810 name)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1811 ;; An odd number of trailing $'s
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1812 (let* ((start (match-beginning 3))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1813 (env (substring string
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1814 (cond ((= start (length string))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1815 ;; "...$"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1816 start)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1817 ((= (aref string start) ?{)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1818 ;; "...${..."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1819 (1+ start))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1820 (t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1821 start))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1822 (head (substring string 0 (1- start)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1823 (alist #'(lambda ()
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1824 (mapcar #'(lambda (x)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1825 (cons (substring x 0 (string-match "=" x))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1826 nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1827 process-environment))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1828
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1829 (cond ((eq action 'lambda)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1830 nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1831 ((eq action 't)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1832 ;; all completions
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1833 (mapcar #'(lambda (p)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1834 (if (and (> (length p) 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1835 ;;#### Unix-specific
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1836 ;;#### -- need absolute-pathname-p
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1837 (/= (aref p 0) ?/))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1838 (concat "$" p)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1839 (concat head "$" p)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1840 (all-completions env (funcall alist))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1841 (t ;; nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1842 ;; complete
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1843 (let* ((e (funcall alist))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1844 (val (try-completion env e)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1845 (cond ((stringp val)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1846 (if (string-match "[^A-Za-z0-9_]" val)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1847 (concat head
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1848 "${" val
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1849 ;; completed uniquely?
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1850 (if (eq (try-completion val e) 't)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1851 "}" ""))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1852 (concat head "$" val)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1853 ((eql val 't)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1854 (concat head
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1855 (un-substitute-in-file-name (getenv env))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1856 (t nil))))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1857
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1858
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1859 (defun read-file-name-internal (string dir action)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1860 (read-file-name-internal-1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1861 string dir action
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1862 #'(lambda (action orig string specdir dir name)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1863 (cond ((eq action 'lambda)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1864 (if (not orig)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1865 nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1866 (let ((sstring (condition-case nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1867 (expand-file-name string)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1868 (error nil))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1869 (if (not sstring)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1870 ;; Some pathname syntax error in string
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1871 nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1872 (file-exists-p sstring)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1873 ((eq action 't)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1874 ;; all completions
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1875 (mapcar #'un-substitute-in-file-name
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1876 (if (string= name "")
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1877 (delete "./" (file-name-all-completions "" dir))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1878 (file-name-all-completions name dir))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1879 (t;; nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1880 ;; complete
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1881 (let* ((d (or dir default-directory))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1882 (val (file-name-completion name d)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1883 (if (and (eq val 't)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1884 (not (null completion-ignored-extensions)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1885 ;;#### (file-name-completion "foo") returns 't
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1886 ;; when both "foo" and "foo~" exist and the latter
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1887 ;; is "pruned" by completion-ignored-extensions.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1888 ;; I think this is a bug in file-name-completion.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1889 (setq val (let ((completion-ignored-extensions '()))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1890 (file-name-completion name d))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1891 (if (stringp val)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1892 (un-substitute-in-file-name (if specdir
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1893 (concat specdir val)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1894 val))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1895 (let ((tem (un-substitute-in-file-name string)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1896 (if (not (equal tem orig))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1897 ;; substitute-in-file-name did something
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1898 tem
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1899 val)))))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1900
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1901 (defun read-directory-name-internal (string dir action)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1902 (read-file-name-internal-1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1903 string dir action
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1904 #'(lambda (action orig string specdir dir name)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1905 (let* ((dirs #'(lambda (fn)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1906 (let ((l (if (equal name "")
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1907 (minibuf-directory-files
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1908 dir
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1909 ""
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1910 'directories)
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1911 (minibuf-directory-files
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1912 dir
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1913 (concat "\\`" (regexp-quote name))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1914 'directories))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1915 (mapcar fn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1916 ;; Wretched unix
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1917 (delete "." l))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1918 (cond ((eq action 'lambda)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1919 ;; complete?
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1920 (if (not orig)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1921 nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1922 (file-directory-p string)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1923 ((eq action 't)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1924 ;; all completions
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1925 (funcall dirs #'(lambda (n)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1926 (un-substitute-in-file-name
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1927 (file-name-as-directory n)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1928 (t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1929 ;; complete
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1930 (let ((val (try-completion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1931 name
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1932 (funcall dirs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1933 #'(lambda (n)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1934 (list (file-name-as-directory
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1935 n)))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1936 (if (stringp val)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1937 (un-substitute-in-file-name (if specdir
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1938 (concat specdir val)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1939 val))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1940 (let ((tem (un-substitute-in-file-name string)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1941 (if (not (equal tem orig))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1942 ;; substitute-in-file-name did something
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1943 tem
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1944 val))))))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1945
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1946 (defun append-expand-filename (file-string string)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1947 "Append STRING to FILE-STRING differently depending on whether STRING
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1948 is a username (~string), an environment variable ($string),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1949 or a filename (/string). The resultant string is returned with the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1950 environment variable or username expanded and resolved to indicate
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1951 whether it is a file(/result) or a directory (/result/)."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1952 (let ((file
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1953 (cond ((string-match "\\([~$]\\)\\([^~$/]*\\)$" file-string)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1954 (cond ((string= (substring file-string
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1955 (match-beginning 1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1956 (match-end 1)) "~")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1957 (concat (substring file-string 0 (match-end 1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1958 string))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1959 (t (substitute-in-file-name
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1960 (concat (substring file-string 0 (match-end 1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1961 string)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1962 (t (concat (file-name-directory
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1963 (substitute-in-file-name file-string)) string))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1964 result)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1965
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1966 (cond ((stringp (setq result (and (file-exists-p (expand-file-name file))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1967 (read-file-name-internal
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1968 (condition-case nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1969 (expand-file-name file)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1970 (error file))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1971 "" nil))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1972 result)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1973 (t file))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1974
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1975 (defun mouse-rfn-setup-vars (prompt)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1976 ;; a specifier would be nice.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1977 (set (make-local-variable 'frame-title-format)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1978 (capitalize-string-as-title
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1979 ;; Kludge: Delete ": " off the end.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1980 (replace-in-string prompt ": $" "")))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1981 ;; ensure that killing the frame works right,
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1982 ;; instead of leaving us in the minibuffer.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1983 (add-local-hook 'delete-frame-hook
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1984 #'(lambda (frame)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1985 (abort-recursive-edit))))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1986
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1987 (defun mouse-file-display-completion-list (window dir minibuf user-data)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1988 (let ((standard-output (window-buffer window)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1989 (condition-case nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1990 (display-completion-list
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1991 (minibuf-directory-files dir nil t)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1992 :window-width (window-width window)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1993 :window-height (window-text-area-height window)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1994 :completion-string ""
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1995 :activate-callback
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1996 'mouse-read-file-name-activate-callback
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1997 :user-data user-data
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1998 :reference-buffer minibuf
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1999 :help-string "")
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2000 (t nil))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2001 ))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2002
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2003 (defun mouse-directory-display-completion-list (window dir minibuf user-data)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2004 (let ((standard-output (window-buffer window)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2005 (condition-case nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2006 (display-completion-list
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2007 (minibuf-directory-files dir nil 1)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2008 :window-width (window-width window)
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2009 :window-height (window-text-area-height window)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2010 :completion-string ""
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2011 :activate-callback
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2012 'mouse-read-file-name-activate-callback
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2013 :user-data user-data
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2014 :reference-buffer minibuf
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2015 :help-string "")
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2016 (t nil))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2017 ))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2018
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2019 (defun mouse-read-file-name-activate-callback (event extent user-data)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2020 (let* ((file (extent-string extent))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2021 (minibuf (symbol-value-in-buffer 'completion-reference-buffer
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2022 (extent-object extent)))
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2023 (ministring (buffer-substring nil nil minibuf))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2024 (in-dir (file-name-directory ministring))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2025 (full (expand-file-name file in-dir))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2026 (filebuf (nth 0 user-data))
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2027 (dirbuf (nth 1 user-data))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2028 (filewin (nth 2 user-data))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2029 (dirwin (nth 3 user-data)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2030 (if (file-regular-p full)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2031 (default-choose-completion event extent minibuf)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2032 (erase-buffer minibuf)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2033 (insert-string (file-name-as-directory
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2034 (abbreviate-file-name full t)) minibuf)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2035 (reset-buffer filebuf)
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2036 (if (not dirbuf)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2037 (mouse-directory-display-completion-list filewin full minibuf
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2038 user-data)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2039 (mouse-file-display-completion-list filewin full minibuf user-data)
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2040 (reset-buffer dirbuf)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2041 (mouse-directory-display-completion-list dirwin full minibuf
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2042 user-data)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2043
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2044 ;; our cheesy but god-awful time consuming file dialog box implementation.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2045 ;; this will be replaced with use of the native file dialog box (when
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2046 ;; available).
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2047 (defun mouse-read-file-name-1 (history prompt dir default
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2048 must-match initial-contents
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2049 completer)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2050 ;; file-p is t if we're reading files, nil if directories.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2051 (let* ((file-p (eq 'read-file-name-internal completer))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2052 (filebuf (get-buffer-create "*Completions*"))
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2053 (dirbuf (and file-p (generate-new-buffer " *mouse-read-file*")))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2054 (butbuf (generate-new-buffer " *mouse-read-file*"))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2055 (frame (make-dialog-frame))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2056 filewin dirwin
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2057 user-data)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2058 (unwind-protect
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2059 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2060 (reset-buffer filebuf)
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2061
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2062 ;; set up the frame.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2063 (focus-frame frame)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2064 (let ((window-min-height 1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2065 ;; #### should be 2 not 3, but that causes
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2066 ;; "window too small to split" errors for some
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2067 ;; people (but not for me ...) There's a more
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2068 ;; fundamental bug somewhere.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2069 (split-window nil (- (frame-height frame) 3)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2070 (if file-p
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2071 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2072 (split-window-horizontally 16)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2073 (setq filewin (frame-rightmost-window frame)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2074 dirwin (frame-leftmost-window frame))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2075 (set-window-buffer filewin filebuf)
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2076 (set-window-buffer dirwin dirbuf))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2077 (setq filewin (frame-highest-window frame))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2078 (set-window-buffer filewin filebuf))
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2079 (setq user-data (list filebuf dirbuf filewin dirwin))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2080 (set-window-buffer (frame-lowest-window frame) butbuf)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2081
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2082 ;; set up completion buffers.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2083 (let ((rfcshookfun
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2084 ;; kludge!
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2085 ;; #### I really need to flesh out the object
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2086 ;; hierarchy better to avoid these kludges.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2087 ;; (?? I wrote this comment above some time ago,
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2088 ;; and I don't understand what I'm referring to
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2089 ;; any more. --ben
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2090 (lambda ()
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2091 (mouse-rfn-setup-vars prompt)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2092 (when (featurep 'scrollbar)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2093 (set-specifier scrollbar-width 0 (current-buffer)))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2094 (setq truncate-lines t))))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2095
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2096 (set-buffer filebuf)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2097 (add-local-hook 'completion-setup-hook rfcshookfun)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2098 (when file-p
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2099 (set-buffer dirbuf)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2100 (add-local-hook 'completion-setup-hook rfcshookfun)))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2101
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2102 ;; set up minibuffer.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2103 (add-one-shot-hook
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2104 'minibuffer-setup-hook
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2105 (lambda ()
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2106 (if (not file-p)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2107 (mouse-directory-display-completion-list
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2108 filewin dir (current-buffer) user-data)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2109 (mouse-file-display-completion-list
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2110 filewin dir (current-buffer) user-data)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2111 (mouse-directory-display-completion-list
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2112 dirwin dir (current-buffer) user-data))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2113 (set
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2114 (make-local-variable
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2115 'completion-display-completion-list-function)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2116 (lambda (completions)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2117 (display-completion-list
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2118 completions
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2119 :help-string ""
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2120 :window-width (window-width filewin)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2121 :window-height (window-text-area-height filewin)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2122 :completion-string ""
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2123 :activate-callback
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2124 'mouse-read-file-name-activate-callback
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2125 :user-data user-data)))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2126 (mouse-rfn-setup-vars prompt)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2127 (save-selected-window
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2128 ;; kludge to ensure the frame title is correct.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2129 ;; the minibuffer leaves the frame title the way
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2130 ;; it was before (i.e. of the selected window before
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2131 ;; the dialog box was opened), so to get it correct
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2132 ;; we have to be tricky.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2133 (select-window filewin)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2134 (redisplay-frame nil t)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2135 ;; #### another kludge. sometimes the focus ends up
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2136 ;; back in the main window, not the dialog box. it
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2137 ;; occurs randomly and it's not possible to reliably
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2138 ;; reproduce. We try to fix it by draining non-user
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2139 ;; events and then setting the focus back on the frame.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2140 (sit-for 0 t)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2141 (focus-frame frame))))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2142
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2143 ;; set up button buffer.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2144 (set-buffer butbuf)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2145 (mouse-rfn-setup-vars prompt)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2146 (when dir
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2147 (setq default-directory dir))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2148 (when (featurep 'scrollbar)
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2149 (set-specifier scrollbar-width 0 butbuf))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2150 (insert " ")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2151 (insert-gui-button (make-gui-button "OK"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2152 (lambda (foo)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2153 (exit-minibuffer))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2154 (insert " ")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2155 (insert-gui-button (make-gui-button "Cancel"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2156 (lambda (foo)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2157 (abort-recursive-edit))))
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2158
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2159 ;; now start reading filename.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2160 (read-file-name-2 history prompt dir default
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2161 must-match initial-contents
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2162 completer))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2163
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2164 ;; always clean up.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2165 ;; get rid of our hook that calls abort-recursive-edit -- not a good
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2166 ;; idea here.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2167 (kill-local-variable 'delete-frame-hook)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2168 (delete-frame frame)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2169 (kill-buffer filebuf)
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2170 (kill-buffer butbuf)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2171 (and dirbuf (kill-buffer dirbuf)))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2172
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2173 (defun read-face (prompt &optional must-match)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2174 "Read the name of a face from the minibuffer and return it as a symbol."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2175 (intern (completing-read prompt obarray 'find-face must-match)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2176
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2177 ;; #### - wrong place for this variable? Exactly. We probably want
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2178 ;; `color-list' to be a console method, so `tty-color-list' becomes
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2179 ;; obsolete, and `read-color-completion-table' conses (mapcar #'list
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2180 ;; (color-list)), optionally caching the results.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2181
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2182 ;; Ben wanted all of the possibilities from the `configure' script used
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2183 ;; here, but I think this is way too many. I already trimmed the R4 variants
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2184 ;; and a few obvious losers from the list. --Stig
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2185 (defvar x-library-search-path '("/usr/X11R6/lib/X11/"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2186 "/usr/X11R5/lib/X11/"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2187 "/usr/lib/X11R6/X11/"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2188 "/usr/lib/X11R5/X11/"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2189 "/usr/local/X11R6/lib/X11/"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2190 "/usr/local/X11R5/lib/X11/"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2191 "/usr/local/lib/X11R6/X11/"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2192 "/usr/local/lib/X11R5/X11/"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2193 "/usr/X11/lib/X11/"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2194 "/usr/lib/X11/"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2195 "/usr/local/lib/X11/"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2196 "/usr/X386/lib/X11/"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2197 "/usr/x386/lib/X11/"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2198 "/usr/XFree86/lib/X11/"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2199 "/usr/unsupported/lib/X11/"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2200 "/usr/athena/lib/X11/"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2201 "/usr/local/x11r5/lib/X11/"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2202 "/usr/lpp/Xamples/lib/X11/"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2203 "/usr/openwin/lib/X11/"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2204 "/usr/openwin/share/lib/X11/")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2205 "Search path used by `read-color' to find rgb.txt.")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2206
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2207 (defvar x-read-color-completion-table)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2208
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2209 (defun read-color-completion-table ()
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2210 (case (device-type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2211 ;; #### Evil device-type dependency
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents: 444
diff changeset
2212 ((x gtk)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2213 (if (boundp 'x-read-color-completion-table)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2214 x-read-color-completion-table
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2215 (let ((rgb-file (locate-file "rgb.txt" x-library-search-path))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2216 clist color p)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2217 (if (not rgb-file)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2218 ;; prevents multiple searches for rgb.txt if we can't find it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2219 (setq x-read-color-completion-table nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2220 (with-current-buffer (get-buffer-create " *colors*")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2221 (reset-buffer (current-buffer))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2222 (insert-file-contents rgb-file)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2223 (while (not (eobp))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2224 ;; skip over comments
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2225 (while (looking-at "^!")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2226 (end-of-line)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2227 (forward-char 1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2228 (skip-chars-forward "0-9 \t")
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2229 (setq p (point))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2230 (end-of-line)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2231 (setq color (buffer-substring p (point))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2232 clist (cons (list color) clist))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2233 ;; Ugh. If we want to be able to complete the lowercase form
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2234 ;; of the color name, we need to add it twice! Yuck.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2235 (let ((dcase (downcase color)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2236 (or (string= dcase color)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2237 (push (list dcase) clist)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2238 (forward-char 1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2239 (kill-buffer (current-buffer))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2240 (setq x-read-color-completion-table clist)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2241 x-read-color-completion-table)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2242 (mswindows
502
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 462
diff changeset
2243 (mapcar #'list (declare-fboundp (mswindows-color-list))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2244 (tty
502
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 462
diff changeset
2245 (mapcar #'list (declare-fboundp (tty-color-list))))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2246
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2247 (defun read-color (prompt &optional must-match initial-contents)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2248 "Read the name of a color from the minibuffer.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2249 On X devices, this uses `x-library-search-path' to find rgb.txt in order
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2250 to build a completion table.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2251 On TTY devices, this uses `tty-color-list'.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2252 On mswindows devices, this uses `mswindows-color-list'."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2253 (let ((table (read-color-completion-table)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2254 (completing-read prompt table nil (and table must-match)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2255 initial-contents)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2256
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2257
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2258 ;; #### The doc string for read-non-nil-coding system gets lost if we
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2259 ;; only include these if the mule feature is present. Strangely,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2260 ;; read-coding-system doesn't.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2261
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2262 ;;(if (featurep 'mule)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2263
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2264 (defun read-coding-system (prompt &optional default-coding-system)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2265 "Read a coding-system (or nil) from the minibuffer.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2266 Prompting with string PROMPT.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2267 If the user enters null input, return second argument DEFAULT-CODING-SYSTEM.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2268 DEFAULT-CODING-SYSTEM can be a string, symbol, or coding-system object."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2269 (intern (completing-read prompt obarray 'find-coding-system t nil nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2270 (cond ((symbolp default-coding-system)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2271 (symbol-name default-coding-system))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2272 ((coding-system-p default-coding-system)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2273 (symbol-name (coding-system-name default-coding-system)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2274 (t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2275 default-coding-system)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2276
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2277 (defun read-non-nil-coding-system (prompt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2278 "Read a non-nil coding-system from the minibuffer.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2279 Prompt with string PROMPT."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2280 (let ((retval (intern "")))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2281 (while (= 0 (length (symbol-name retval)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2282 (setq retval (intern (completing-read prompt obarray
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2283 'find-coding-system
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2284 t))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2285 retval))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2286
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2287 ;;) ;; end of (featurep 'mule)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2288
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2289
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2290
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2291 (defcustom force-dialog-box-use nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2292 "*If non-nil, always use a dialog box for asking questions, if possible.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2293 You should *bind* this, not set it. This is useful if you're doing
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2294 something mousy but which wasn't actually invoked using the mouse."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2295 :type 'boolean
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2296 :group 'minibuffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2297
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2298 ;; We include this here rather than dialog.el so it is defined
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2299 ;; even when dialog boxes are not present.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2300 (defun should-use-dialog-box-p ()
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2301 "If non-nil, questions should be asked with a dialog box instead of the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2302 minibuffer. This looks at `last-command-event' to see if it was a mouse
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2303 event, and checks whether dialog-support exists and the current device
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2304 supports dialog boxes.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2305
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2306 The dialog box is totally disabled if the variable `use-dialog-box'
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2307 is set to nil."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2308 (and (featurep 'dialog)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2309 (device-on-window-system-p)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2310 use-dialog-box
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2311 (or force-dialog-box-use
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2312 (button-press-event-p last-command-event)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2313 (button-release-event-p last-command-event)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2314 (misc-user-event-p last-command-event))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2315
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2316 ;;; minibuf.el ends here