diff options
| author | Kim F. Storm | 2005-07-07 09:33:29 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2005-07-07 09:33:29 +0000 |
| commit | ae12ecd75672a2d772ec4a85a2a01dd7191793e5 (patch) | |
| tree | 5bcac65b342bae4ef8f541c94cbef7f8db5d62ef | |
| parent | a96b333ce46fcf12f0b01f0bf00e7842e727ec6c (diff) | |
| download | emacs-ae12ecd75672a2d772ec4a85a2a01dd7191793e5.tar.gz emacs-ae12ecd75672a2d772ec4a85a2a01dd7191793e5.zip | |
(Frecenter): Fix last change (set iarg before use).
| -rw-r--r-- | src/window.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/window.c b/src/window.c index 74ef819c0e1..95898793d95 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -1472,7 +1472,7 @@ delete_window (window) | |||
| 1472 | 1472 | ||
| 1473 | /* Check if we have a v/hchild with a v/hchild. In that case remove | 1473 | /* Check if we have a v/hchild with a v/hchild. In that case remove |
| 1474 | one of them. */ | 1474 | one of them. */ |
| 1475 | 1475 | ||
| 1476 | if (! NILP (par->vchild) && ! NILP (XWINDOW (par->vchild)->vchild)) | 1476 | if (! NILP (par->vchild) && ! NILP (XWINDOW (par->vchild)->vchild)) |
| 1477 | { | 1477 | { |
| 1478 | p = XWINDOW (par->vchild); | 1478 | p = XWINDOW (par->vchild); |
| @@ -5357,6 +5357,7 @@ and redisplay normally--don't erase and redraw the frame. */) | |||
| 5357 | { | 5357 | { |
| 5358 | arg = Fprefix_numeric_value (arg); | 5358 | arg = Fprefix_numeric_value (arg); |
| 5359 | CHECK_NUMBER (arg); | 5359 | CHECK_NUMBER (arg); |
| 5360 | iarg = XINT (arg); | ||
| 5360 | } | 5361 | } |
| 5361 | 5362 | ||
| 5362 | set_buffer_internal (buf); | 5363 | set_buffer_internal (buf); |
| @@ -5391,7 +5392,6 @@ and redisplay normally--don't erase and redraw the frame. */) | |||
| 5391 | int extra_line_spacing; | 5392 | int extra_line_spacing; |
| 5392 | int h = window_box_height (w); | 5393 | int h = window_box_height (w); |
| 5393 | 5394 | ||
| 5394 | iarg = XINT (arg); | ||
| 5395 | iarg = - max (-iarg, this_scroll_margin); | 5395 | iarg = - max (-iarg, this_scroll_margin); |
| 5396 | 5396 | ||
| 5397 | SET_TEXT_POS (pt, PT, PT_BYTE); | 5397 | SET_TEXT_POS (pt, PT, PT_BYTE); |