comparison src/xdisp.c @ 83219:e86fc76a45e4

Merged in changes from CVS trunk. Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-611 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-612 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-613 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-614 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-615 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-46 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-47 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-48 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-49 Add {arch}/=commit-merge-make-log * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-50 {arch}/=commit-merge-make-log: Don't die if there are no ChangeLog changes git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-259
author Karoly Lorentey <lorentey@elte.hu>
date Thu, 14 Oct 2004 14:42:03 +0000
parents 4f2f1522636c 232db85e3b89
children fe1db7935e1a
comparison
equal deleted inserted replaced
83218:47f53c5c9620 83219:e86fc76a45e4
4891 || (it->multibyte_p 4891 || (it->multibyte_p
4892 ? ((it->c >= 127 4892 ? ((it->c >= 127
4893 && it->len == 1) 4893 && it->len == 1)
4894 || !CHAR_PRINTABLE_P (it->c)) 4894 || !CHAR_PRINTABLE_P (it->c))
4895 : (it->c >= 127 4895 : (it->c >= 127
4896 && it->c == unibyte_char_to_multibyte (it->c)))) 4896 && (!unibyte_display_via_language_environment
4897 || it->c == unibyte_char_to_multibyte (it->c)))))
4897 { 4898 {
4898 /* IT->c is a control character which must be displayed 4899 /* IT->c is a control character which must be displayed
4899 either as '\003' or as `^C' where the '\\' and '^' 4900 either as '\003' or as `^C' where the '\\' and '^'
4900 can be defined in the display table. Fill 4901 can be defined in the display table. Fill
4901 IT->ctl_chars with glyphs for what we have to 4902 IT->ctl_chars with glyphs for what we have to
10400 redisplay_internal (1); 10401 redisplay_internal (1);
10401 display_last_displayed_message_p = 0; 10402 display_last_displayed_message_p = 0;
10402 } 10403 }
10403 else 10404 else
10404 redisplay_internal (1); 10405 redisplay_internal (1);
10406
10407 if (rif != NULL && rif->flush_display_optional)
10408 rif->flush_display_optional (NULL);
10405 } 10409 }
10406 10410
10407 10411
10408 /* Function registered with record_unwind_protect in 10412 /* Function registered with record_unwind_protect in
10409 redisplay_internal. Reset redisplaying_p to the value it had 10413 redisplay_internal. Reset redisplaying_p to the value it had
18692 Lisp_Object face_name = Qnil; 18696 Lisp_Object face_name = Qnil;
18693 int ascent, descent, height, override; 18697 int ascent, descent, height, override;
18694 18698
18695 if (STRINGP (it->object)) 18699 if (STRINGP (it->object))
18696 position = make_number (IT_STRING_CHARPOS (*it)); 18700 position = make_number (IT_STRING_CHARPOS (*it));
18701 else if (BUFFERP (it->object))
18702 position = make_number (IT_CHARPOS (*it));
18697 else 18703 else
18698 position = make_number (IT_CHARPOS (*it)); 18704 return Qnil;
18699 18705
18700 val = Fget_char_property (position, prop, it->object); 18706 val = Fget_char_property (position, prop, it->object);
18701 18707
18702 if (NILP (val)) 18708 if (NILP (val))
18703 return val; 18709 return val;