mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-20 18:17:20 +00:00
Code Issues Releases Activity

(get_next_display_element):

Browse Source 
Finish reversing the tests of Vnobreak_char_display.

(Vnobreak_char_display): Renamed from Vshow_nonbreak_escape.
All uses changed.
(Qnobreak_space): Renamed from Qno_break_space.  All uses changed.
(syms_of_xdisp): Define nobreak-char-display and nobreak-space.
This commit is contained in:
Richard M. Stallman 2005-06-23 21:32:26 +00:00
parent d550c42590
commit 9c69e6e164
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/xdisp.c
View File

@ -320,7 +320,7 @@ Lisp_Object Vshow_trailing_whitespace;
/* Non-nil means escape non-break space and hyphens. */
Lisp_Object Vshow_nonbreak_escape;
Lisp_Object Vnobreak_char_display;
#ifdef HAVE_WINDOW_SYSTEM
extern Lisp_Object Voverflow_newline_into_fringe;
@ -352,7 +352,7 @@ Lisp_Object Qescape_glyph;
/* Name and number of the face used to highlight non-breaking spaces. */
Lisp_Object Qno_break_space;
Lisp_Object Qnobreak_space;
/* The symbol `image' which is the car of the lists used to represent
images in Lisp. */
@ -5097,7 +5097,7 @@ get_next_display_element (it)
? ((it->c >= 127
&& it->len == 1)
|| !CHAR_PRINTABLE_P (it->c)
|| (!NILP (Vshow_nonbreak_escape)
|| (!NILP (Vnobreak_char_display)
&& (it->c == 0x8a0 || it->c == 0x8ad
|| it->c == 0x920 || it->c == 0x92d
|| it->c == 0xe20 || it->c == 0xe2d
@ -5152,12 +5152,12 @@ get_next_display_element (it)
/* Handle non-break space in the mode where it only gets
highlighting. */
if (EQ (Vshow_nonbreak_escape, Qt)
if (EQ (Vnobreak_char_display, Qt)
&& (it->c == 0x8a0 || it->c == 0x920
|| it->c == 0xe20 || it->c == 0xf20))
{
/* Merge the no-break-space face into the current face. */
face_id = merge_faces (it->f, Qno_break_space, 0,
face_id = merge_faces (it->f, Qnobreak_space, 0,
it->face_id);
g = it->c = ' ';
@ -5196,7 +5196,7 @@ get_next_display_element (it)
/* Handle soft hyphens in the mode where they only get
highlighting. */
if (! EQ (Vshow_nonbreak_escape, Qt)
if (EQ (Vnobreak_char_display, Qt)
&& (it->c == 0x8ad || it->c == 0x92d
|| it->c == 0xe2d || it->c == 0xf2d))
{
@ -22776,8 +22776,8 @@ syms_of_xdisp ()
staticpro (&Qtrailing_whitespace);
Qescape_glyph = intern ("escape-glyph");
staticpro (&Qescape_glyph);
Qno_break_space = intern ("no-break-space");
staticpro (&Qno_break_space);
Qnobreak_space = intern ("nobreak-space");
staticpro (&Qnobreak_space);
Qimage = intern ("image");
staticpro (&Qimage);
QCmap = intern (":map");
@ -22883,13 +22883,14 @@ wide as that tab on the display. */);
The face used for trailing whitespace is `trailing-whitespace'. */);
Vshow_trailing_whitespace = Qnil;
DEFVAR_LISP ("show-nonbreak-escape", &Vshow_nonbreak_escape,
doc: /* *Control highlighting of non-break space and soft hyphen.
t means highlight the character itself (for non-break space,
use face `non-break-space'.
DEFVAR_LISP ("nobreak-char-display", &Vnobreak_char_display,
doc: /* *Control highlighting of nobreak space and soft hyphen.
t means highlight the character itself (for nobreak space,
use face `nobreak-space'.
nil means no highlighting.
other values mean display the escape glyph before the character. */);
Vshow_nonbreak_escape = Qt;
other values mean display the escape glyph followed by an ordinary
space or ordinary hyphen. */);
Vnobreak_char_display = Qt;
DEFVAR_LISP ("void-text-area-pointer", &Vvoid_text_area_pointer,
doc: /* *The pointer shape to show in void text areas.