diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/isearch.el | 27 |
2 files changed, 18 insertions, 14 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e4d1252c44e..ccf7ab71d0b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,10 @@ 2001-07-25 Gerd Moellmann <gerd@gnu.org> + * isearch.el (isearch-other-meta-char): Don't modify mode-line and + similar events for which fake prefix keys are generated. It's no + longer necessary since read_key_sequence doesn't modify these + events for internal purposes anymore. + * files.el (auto-mode-alist): Use nroff-mode for files ending in `.9'. From Assar Westerlund <assar@stacken.kth.se>. diff --git a/lisp/isearch.el b/lisp/isearch.el index 672f559c2ba..1052708e15b 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -1229,20 +1229,19 @@ and the meta character is unread so that it applies to editing the string." (let (window) (cancel-kbd-macro-events) (apply 'isearch-unread keylist) - ;; Properly handle scroll-bar and mode-line clicks - ;; for which a dummy prefix event was generated as (aref key 0). - (and (> (length key) 1) - (symbolp (aref key 0)) - (listp (aref key 1)) - (not (numberp (posn-point (event-start (aref key 1))))) - ;; Convert the event back into its raw form, - ;; with the dummy prefix implicit in the mouse event, - ;; so it will get split up once again. - (progn (setq unread-command-events - (cdr unread-command-events)) - (setq main-event (car unread-command-events)) - (setcar (cdr (event-start main-event)) - (car (nth 1 (event-start main-event)))))) + + ;; Properly handle scroll-bar and mode-line clicks for + ;; which a dummy prefix event was generated as (aref key + ;; 0). Note that we don't have to modify the event + ;; anymore in 21 because read_key_sequence no longer modifies + ;; events to produce fake prefix keys. + (when (and (> (length key) 1) + (symbolp (aref key 0)) + (listp (aref key 1)) + (not (numberp (posn-point + (event-start (aref key 1)))))) + (setq main-event (pop unread-command-events))) + ;; If we got a mouse click, maybe it was read with the buffer ;; it was clicked on. If so, that buffer, not the current one, ;; is in isearch mode. So end the search in that buffer. |