diff options
| author | Ken Raeburn | 2001-12-27 05:49:33 +0000 |
|---|---|---|
| committer | Ken Raeburn | 2001-12-27 05:49:33 +0000 |
| commit | 1ab964d755c710532512201ccfe67636c5fd527f (patch) | |
| tree | 89076628111f6154dff561a1a6659c0d4c100254 /src | |
| parent | 5274126bde40fd45a8c2ddae17fd0a2668880837 (diff) | |
| download | emacs-1ab964d755c710532512201ccfe67636c5fd527f.tar.gz emacs-1ab964d755c710532512201ccfe67636c5fd527f.zip | |
* window.c (enlarge_window): In new preserve_before code, convert CURBEG from
lisp object to integer before doing arithmetic.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/window.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index cba789f9aec..03fc611590f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2001-12-27 Ken Raeburn <raeburn@gnu.org> | ||
| 2 | |||
| 3 | * window.c (enlarge_window): In new preserve_before code, convert | ||
| 4 | CURBEG from lisp object to integer before doing arithmetic. | ||
| 5 | |||
| 1 | 2001-12-27 Richard M. Stallman <rms@gnu.org> | 6 | 2001-12-27 Richard M. Stallman <rms@gnu.org> |
| 2 | 7 | ||
| 3 | * bytecode.c (Fbyte_code): Undo previous change. | 8 | * bytecode.c (Fbyte_code): Undo previous change. |
diff --git a/src/window.c b/src/window.c index 35694084a9b..0e5af1f0790 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -3394,7 +3394,7 @@ enlarge_window (window, delta, widthflag, preserve_before) | |||
| 3394 | { | 3394 | { |
| 3395 | maxdelta = (*sizefun) (parent) - XINT (*sizep); | 3395 | maxdelta = (*sizefun) (parent) - XINT (*sizep); |
| 3396 | /* Subtract size of siblings before, since we can't take that. */ | 3396 | /* Subtract size of siblings before, since we can't take that. */ |
| 3397 | maxdelta -= CURBEG (window) - CURBEG (parent); | 3397 | maxdelta -= XINT (CURBEG (window)) - XINT (CURBEG (parent)); |
| 3398 | } | 3398 | } |
| 3399 | else | 3399 | else |
| 3400 | maxdelta = (!NILP (p->next) ? ((*sizefun) (p->next) | 3400 | maxdelta = (!NILP (p->next) ? ((*sizefun) (p->next) |