comparison 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
comparison
equal deleted inserted replaced
172:a38aed19690b 173:8eaf7971accc
361 (owindow (selected-window)) 361 (owindow (selected-window))
362 (oframe (selected-frame)) 362 (oframe (selected-frame))
363 (window (minibuffer-window)) 363 (window (minibuffer-window))
364 (buffer (if (eq (minibuffer-depth) 0) 364 (buffer (if (eq (minibuffer-depth) 0)
365 (window-buffer window) 365 (window-buffer window)
366 (get-buffer-create (format " *Minibuf-%d" 366 (get-buffer-create (format " *Minibuf-%d"
367 (minibuffer-depth))))) 367 (minibuffer-depth)))))
368 (frame (window-frame window)) 368 (frame (window-frame window))
369 (mconfig (if (eq frame (selected-frame)) 369 (mconfig (if (eq frame (selected-frame))
370 nil (current-window-configuration frame))) 370 nil (current-window-configuration frame)))
371 (oconfig (current-window-configuration)) 371 (oconfig (current-window-configuration))
372 ;; dynamic scope sucks sucks sucks sucks sucks sucks. 372 ;; dynamic scope sucks sucks sucks sucks sucks sucks.
374 ;; our binding above is buffer-local and doesn't apply 374 ;; our binding above is buffer-local and doesn't apply
375 ;; once we switch buffers!!!! We demand better scope! 375 ;; once we switch buffers!!!! We demand better scope!
376 (_history_ history)) 376 (_history_ history))
377 (unwind-protect 377 (unwind-protect
378 (progn 378 (progn
379 (set-buffer buffer) 379 (set-buffer (reset-buffer buffer))
380 (reset-buffer buffer)
381 (setq default-directory dir) 380 (setq default-directory dir)
382 (make-local-variable 'print-escape-newlines) 381 (make-local-variable 'print-escape-newlines)
383 (setq print-escape-newlines t) 382 (setq print-escape-newlines t)
384 (make-local-variable 'current-minibuffer-contents) 383 (make-local-variable 'current-minibuffer-contents)
385 (make-local-variable 'current-minibuffer-point) 384 (make-local-variable 'current-minibuffer-point)
479 (and list (equal histval (car list))) 478 (and list (equal histval (car list)))
480 (and (stringp val) 479 (and (stringp val)
481 minibuffer-history-minimum-string-length 480 minibuffer-history-minimum-string-length
482 (< (length val) 481 (< (length val)
483 minibuffer-history-minimum-string-length)) 482 minibuffer-history-minimum-string-length))
484 (set minibuffer-history-variable (cons histval list))))) 483 (set minibuffer-history-variable
484 (cons histval
485 (remove histval list))))))
485 (if err (signal (car err) (cdr err))) 486 (if err (signal (car err) (cdr err)))
486 val)))) 487 val))))
487 ;; stupid display code requires this for some reason 488 ;; stupid display code requires this for some reason
488 (set-buffer buffer) 489 (set-buffer buffer)
489 (buffer-disable-undo buffer) 490 (buffer-disable-undo buffer)