diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2019-04-27 18:33:39 +0900 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2019-04-27 18:33:39 +0900 |
| commit | 886bedb36c7b959b7e6fc8ce8e0c04e144b0ae28 (patch) | |
| tree | b5770d9fc10a704ad8aeb3474c6940121252c770 /src/indent.c | |
| parent | 015a6e1df2772bd43680df5cbeaffccf98a881da (diff) | |
| parent | 8dc00b2f1e6523c634df3e24379afbe712a32b27 (diff) | |
| download | emacs-886bedb36c7b959b7e6fc8ce8e0c04e144b0ae28.tar.gz emacs-886bedb36c7b959b7e6fc8ce8e0c04e144b0ae28.tar.bz2 emacs-886bedb36c7b959b7e6fc8ce8e0c04e144b0ae28.zip | |
Merge branch 'master' into harfbuzz
Diffstat (limited to 'src/indent.c')
| -rw-r--r-- | src/indent.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/src/indent.c b/src/indent.c index e0d35f87652..a022ae9fa32 100644 --- a/src/indent.c +++ b/src/indent.c @@ -1,5 +1,5 @@ /* Indentation functions. - Copyright (C) 1985-1988, 1993-1995, 1998, 2000-2018 Free Software + Copyright (C) 1985-1988, 1993-1995, 1998, 2000-2019 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -49,7 +49,7 @@ ptrdiff_t last_known_column_point; /* Value of MODIFF when current_column was called. */ -static EMACS_INT last_known_column_modified; +static modiff_count last_known_column_modified; static ptrdiff_t current_column_1 (void); static ptrdiff_t position_indentation (ptrdiff_t); @@ -1756,14 +1756,14 @@ visible section of the buffer, and pass LINE and COL as TOPOS. */) CHECK_FIXNUM_COERCE_MARKER (from); CHECK_CONS (frompos); - CHECK_FIXNUM_CAR (frompos); - CHECK_FIXNUM_CDR (frompos); + CHECK_FIXNUM (XCAR (frompos)); + CHECK_FIXNUM (XCDR (frompos)); CHECK_FIXNUM_COERCE_MARKER (to); if (!NILP (topos)) { CHECK_CONS (topos); - CHECK_FIXNUM_CAR (topos); - CHECK_FIXNUM_CDR (topos); + CHECK_FIXNUM (XCAR (topos)); + CHECK_FIXNUM (XCDR (topos)); } if (!NILP (width)) CHECK_FIXNUM (width); @@ -1771,8 +1771,8 @@ visible section of the buffer, and pass LINE and COL as TOPOS. */) if (!NILP (offsets)) { CHECK_CONS (offsets); - CHECK_FIXNUM_CAR (offsets); - CHECK_FIXNUM_CDR (offsets); + CHECK_FIXNUM (XCAR (offsets)); + CHECK_FIXNUM (XCDR (offsets)); if (! (0 <= XFIXNUM (XCAR (offsets)) && XFIXNUM (XCAR (offsets)) <= PTRDIFF_MAX && 0 <= XFIXNUM (XCDR (offsets)) && XFIXNUM (XCDR (offsets)) <= INT_MAX)) args_out_of_range (XCAR (offsets), XCDR (offsets)); @@ -1968,8 +1968,11 @@ line_number_display_width (struct window *w, int *width, int *pixel_width) outside the accessible region, in which case we widen the buffer temporarily. It could even be beyond the buffer's end (Org mode's display of source code snippets is known to cause - that), in which case we just punt and start from point instead. */ - if (startpos.charpos > Z) + that) or belong to the wrong buffer, in which cases we just + punt and start from point instead. */ + if (startpos.charpos > Z + || !(BUFFERP (w->contents) + && XBUFFER (w->contents) == XMARKER (w->start)->buffer)) SET_TEXT_POS (startpos, PT, PT_BYTE); if (startpos.charpos < BEGV || startpos.charpos > ZV) { @@ -2286,7 +2289,7 @@ whether or not it is currently displayed in some window. */) it.current_y = 0; /* Do this even if LINES is 0, so that we move back to the beginning of the current line as we ought. */ - if ((nlines < 0 && IT_CHARPOS (it) > 0) + if ((nlines < 0 && IT_CHARPOS (it) > BEGV) || (nlines == 0 && !(start_x_given && start_x <= to_x))) move_it_by_lines (&it, max (PTRDIFF_MIN, nlines)); } @@ -2338,7 +2341,7 @@ whether or not it is currently displayed in some window. */) and then reposition point at the requested X coordinate; if we don't, the cursor will be placed just after the string, which might not be the requested column. */ - if (nlines > 0 && it.area == TEXT_AREA) + if (nlines >= 0 && it.area == TEXT_AREA) { while (it.method == GET_FROM_STRING && !it.string_from_display_prop_p |