Mercurial > emacs
comparison src/indent.c @ 83237:4ee39d9428b0
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
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Thu, 23 Dec 2004 16:43:51 +0000 |
parents | 549734260e34 e3754638899a |
children | 3dcba0bc766b |
comparison
equal
deleted
inserted
replaced
83236:6b379caca6fa | 83237:4ee39d9428b0 |
---|---|
2092 truncate-lines is on and PT is beyond right margin. */ | 2092 truncate-lines is on and PT is beyond right margin. */ |
2093 if (IT_CHARPOS (it) > it_start && XINT (lines) > 0) | 2093 if (IT_CHARPOS (it) > it_start && XINT (lines) > 0) |
2094 move_it_by_lines (&it, -1, 0); | 2094 move_it_by_lines (&it, -1, 0); |
2095 | 2095 |
2096 it.vpos = 0; | 2096 it.vpos = 0; |
2097 if (XINT (lines) != 0) | 2097 /* Do this even if LINES is 0, so that we move back |
2098 move_it_by_lines (&it, XINT (lines), 0); | 2098 to the beginning of the current line as we ought. */ |
2099 move_it_by_lines (&it, XINT (lines), 0); | |
2099 | 2100 |
2100 SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it)); | 2101 SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it)); |
2101 } | 2102 } |
2102 | 2103 |
2103 if (BUFFERP (old_buffer)) | 2104 if (BUFFERP (old_buffer)) |