aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman2002-07-11 17:36:07 +0000
committerRichard M. Stallman2002-07-11 17:36:07 +0000
commita67e162b88461f46b758f5a78bd2bb94478bf9c6 (patch)
treeb5469ad6eac78d8d07a658441e0369f1a8884854 /src
parent42cec4264ee00f0a7ce358bafe925f9b7b737df0 (diff)
downloademacs-a67e162b88461f46b758f5a78bd2bb94478bf9c6.tar.gz
emacs-a67e162b88461f46b758f5a78bd2bb94478bf9c6.zip
(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.
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 524bb42bab2..e594ca20c74 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3920,7 +3920,7 @@ back_to_previous_visible_line_start (it)
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 {
@@ -3980,7 +3980,7 @@ reseat_at_next_visible_line_start (it, on_newline_p)
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);
@@ -4873,7 +4873,7 @@ next_element_from_buffer (it)
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;
@@ -5656,6 +5656,9 @@ 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;
@@ -6216,8 +6219,8 @@ update_echo_area ()
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
6222static void 6225static void
6223ensure_echo_area_buffers () 6226ensure_echo_area_buffers ()
@@ -6448,6 +6451,7 @@ setup_echo_area_for_printing (multibyte_p)
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 }