Mercurial > emacs

--- a/lisp/ChangeLog	Fri Apr 16 10:08:29 2010 +0900
+++ b/lisp/ChangeLog	Fri Apr 16 04:24:00 2010 +0300
@@ -1,3 +1,14 @@
+2010-04-16  Juri Linkov  <juri@jurta.org>
+
+	* isearch.el (isearch-lookup-scroll-key): Check both
+	`isearch-scroll' and `scroll-command' properties.
+	(scroll-up, scroll-down): Remove `isearch-scroll' property.
+
+	* mwheel.el (mwheel-scroll): Remove `isearch-scroll' property.
+
+	* simple.el (scroll-up-command, scroll-down-command)
+	(scroll-up-line, scroll-down-line): Remove `isearch-scroll' property.
+
 2010-04-15  Juri Linkov  <juri@jurta.org>

 	* simple.el (scroll-up-command, scroll-down-command)
--- a/lisp/isearch.el	Fri Apr 16 10:08:29 2010 +0900
+++ b/lisp/isearch.el	Fri Apr 16 04:24:00 2010 +0300
@@ -1708,9 +1708,10 @@
 ;; attempts this, we scroll the text back again.
 ;;
 ;; We implement this feature with a property called `isearch-scroll'.
-;; If a command's symbol has the value t for this property it is a
-;; scrolling command.  The feature needs to be enabled by setting the
-;; customizable variable `isearch-allow-scroll' to a non-nil value.
+;; If a command's symbol has the value t for this property or for the
+;; `scroll-command' property, it is a scrolling command.  The feature
+;; needs to be enabled by setting the customizable variable
+;; `isearch-allow-scroll' to a non-nil value.
 ;;
 ;; The universal argument commands (e.g. C-u) in simple.el are marked
 ;; as scrolling commands, and isearch.el has been amended to allow
@@ -1727,12 +1728,11 @@
 (if (fboundp 'w32-handle-scroll-bar-event)
     (put 'w32-handle-scroll-bar-event 'isearch-scroll t))

-;; Commands which scroll the window:
+;; Commands which scroll the window (some scroll commands
+;; already have the `scroll-command' property on them):
 (put 'recenter 'isearch-scroll t)
 (put 'recenter-top-bottom 'isearch-scroll t)
 (put 'reposition-window 'isearch-scroll t)
-(put 'scroll-up 'isearch-scroll t)
-(put 'scroll-down 'isearch-scroll t)

 ;; Commands which act on the other window
 (put 'list-buffers 'isearch-scroll t)
@@ -1821,7 +1821,8 @@
   (let* ((overriding-terminal-local-map nil)
          (binding (key-binding key-seq)))
     (and binding (symbolp binding) (commandp binding)
-         (eq (get binding 'isearch-scroll) t)
+         (or (eq (get binding 'isearch-scroll) t)
+	     (eq (get binding 'scroll-command) t))
          binding)))

 (defalias 'isearch-other-control-char 'isearch-other-meta-char)
--- a/lisp/mwheel.el	Fri Apr 16 10:08:29 2010 +0900
+++ b/lisp/mwheel.el	Fri Apr 16 04:24:00 2010 +0300
@@ -247,7 +247,6 @@
 			  'mwheel-inhibit-click-timeout))))

 (put 'mwheel-scroll 'scroll-command t)
-(put 'mwheel-scroll 'isearch-scroll t)

 (defvar mwheel-installed-bindings nil)
--- a/lisp/simple.el	Fri Apr 16 10:08:29 2010 +0900
+++ b/lisp/simple.el	Fri Apr 16 04:24:00 2010 +0300
@@ -4793,7 +4793,6 @@
 	 (goto-char (point-max))))))))

 (put 'scroll-up-command 'scroll-command t)
-(put 'scroll-up-command 'isearch-scroll t)

 (defun scroll-down-command (&optional arg)
   "Scroll text of selected window down ARG lines; or near full screen if no ARG.
@@ -4826,7 +4825,6 @@
 	 (goto-char (point-min))))))))

 (put 'scroll-down-command 'scroll-command t)
-(put 'scroll-down-command 'isearch-scroll t)

 ;;; Scrolling commands which scroll a line instead of full screen.

@@ -4838,7 +4836,6 @@
   (scroll-up (or arg 1)))

 (put 'scroll-up-line 'scroll-command t)
-(put 'scroll-up-line 'isearch-scroll t)

 (defun scroll-down-line (&optional arg)
   "Scroll text of selected window down ARG lines; or one line if no ARG.
@@ -4848,7 +4845,6 @@
   (scroll-down (or arg 1)))

 (put 'scroll-down-line 'scroll-command t)
-(put 'scroll-down-line 'isearch-scroll t)


 (defun scroll-other-window-down (lines)