annotate lisp/prim/minibuf.el @ 48:56c54cf7c5b6 r19-16b90

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