comparison lisp/vm/vm-minibuf.el @ 24:4103f0995bd7 r19-15b95

Import from CVS: tag r19-15b95
author cvs
date Mon, 13 Aug 2007 08:51:03 +0200
parents 859a2309aef8
children 441bb1e64a06
comparison
equal deleted inserted replaced
23:0edd3412f124 24:4103f0995bd7
260 (define-key minibuffer-local-map " " 'vm-minibuffer-complete-word) 260 (define-key minibuffer-local-map " " 'vm-minibuffer-complete-word)
261 (define-key minibuffer-local-map "?" 'vm-minibuffer-completion-help) 261 (define-key minibuffer-local-map "?" 'vm-minibuffer-completion-help)
262 (if (not multi-word) 262 (if (not multi-word)
263 (define-key minibuffer-local-map "\r" 263 (define-key minibuffer-local-map "\r"
264 'vm-minibuffer-complete-word-and-exit)) 264 'vm-minibuffer-complete-word-and-exit))
265 ;; evade the XEmacs dialox box, yeccch. 265 ;; evade the XEmacs dialog box, yeccch.
266 (let ((should-use-dialog-box nil)) 266 (let ((use-dialog-box nil))
267 (read-string prompt)))) 267 (read-string prompt))))
268 268
269 (defvar last-nonmenu-event) 269 (defvar last-nonmenu-event)
270 270
271 (defun vm-read-string (prompt completion-list &optional multi-word) 271 (defun vm-read-string (prompt completion-list &optional multi-word)
359 359
360 (defun vm-keyboard-read-file-name (prompt &optional dir default 360 (defun vm-keyboard-read-file-name (prompt &optional dir default
361 must-match initial history) 361 must-match initial history)
362 "Like read-file-name, except HISTORY's value is unaltered." 362 "Like read-file-name, except HISTORY's value is unaltered."
363 (let ((oldvalue (symbol-value history)) 363 (let ((oldvalue (symbol-value history))
364 ;; evade the XEmacs dialox box, yeccch. 364 ;; evade the XEmacs dialog box, yeccch.
365 (should-use-dialog-box nil)) 365 (use-dialog-box nil))
366 (unwind-protect 366 (unwind-protect
367 (condition-case nil 367 (condition-case nil
368 (read-file-name prompt dir default must-match initial history) 368 (read-file-name prompt dir default must-match initial history)
369 (wrong-number-of-arguments 369 (wrong-number-of-arguments
370 (if history 370 (if history