aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-09-17 21:42:30 -0700
committerGlenn Morris2013-09-17 21:42:30 -0700
commit7e58af4b13a4fdd32cb052a08bc6a7121fd3a6a4 (patch)
treec68e40a6cac6241d4f3e321cf8854d1da0ec7a09
parent2f68e15795ebd53bfa776c2a7b3ee3dc49c774fc (diff)
downloademacs-7e58af4b13a4fdd32cb052a08bc6a7121fd3a6a4.tar.gz
emacs-7e58af4b13a4fdd32cb052a08bc6a7121fd3a6a4.zip
* follow.el (scroll-bar-toolkit-scroll, scroll-bar-drag)
(scroll-bar-scroll-up, scroll-bar-scroll-down, mwheel-scroll): Declare.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/follow.el10
2 files changed, 12 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a49549f9921..b39bf122642 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -19,6 +19,10 @@
19 * faces.el (x-display-list, x-open-connection, x-get-resource): 19 * faces.el (x-display-list, x-open-connection, x-get-resource):
20 Declare. 20 Declare.
21 21
22 * follow.el (scroll-bar-toolkit-scroll, scroll-bar-drag)
23 (scroll-bar-scroll-up, scroll-bar-scroll-down, mwheel-scroll):
24 Declare.
25
22 * frame.el (x-display-grayscale-p, x-display-name): Declare. 26 * frame.el (x-display-grayscale-p, x-display-name): Declare.
23 27
24 * simple.el (font-info): Declare. 28 * simple.el (font-info): Declare.
diff --git a/lisp/follow.el b/lisp/follow.el
index 2c9365b2ba6..32411914a19 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -1,6 +1,6 @@
1;;; follow.el --- synchronize windows showing the same buffer 1;;; follow.el --- synchronize windows showing the same buffer
2;; Copyright (C) 1995-1997, 1999, 2001-2013 Free Software Foundation, 2
3;; Inc. 3;; Copyright (C) 1995-1997, 1999, 2001-2013 Free Software Foundation, Inc.
4 4
5;; Author: Anders Lindgren <andersl@andersl.com> 5;; Author: Anders Lindgren <andersl@andersl.com>
6;; Maintainer: FSF (Anders' email bounces, Sep 2005) 6;; Maintainer: FSF (Anders' email bounces, Sep 2005)
@@ -1299,6 +1299,12 @@ non-first windows in Follow mode."
1299;; This handles the case where the user drags the scroll bar of a 1299;; This handles the case where the user drags the scroll bar of a
1300;; non-selected window whose buffer is in Follow mode. 1300;; non-selected window whose buffer is in Follow mode.
1301 1301
1302(declare-function scroll-bar-toolkit-scroll "scroll-bar" (event))
1303(declare-function scroll-bar-drag "scroll-bar" (event))
1304(declare-function scroll-bar-scroll-up "scroll-bar" (event))
1305(declare-function scroll-bar-scroll-down "scroll-bar" (event))
1306(declare-function mwheel-scroll "mwheel" (event))
1307
1302(defun follow-scroll-bar-toolkit-scroll (event) 1308(defun follow-scroll-bar-toolkit-scroll (event)
1303 (interactive "e") 1309 (interactive "e")
1304 (scroll-bar-toolkit-scroll event) 1310 (scroll-bar-toolkit-scroll event)