annotate lisp/prim/minibuf.el @ 173:8eaf7971accc r20-3b13

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