summaryrefslogtreecommitdiff
path: root/lisp/ediff-util.el
diff options
context:
space:
mode:
authorGerd Moellmann <gerd@gnu.org>2001-03-01 14:52:03 +0000
committerGerd Moellmann <gerd@gnu.org>2001-03-01 14:52:03 +0000
commitb4c8a465f6f3b0ff75c58c44935e86c9cca3e9d1 (patch)
tree2a79354b9e16edb4e2d655f0c48a63c3f253293e /lisp/ediff-util.el
parentf9aff8bfaee5e1a97dd6cd0f66ffdb31530ea906 (diff)
downloademacs-b4c8a465f6f3b0ff75c58c44935e86c9cca3e9d1.tar.gz
(ediff-scroll-horizontally): Arrange for
scroll-left and scroll-right being called interactively so that they set the window's min_hscroll.
Diffstat (limited to 'lisp/ediff-util.el')
-rw-r--r--lisp/ediff-util.el14
1 files changed, 11 insertions, 3 deletions
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index 1e49926e36e..dff95ce4cb8 100644
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -1,6 +1,6 @@
;;; ediff-util.el --- the core commands and utilities of ediff
-;; Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996, 1997, 2001 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.sunysb.edu>
@@ -1516,9 +1516,17 @@ the width of the A/B/C windows."
(error ediff-KILLED-VITAL-BUFFER))
(ediff-operate-on-windows
+ ;; Arrange for scroll-left and scroll-right being called
+ ;; interactively so that they set the window's min_hscroll.
+ ;; Otherwise, automatic hscrolling will undo the effect of
+ ;; hscrolling.
(if (= last-command-char ?<)
- 'scroll-left
- 'scroll-right)
+ (lambda (arg)
+ (let ((prefix-arg arg))
+ (call-interactively 'scroll-left)))
+ (lambda (arg)
+ (let ((prefix-arg arg))
+ (call-interactively 'scroll-right))))
;; calculate argument to scroll-left/right
;; if there is an explicit argument
(if (and arg (not (equal arg '-)))