Re: `isearch-allow-scroll' - a misnomer and a bad design

[Alan Mackenzie]

Hi, Drew,

On Fri, Sep 09, 2011 at 04:07:02PM -0700, Drew Adams wrote:

> I would like to see `C-u' passed through - that's the main point.
> Either systematically or optionally, but if optionally then separately
> from allowing scrolling.

Here's a better patch.  I've tested it more than the previous attempt.


*** isearch.el  2011-09-04 15:31:05.000000000 +0000
--- isearch.100911.el   2011-09-11 10:26:12.000000000 +0000
***************
*** 1966,1976 ****
           (apply 'isearch-unread keylist)
           (isearch-edit-string))
            ;; Handle a scrolling function.
!           ((and isearch-allow-scroll
!                 (progn (setq key (isearch-reread-key-sequence-naturally 
keylist))
!                        (setq keylist (listify-key-sequence key))
!                        (setq main-event (aref key 0))
!                        (setq scroll-command (isearch-lookup-scroll-key key))))
             ;; From this point onwards, KEY, KEYLIST and MAIN-EVENT hold a
             ;; complete key sequence, possibly as modified by function-key-map,
             ;; not merely the one or two event fragment which invoked
--- 1966,1981 ----
           (apply 'isearch-unread keylist)
           (isearch-edit-string))
            ;; Handle a scrolling function.
!           ((progn
!            (setq key (isearch-reread-key-sequence-naturally keylist)
!                  keylist (listify-key-sequence key)
!                  main-event (aref key 0))
!            (or (and isearch-allow-scroll
!                     (setq scroll-command (isearch-lookup-scroll-key key)))
!                (let (overriding-terminal-local-map)
!                  (setq scroll-command (key-binding key))
!                  (memq scroll-command
!                        '(universal-argument negative-argument 
digit-argument)))))
             ;; From this point onwards, KEY, KEYLIST and MAIN-EVENT hold a
             ;; complete key sequence, possibly as modified by function-key-map,
             ;; not merely the one or two event fragment which invoked


-- 
Alan Mackenzie (Nuremberg, Germany).