diff options
| author | Tom Tromey | 2011-01-19 08:06:24 -0700 |
|---|---|---|
| committer | Tom Tromey | 2011-01-19 08:06:24 -0700 |
| commit | ef79d2fac2a4d8e71538b4dc67e771f2c0a178a0 (patch) | |
| tree | 52999ee3c7400cc64db6206d1a5a2a7ed907095b /src | |
| parent | 5dd4f3f7c7057b423e2d73c691761d52e5fd695a (diff) | |
| download | emacs-ef79d2fac2a4d8e71538b4dc67e771f2c0a178a0.tar.gz emacs-ef79d2fac2a4d8e71538b4dc67e771f2c0a178a0.zip | |
* window.c: Fix error introduced by previous patch.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/window.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 02887713397..221ad694219 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-01-19 Tom Tromey <tromey@redhat.com> | ||
| 2 | |||
| 3 | * window.c: Fix error introduced by previous patch. | ||
| 4 | |||
| 1 | 2011-01-18 Tom Tromey <tromey@parfait> | 5 | 2011-01-18 Tom Tromey <tromey@parfait> |
| 2 | 6 | ||
| 3 | * globals.h: New file. | 7 | * globals.h: New file. |
diff --git a/src/window.c b/src/window.c index 1dd824eeb6f..22e3f3d8818 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -151,7 +151,7 @@ static int window_scroll_preserve_vpos; | |||
| 151 | #if 0 /* This isn't used anywhere. */ | 151 | #if 0 /* This isn't used anywhere. */ |
| 152 | /* Nonzero means we can split a frame even if it is "unsplittable". */ | 152 | /* Nonzero means we can split a frame even if it is "unsplittable". */ |
| 153 | static int inhibit_frame_unsplittable; | 153 | static int inhibit_frame_unsplittable; |
| 154 | #endif extern Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions; | 154 | #endif |
| 155 | 155 | ||
| 156 | 156 | ||
| 157 | DEFUN ("windowp", Fwindowp, Swindowp, 1, 1, 0, | 157 | DEFUN ("windowp", Fwindowp, Swindowp, 1, 1, 0, |