comparison lisp/prim/minibuf.el @ 136:b980b6286996 r20-2b2

Import from CVS: tag r20-2b2
author cvs
date Mon, 13 Aug 2007 09:31:12 +0200
parents cca96a509cfe
children 318232e2a3f0
comparison
equal deleted inserted replaced
135:4636a6841cd6 136:b980b6286996
281 "*If this variable is non-nil, a string will not be added to the 281 "*If this variable is non-nil, a string will not be added to the
282 minibuffer history if its length is less than that value." 282 minibuffer history if its length is less than that value."
283 :type '(choice (const :tag "Any" nil) 283 :type '(choice (const :tag "Any" nil)
284 integer) 284 integer)
285 :group 'minibuffer) 285 :group 'minibuffer)
286
287 (define-error 'input-error "Keyboard input error")
286 288
287 (defun read-from-minibuffer (prompt &optional initial-contents 289 (defun read-from-minibuffer (prompt &optional initial-contents
288 keymap 290 keymap
289 readp 291 readp
290 history 292 history
434 (error "Trailing garbage following expression")))) 436 (error "Trailing garbage following expression"))))
435 (setq v (car v)) 437 (setq v (car v))
436 ;; total total kludge 438 ;; total total kludge
437 (if (stringp v) (setq v (list 'quote v))) 439 (if (stringp v) (setq v (list 'quote v)))
438 (setq val v)) 440 (setq val v))
439 (error (setq err e)))) 441 (end-of-file
442 (setq err
443 '(input-error "End of input before end of expression")))
444 (error (setq err e))))
440 ;; Add the value to the appropriate history list unless 445 ;; Add the value to the appropriate history list unless
441 ;; it's already the most recent element, or it's only 446 ;; it's already the most recent element, or it's only
442 ;; two characters long. 447 ;; two characters long.
443 (if (and (symbolp minibuffer-history-variable) 448 (if (and (symbolp minibuffer-history-variable)
444 (boundp minibuffer-history-variable)) 449 (boundp minibuffer-history-variable))