/* Indentation functions.
- Copyright (C) 1985,86,87,88,93,94,95,98,2000,01,02,03,2004
- Free Software Foundation, Inc.
+ Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1998, 2000, 2001,
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
#include "lisp.h"
Lisp_Object window;
{
Lisp_Object prop, position, overlay_limit, proplimit;
- Lisp_Object buffer;
+ Lisp_Object buffer, tmp;
int end, inv_p;
XSETFASTINT (position, pos);
/* No matter what. don't go past next overlay change. */
if (XFASTINT (overlay_limit) < XFASTINT (proplimit))
proplimit = overlay_limit;
- end = XFASTINT (Fnext_single_property_change (position, Qinvisible,
- buffer, proplimit));
+ tmp = Fnext_single_property_change (position, Qinvisible,
+ buffer, proplimit);
+ end = XFASTINT (tmp);
#if 0
/* Don't put the boundary in the middle of multibyte form if
there is no actual property change. */
Ignores finite width of frame, which means that this function may return
values greater than (frame-width).
Whether the line is visible (if `selective-display' is t) has no effect;
-however, ^M is treated as end of line when `selective-display' is t. */)
+however, ^M is treated as end of line when `selective-display' is t.
+Text that has an invisible property is considered as having width 0, unless
+`buffer-invisibility-spec' specifies that it is replaced by an ellipsis. */)
()
{
Lisp_Object temp;
else
{
int it_start;
+ int oselective;
+ int start_on_image_or_stretch_p;
SET_TEXT_POS (pt, PT, PT_BYTE);
start_display (&it, w, pt);
while the end position is really at some X > 0, the same X that
PT had. */
it_start = IT_CHARPOS (it);
+ start_on_image_or_stretch_p = (it.method == GET_FROM_IMAGE
+ || it.method == GET_FROM_STRETCH);
reseat_at_previous_visible_line_start (&it);
it.current_x = it.hpos = 0;
+ /* Temporarily disable selective display so we don't move too far */
+ oselective = it.selective;
+ it.selective = 0;
move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS);
+ it.selective = oselective;
/* Move back if we got too far. This may happen if
- truncate-lines is on and PT is beyond right margin. */
- if (IT_CHARPOS (it) > it_start && XINT (lines) > 0)
+ truncate-lines is on and PT is beyond right margin.
+ It may also happen if it_start is on an image or a stretch
+ glyph -- in that case, don't go back. */
+ if (IT_CHARPOS (it) > it_start && XINT (lines) > 0
+ && !start_on_image_or_stretch_p)
move_it_by_lines (&it, -1, 0);
it.vpos = 0;
- if (XINT (lines) != 0)
+ /* Do this even if LINES is 0, so that we move back
+ to the beginning of the current line as we ought. */
+ if (XINT (lines) >= 0 || IT_CHARPOS (it) > 0)
move_it_by_lines (&it, XINT (lines), 0);
SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it));