Mercurial > emacs
comparison src/xdisp.c @ 46302:4b3986c48905
(message_dolog): Do nothing if Vmemory_full is non-nil.
(back_to_previous_visible_line_start)
(reseat_at_next_visible_line_start, next_element_from_buffer):
Use `double', not `float', when calling indented_beyond_p.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Thu, 11 Jul 2002 17:36:07 +0000 |
parents | 3f111801efb4 |
children | 40db0673e6f0 |
comparison
equal
deleted
inserted
replaced
46301:c5cd82f47aa3 | 46302:4b3986c48905 |
---|---|
3918 | 3918 |
3919 /* If selective > 0, then lines indented more than that values | 3919 /* If selective > 0, then lines indented more than that values |
3920 are invisible. */ | 3920 are invisible. */ |
3921 if (it->selective > 0 | 3921 if (it->selective > 0 |
3922 && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it), | 3922 && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it), |
3923 (float) it->selective)) /* iftc */ | 3923 (double) it->selective)) /* iftc */ |
3924 visible_p = 0; | 3924 visible_p = 0; |
3925 else | 3925 else |
3926 { | 3926 { |
3927 Lisp_Object prop; | 3927 Lisp_Object prop; |
3928 | 3928 |
3978 /* Skip over lines that are invisible because they are indented | 3978 /* Skip over lines that are invisible because they are indented |
3979 more than the value of IT->selective. */ | 3979 more than the value of IT->selective. */ |
3980 if (it->selective > 0) | 3980 if (it->selective > 0) |
3981 while (IT_CHARPOS (*it) < ZV | 3981 while (IT_CHARPOS (*it) < ZV |
3982 && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it), | 3982 && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it), |
3983 (float) it->selective)) /* iftc */ | 3983 (double) it->selective)) /* iftc */ |
3984 { | 3984 { |
3985 xassert (FETCH_BYTE (IT_BYTEPOS (*it) - 1) == '\n'); | 3985 xassert (FETCH_BYTE (IT_BYTEPOS (*it) - 1) == '\n'); |
3986 newline_found_p = forward_to_next_line_start (it, &skipped_p); | 3986 newline_found_p = forward_to_next_line_start (it, &skipped_p); |
3987 } | 3987 } |
3988 | 3988 |
4871 than that number of columns. */ | 4871 than that number of columns. */ |
4872 if (it->selective > 0 | 4872 if (it->selective > 0 |
4873 && IT_CHARPOS (*it) + 1 < ZV | 4873 && IT_CHARPOS (*it) + 1 < ZV |
4874 && indented_beyond_p (IT_CHARPOS (*it) + 1, | 4874 && indented_beyond_p (IT_CHARPOS (*it) + 1, |
4875 IT_BYTEPOS (*it) + 1, | 4875 IT_BYTEPOS (*it) + 1, |
4876 (float) it->selective)) /* iftc */ | 4876 (double) it->selective)) /* iftc */ |
4877 { | 4877 { |
4878 success_p = next_element_from_ellipsis (it); | 4878 success_p = next_element_from_ellipsis (it); |
4879 it->dpvec_char_len = -1; | 4879 it->dpvec_char_len = -1; |
4880 } | 4880 } |
4881 } | 4881 } |
5654 void | 5654 void |
5655 message_dolog (m, nbytes, nlflag, multibyte) | 5655 message_dolog (m, nbytes, nlflag, multibyte) |
5656 char *m; | 5656 char *m; |
5657 int nbytes, nlflag, multibyte; | 5657 int nbytes, nlflag, multibyte; |
5658 { | 5658 { |
5659 if (!NILP (Vmemory_full)) | |
5660 return; | |
5661 | |
5659 if (!NILP (Vmessage_log_max)) | 5662 if (!NILP (Vmessage_log_max)) |
5660 { | 5663 { |
5661 struct buffer *oldbuf; | 5664 struct buffer *oldbuf; |
5662 Lisp_Object oldpoint, oldbegv, oldzv; | 5665 Lisp_Object oldpoint, oldbegv, oldzv; |
5663 int old_windows_or_buffers_changed = windows_or_buffers_changed; | 5666 int old_windows_or_buffers_changed = windows_or_buffers_changed; |
6214 !NILP (current_buffer->enable_multibyte_characters)); | 6217 !NILP (current_buffer->enable_multibyte_characters)); |
6215 } | 6218 } |
6216 } | 6219 } |
6217 | 6220 |
6218 | 6221 |
6219 /* Make sure echo area buffers in echo_buffers[] are life. If they | 6222 /* Make sure echo area buffers in `echo_buffers' are live. |
6220 aren't, make new ones. */ | 6223 If they aren't, make new ones. */ |
6221 | 6224 |
6222 static void | 6225 static void |
6223 ensure_echo_area_buffers () | 6226 ensure_echo_area_buffers () |
6224 { | 6227 { |
6225 int i; | 6228 int i; |
6446 | 6449 |
6447 if (Z > BEG) | 6450 if (Z > BEG) |
6448 { | 6451 { |
6449 int count = SPECPDL_INDEX (); | 6452 int count = SPECPDL_INDEX (); |
6450 specbind (Qinhibit_read_only, Qt); | 6453 specbind (Qinhibit_read_only, Qt); |
6454 /* Note that undo recording is always disabled. */ | |
6451 del_range (BEG, Z); | 6455 del_range (BEG, Z); |
6452 unbind_to (count, Qnil); | 6456 unbind_to (count, Qnil); |
6453 } | 6457 } |
6454 TEMP_SET_PT_BOTH (BEG, BEG_BYTE); | 6458 TEMP_SET_PT_BOTH (BEG, BEG_BYTE); |
6455 | 6459 |