Changeset 7079

Show
Ignore:
Timestamp:
08/23/07 17:10:24 (4 years ago)
Author:
gb
Message:

Don't call DOCUMENT-SET-POINT-POSITION in CLEAR-ECHO-AREA: editing changes
may still be pending on the echo area (how ?), and DOCUMENT-SET-POINT-POSITION
may need to do layout/display updates.
Use RECURSIVE-GET-KEY-EVENT when prompting in the echo area.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/ccl/cocoa-ide/hemlock/src/echo.lisp

    r7053 r7079  
    112112(defun clear-echo-area () 
    113113  "You guessed it." 
    114   ;(maybe-wait) 
    115   (let* ((b (current-buffer)) 
    116          (doc (buffer-document *echo-area-buffer*))) 
     114  ;;(maybe-wait) 
     115  (let* ((b (current-buffer))) 
    117116    (unwind-protect 
    118117         (progn 
     
    121120            (delete-region *echo-area-region*)) 
    122121           (setf (buffer-modified *echo-area-buffer*) nil)) 
    123       (when doc 
    124         (document-set-point-position doc)) 
    125122      (setf (current-buffer) b)))) 
    126123 
     
    489486                                            (if defaultp (if default "Y" "N")))) 
    490487          (loop 
    491             (let ((key-event (get-key-event *editor-input*))) 
     488            (let ((key-event (recursive-get-key-event *editor-input*))) 
    492489              (cond ((or (eq key-event #k"y") 
    493490                         (eq key-event #k"Y")) 
     
    522519            (setf (current-window) *echo-area-window*)) 
    523520          (display-prompt-nicely prompt) 
    524           (get-key-event *editor-input* t)) 
     521          (recursive-get-key-event *editor-input* t)) 
    525522      (when change-window (setf (current-window) old-window))))) 
    526523 
     
    544541                (declare (vector key)) 
    545542                TOP 
    546                 (setf key-event (get-key-event *editor-input*)) 
     543                (setf key-event (recursive-get-key-event *editor-input*)) 
    547544                (cond ((logical-key-event-p key-event :quote) 
    548                        (setf key-event (get-key-event *editor-input* t))) 
     545                       (setf key-event (recursive-get-key-event *editor-input* t))) 
    549546                      ((logical-key-event-p key-event :confirm) 
    550547                       (cond ((and default (zerop (length key)))