Mercurial > emacs
comparison src/indent.c @ 61863:2fe5da3b3da2
(Fvertical_motion): Undo previous change.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Tue, 26 Apr 2005 18:24:52 +0000 |
parents | 2636b86a665d |
children | a8fa7c632ee4 effe22690419 |
comparison
equal
deleted
inserted
replaced
61862:30109b37b466 | 61863:2fe5da3b3da2 |
---|---|
62 | 62 |
63 /* Cache of beginning of line found by the last call of | 63 /* Cache of beginning of line found by the last call of |
64 current_column. */ | 64 current_column. */ |
65 | 65 |
66 int current_column_bol_cache; | 66 int current_column_bol_cache; |
67 | |
68 extern Lisp_Object Qfontification_functions; | |
69 | 67 |
70 /* Get the display table to use for the current buffer. */ | 68 /* Get the display table to use for the current buffer. */ |
71 | 69 |
72 struct Lisp_Char_Table * | 70 struct Lisp_Char_Table * |
73 buffer_display_table () | 71 buffer_display_table () |
2047 struct it it; | 2045 struct it it; |
2048 struct text_pos pt; | 2046 struct text_pos pt; |
2049 struct window *w; | 2047 struct window *w; |
2050 Lisp_Object old_buffer; | 2048 Lisp_Object old_buffer; |
2051 struct gcpro gcpro1; | 2049 struct gcpro gcpro1; |
2052 int count = SPECPDL_INDEX (); | |
2053 | 2050 |
2054 CHECK_NUMBER (lines); | 2051 CHECK_NUMBER (lines); |
2055 if (! NILP (window)) | 2052 if (! NILP (window)) |
2056 CHECK_WINDOW (window); | 2053 CHECK_WINDOW (window); |
2057 else | 2054 else |
2064 { | 2061 { |
2065 /* Set the window's buffer temporarily to the current buffer. */ | 2062 /* Set the window's buffer temporarily to the current buffer. */ |
2066 old_buffer = w->buffer; | 2063 old_buffer = w->buffer; |
2067 XSETBUFFER (w->buffer, current_buffer); | 2064 XSETBUFFER (w->buffer, current_buffer); |
2068 } | 2065 } |
2069 | |
2070 /* Don't fontify text that we just move across. */ | |
2071 specbind (Qfontification_functions, Qnil); | |
2072 | 2066 |
2073 if (noninteractive) | 2067 if (noninteractive) |
2074 { | 2068 { |
2075 struct position pos; | 2069 struct position pos; |
2076 pos = *vmotion (PT, XINT (lines), w); | 2070 pos = *vmotion (PT, XINT (lines), w); |
2113 } | 2107 } |
2114 | 2108 |
2115 if (BUFFERP (old_buffer)) | 2109 if (BUFFERP (old_buffer)) |
2116 w->buffer = old_buffer; | 2110 w->buffer = old_buffer; |
2117 | 2111 |
2118 unbind_to (count, Qnil); | |
2119 RETURN_UNGCPRO (make_number (it.vpos)); | 2112 RETURN_UNGCPRO (make_number (it.vpos)); |
2120 } | 2113 } |
2121 | 2114 |
2122 | 2115 |
2123 | 2116 |