diff options
| author | K. Handa | 2016-06-01 08:07:18 +0900 |
|---|---|---|
| committer | K. Handa | 2016-06-01 08:07:18 +0900 |
| commit | 4efef3db2fb1c3a20b83a67948e614d9b0c258dd (patch) | |
| tree | c0c08fc308869f7ba3d988594e4a51b69a70325b /src/window.c | |
| parent | 694d5e5b56a9d55023ffc292188bd88f6f6cbca6 (diff) | |
| parent | 01030eed9395f5004e7d0721394697d1ca90cc2f (diff) | |
| download | emacs-4efef3db2fb1c3a20b83a67948e614d9b0c258dd.tar.gz emacs-4efef3db2fb1c3a20b83a67948e614d9b0c258dd.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/window.c b/src/window.c index cf7fa44ae41..99a0709d627 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -5693,7 +5693,7 @@ and redisplay normally--don't erase and redraw the frame. */) | |||
| 5693 | struct buffer *buf = XBUFFER (w->contents); | 5693 | struct buffer *buf = XBUFFER (w->contents); |
| 5694 | bool center_p = false; | 5694 | bool center_p = false; |
| 5695 | ptrdiff_t charpos, bytepos; | 5695 | ptrdiff_t charpos, bytepos; |
| 5696 | EMACS_INT iarg IF_LINT (= 0); | 5696 | EMACS_INT iarg; |
| 5697 | int this_scroll_margin; | 5697 | int this_scroll_margin; |
| 5698 | 5698 | ||
| 5699 | if (buf != current_buffer) | 5699 | if (buf != current_buffer) |