diff options
| author | Ken Raeburn | 2006-02-05 12:15:02 +0000 |
|---|---|---|
| committer | Ken Raeburn | 2006-02-05 12:15:02 +0000 |
| commit | d63b401895577d448ecee8c31ac20b6f693de14d (patch) | |
| tree | 945934b8b95fd10b92bd99020ab1f2a2c0dfc5ed /src | |
| parent | 99155348ea17091cb91a99bf8e99851a1c6204b9 (diff) | |
| download | emacs-d63b401895577d448ecee8c31ac20b6f693de14d.tar.gz emacs-d63b401895577d448ecee8c31ac20b6f693de14d.zip | |
(Fconstrain_to_field): Fix int/Lisp_Object mixup.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/editfns.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 66061c74810..bffe8caf089 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2006-02-05 Ken Raeburn <raeburn@raeburn.org> | ||
| 2 | |||
| 3 | * editfns.c (Fconstrain_to_field): Fix int/Lisp_Object mixup. | ||
| 4 | |||
| 1 | 2006-02-03 Kim F. Storm <storm@cua.dk> | 5 | 2006-02-03 Kim F. Storm <storm@cua.dk> |
| 2 | 6 | ||
| 3 | * xdisp.c: Cache last merged escape glyph face. | 7 | * xdisp.c: Cache last merged escape glyph face. |
diff --git a/src/editfns.c b/src/editfns.c index 9be9232a9c7..5bf4eb738ae 100644 --- a/src/editfns.c +++ b/src/editfns.c | |||
| @@ -719,7 +719,8 @@ Field boundaries are not noticed if `inhibit-field-text-motion' is non-nil. */) | |||
| 719 | { | 719 | { |
| 720 | /* If non-zero, then the original point, before re-positioning. */ | 720 | /* If non-zero, then the original point, before re-positioning. */ |
| 721 | int orig_point = 0; | 721 | int orig_point = 0; |
| 722 | int fwd, prev_old, prev_new; | 722 | int fwd; |
| 723 | Lisp_Object prev_old, prev_new; | ||
| 723 | 724 | ||
| 724 | if (NILP (new_pos)) | 725 | if (NILP (new_pos)) |
| 725 | /* Use the current point, and afterwards, set it. */ | 726 | /* Use the current point, and afterwards, set it. */ |