diff options
| author | Karoly Lorentey | 2004-12-23 16:43:51 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2004-12-23 16:43:51 +0000 |
| commit | 17d51b68fb4e7da4f18eff72c589b7ffc4f9c22c (patch) | |
| tree | f490c1ccdbd43077ea77f953bc59ca94c2fe810c /src/syntax.c | |
| parent | 4b89585ee70a1f64543a5851f07cf7e2d89c5c62 (diff) | |
| parent | 55f4edbcd246d8ea1715687a7aeeb3afe35c0345 (diff) | |
| download | emacs-17d51b68fb4e7da4f18eff72c589b7ffc4f9c22c.tar.gz emacs-17d51b68fb4e7da4f18eff72c589b7ffc4f9c22c.zip | |
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-726
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-727
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-728
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-729
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-730
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-731
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-732
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-733
Update from CVS: man/calc.texi: Fix some TeX definitions.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-734
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-735
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-736
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-737
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-738
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-739
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-740
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-741
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-742
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-743
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-744
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-745
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-746
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-75
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-76
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-77
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-277
Diffstat (limited to 'src/syntax.c')
| -rw-r--r-- | src/syntax.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/syntax.c b/src/syntax.c index 8bfa62b49fc..fa34c2433c1 100644 --- a/src/syntax.c +++ b/src/syntax.c | |||
| @@ -1295,6 +1295,7 @@ and the function returns nil. Field boundaries are not noticed if | |||
| 1295 | (arg) | 1295 | (arg) |
| 1296 | Lisp_Object arg; | 1296 | Lisp_Object arg; |
| 1297 | { | 1297 | { |
| 1298 | Lisp_Object tmp; | ||
| 1298 | int orig_val, val; | 1299 | int orig_val, val; |
| 1299 | 1300 | ||
| 1300 | if (NILP (arg)) | 1301 | if (NILP (arg)) |
| @@ -1307,8 +1308,9 @@ and the function returns nil. Field boundaries are not noticed if | |||
| 1307 | val = XINT (arg) > 0 ? ZV : BEGV; | 1308 | val = XINT (arg) > 0 ? ZV : BEGV; |
| 1308 | 1309 | ||
| 1309 | /* Avoid jumping out of an input field. */ | 1310 | /* Avoid jumping out of an input field. */ |
| 1310 | val = XFASTINT (Fconstrain_to_field (make_number (val), make_number (PT), | 1311 | tmp = Fconstrain_to_field (make_number (val), make_number (PT), |
| 1311 | Qt, Qnil, Qnil)); | 1312 | Qt, Qnil, Qnil); |
| 1313 | val = XFASTINT (tmp); | ||
| 1312 | 1314 | ||
| 1313 | SET_PT (val); | 1315 | SET_PT (val); |
| 1314 | return val == orig_val ? Qt : Qnil; | 1316 | return val == orig_val ? Qt : Qnil; |