[Emacs-diffs] /srv/bzr/emacs/trunk r99832: Scrolling commands which scroll a line instead of full screen..

[Juri Linkov]

------------------------------------------------------------
revno: 99832
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Tue 2010-04-06 02:44:24 +0300
message:
  Scrolling commands which scroll a line instead of full screen..
  http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg01452.html
  
  * simple.el (scroll-up-line, scroll-down-line): New commands.
  Put property isearch-scroll=t on them.
  
  * emulation/ws-mode.el (scroll-down-line, scroll-up-line):
  Remove commands.
modified:
  etc/NEWS
  lisp/ChangeLog
  lisp/emulation/ws-mode.el
  lisp/simple.el

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2010-04-05 23:38:53 +0000
+++ b/etc/NEWS  2010-04-05 23:44:24 +0000
@@ -69,6 +69,9 @@
 (bound to [next] and [prior]) does not signal errors at top/bottom
 of buffer at first key-press (instead moves to top/bottom of buffer).
 
+** New scrolling commands `scroll-up-line' and `scroll-down-line'
+scroll a line instead of full screen.
+
 
 * Editing Changes in Emacs 24.1
 

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-04-05 23:38:53 +0000
+++ b/lisp/ChangeLog    2010-04-05 23:44:24 +0000
@@ -1,5 +1,16 @@
 2010-04-05  Juri Linkov  <address@hidden>
 
+       Scrolling commands which scroll a line instead of full screen.
+       http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg01452.html
+
+       * simple.el (scroll-up-line, scroll-down-line): New commands.
+       Put property isearch-scroll=t on them.
+
+       * emulation/ws-mode.el (scroll-down-line, scroll-up-line):
+       Remove commands.
+
+2010-04-05  Juri Linkov  <address@hidden>
+
        Scrolling commands which does not signal errors at top/bottom.
        http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg01452.html
 

=== modified file 'lisp/emulation/ws-mode.el'
--- a/lisp/emulation/ws-mode.el 2010-01-13 08:35:10 +0000
+++ b/lisp/emulation/ws-mode.el 2010-04-05 23:44:24 +0000
@@ -339,16 +339,6 @@
        (+ left-margin
          (/ (- fill-column left-margin line-length) 2))))))
 
-(defun scroll-down-line ()
-  "Scroll one line down."
-  (interactive)
-  (scroll-down 1))
-
-(defun scroll-up-line ()
-  "Scroll one line up."
-  (interactive)
-  (scroll-up 1))
-
 ;;;;;;;;;;;
 ;; wordstar special variables:
 

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2010-04-05 23:38:53 +0000
+++ b/lisp/simple.el    2010-04-05 23:44:24 +0000
@@ -4800,6 +4800,26 @@
 
 (put 'scroll-down-command 'isearch-scroll t)
 
+;;; Scrolling commands which scroll a line instead of full screen.
+
+(defun scroll-up-line (&optional arg)
+  "Scroll text of selected window upward ARG lines; or one line if no ARG.
+If ARG is omitted or nil, scroll upward by one line.
+This is different from `scroll-up-command' that scrolls a full screen."
+  (interactive "p")
+  (scroll-up (or arg 1)))
+
+(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.
+If ARG is omitted or nil, scroll down by one line.
+This is different from `scroll-down-command' that scrolls a full screen."
+  (interactive "p")
+  (scroll-down (or arg 1)))
+
+(put 'scroll-down-line 'isearch-scroll t)
+
 
 (defun scroll-other-window-down (lines)
   "Scroll the \"other window\" down.