[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog window.el
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog window.el |
Date: |
Mon, 23 Nov 2009 05:37:38 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 09/11/23 05:37:37
Modified files:
lisp : ChangeLog window.el
Log message:
(move-to-window-line-last-op): Remove.
(move-to-window-line-top-bottom): Reuse recenter-last-op instead.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16705&r2=1.16706
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/window.el?cvsroot=emacs&r1=1.187&r2=1.188
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16705
retrieving revision 1.16706
diff -u -b -r1.16705 -r1.16706
--- ChangeLog 23 Nov 2009 05:32:26 -0000 1.16705
+++ ChangeLog 23 Nov 2009 05:37:34 -0000 1.16706
@@ -1,5 +1,11 @@
+2009-11-23 Stefan Monnier <address@hidden>
+
+ * window.el (move-to-window-line-last-op): Remove.
+ (move-to-window-line-top-bottom): Reuse recenter-last-op instead.
+
2009-11-23 Deniz Dogan <address@hidden> (tiny change)
+ Make M-r mirror the new cycling behavior of C-l.
* window.el (move-to-window-line-last-op): New var.
(move-to-window-line-top-bottom): New command.
(global-map): Bind M-r move-to-window-line-top-bottom.
Index: window.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/window.el,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -b -r1.187 -r1.188
--- window.el 23 Nov 2009 05:32:31 -0000 1.187
+++ window.el 23 Nov 2009 05:37:37 -0000 1.188
@@ -1653,34 +1653,30 @@
(define-key global-map [?\C-l] 'recenter-top-bottom)
-(defvar move-to-window-line-last-op nil
- "Indicates the last move-to-window-line operation performed.
-Possible values: `top', `middle', `bottom'.")
-
(defun move-to-window-line-top-bottom (&optional arg)
"Position point relative to window.
-With an argument, acts like `move-to-window-line'.
+With a prefix argument ARG, acts like `move-to-window-line'.
With no argument, positions point at center of window.
-Successive calls positions point at the top, the bottom and again
+Successive calls position point at the top, the bottom and again
at the center of the window."
(interactive "P")
(cond
(arg (move-to-window-line arg)) ; Always respect ARG.
((or (not (eq this-command last-command))
- (eq move-to-window-line-last-op 'bottom))
- (setq move-to-window-line-last-op 'middle)
+ (eq recenter-last-op 'bottom))
+ (setq recenter-last-op 'middle)
(call-interactively 'move-to-window-line))
(t
(let ((this-scroll-margin
(min (max 0 scroll-margin)
(truncate (/ (window-body-height) 4.0)))))
- (cond ((eq move-to-window-line-last-op 'middle)
- (setq move-to-window-line-last-op 'top)
+ (cond ((eq recenter-last-op 'middle)
+ (setq recenter-last-op 'top)
(move-to-window-line this-scroll-margin))
- ((eq move-to-window-line-last-op 'top)
- (setq move-to-window-line-last-op 'bottom)
+ ((eq recenter-last-op 'top)
+ (setq recenter-last-op 'bottom)
(move-to-window-line (- -1 this-scroll-margin))))))))
(define-key global-map [?\M-r] 'move-to-window-line-top-bottom)
- [Emacs-diffs] emacs/lisp ChangeLog window.el,
Stefan Monnier <=