annotate lisp/prim/minibuf.el @ 207:e45d5e7c476e r20-4b2

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