annotate lisp/prim/minibuf.el @ 197:acd284d43ca1 r20-3b25

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