aboutsummaryrefslogtreecommitdiffstats
path: root/src/scroll.c
diff options
context:
space:
mode:
authorKenichi Handa2012-09-16 20:47:45 +0900
committerKenichi Handa2012-09-16 20:47:45 +0900
commitba13e6168a07a085c0ca8e67c91640b84ee0c1fd (patch)
treea63038205a6803ba06f5e17eda974c3ab23e57fb /src/scroll.c
parentdcbd9236f7be9da4e658fd559dfbd7454f4b6018 (diff)
parenta8c729af93b08531e5e3f3fff6f16a55c8baac3f (diff)
downloademacs-ba13e6168a07a085c0ca8e67c91640b84ee0c1fd.tar.gz
emacs-ba13e6168a07a085c0ca8e67c91640b84ee0c1fd.zip
merge trunk
Diffstat (limited to 'src/scroll.c')
-rw-r--r--src/scroll.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/scroll.c b/src/scroll.c
index 79dd464b29e..71ce43b2e48 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -21,7 +21,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
21 21
22#include <config.h> 22#include <config.h>
23#include <stdio.h> 23#include <stdio.h>
24#include <setjmp.h> 24
25#include "lisp.h" 25#include "lisp.h"
26#include "termchar.h" 26#include "termchar.h"
27#include "dispextern.h" 27#include "dispextern.h"