[Emacs-diffs] Changes to emacs/src/xdisp.c

[Richard M . Stallman]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.1025 emacs/src/xdisp.c:1.1026
*** emacs/src/xdisp.c:1.1025    Fri Jun 17 14:09:45 2005
--- emacs/src/xdisp.c   Thu Jun 23 21:32:26 2005
***************
*** 320,326 ****
  
  /* Non-nil means escape non-break space and hyphens.  */
  
! Lisp_Object Vshow_nonbreak_escape;
  
  #ifdef HAVE_WINDOW_SYSTEM
  extern Lisp_Object Voverflow_newline_into_fringe;
--- 320,326 ----
  
  /* Non-nil means escape non-break space and hyphens.  */
  
! Lisp_Object Vnobreak_char_display;
  
  #ifdef HAVE_WINDOW_SYSTEM
  extern Lisp_Object Voverflow_newline_into_fringe;
***************
*** 352,358 ****
  
  /* Name and number of the face used to highlight non-breaking spaces.  */
  
! Lisp_Object Qno_break_space;
  
  /* The symbol `image' which is the car of the lists used to represent
     images in Lisp.  */
--- 352,358 ----
  
  /* Name and number of the face used to highlight non-breaking spaces.  */
  
! Lisp_Object Qnobreak_space;
  
  /* The symbol `image' which is the car of the lists used to represent
     images in Lisp.  */
***************
*** 5097,5103 ****
                       ? ((it->c >= 127
                           && it->len == 1)
                          || !CHAR_PRINTABLE_P (it->c)
!                         || (!NILP (Vshow_nonbreak_escape)
                              && (it->c == 0x8a0 || it->c == 0x8ad
                                  || it->c == 0x920 || it->c == 0x92d
                                  || it->c == 0xe20 || it->c == 0xe2d
--- 5097,5103 ----
                       ? ((it->c >= 127
                           && it->len == 1)
                          || !CHAR_PRINTABLE_P (it->c)
!                         || (!NILP (Vnobreak_char_display)
                              && (it->c == 0x8a0 || it->c == 0x8ad
                                  || it->c == 0x920 || it->c == 0x92d
                                  || it->c == 0xe20 || it->c == 0xe2d
***************
*** 5152,5163 ****
              /* Handle non-break space in the mode where it only gets
                 highlighting.  */
  
!             if (EQ (Vshow_nonbreak_escape, 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,
                                         it->face_id);
  
                  g = it->c = ' ';
--- 5152,5163 ----
              /* Handle non-break space in the mode where it only gets
                 highlighting.  */
  
!             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, Qnobreak_space, 0,
                                         it->face_id);
  
                  g = it->c = ' ';
***************
*** 5196,5202 ****
              /* Handle soft hyphens in the mode where they only get
                 highlighting.  */
  
!             if (! EQ (Vshow_nonbreak_escape, Qt)
                  && (it->c == 0x8ad || it->c == 0x92d
                      || it->c == 0xe2d || it->c == 0xf2d))
                {
--- 5196,5202 ----
              /* Handle soft hyphens in the mode where they only get
                 highlighting.  */
  
!             if (EQ (Vnobreak_char_display, Qt)
                  && (it->c == 0x8ad || it->c == 0x92d
                      || it->c == 0xe2d || it->c == 0xf2d))
                {
***************
*** 22776,22783 ****
    staticpro (&Qtrailing_whitespace);
    Qescape_glyph = intern ("escape-glyph");
    staticpro (&Qescape_glyph);
!   Qno_break_space = intern ("no-break-space");
!   staticpro (&Qno_break_space);
    Qimage = intern ("image");
    staticpro (&Qimage);
    QCmap = intern (":map");
--- 22776,22783 ----
    staticpro (&Qtrailing_whitespace);
    Qescape_glyph = intern ("escape-glyph");
    staticpro (&Qescape_glyph);
!   Qnobreak_space = intern ("nobreak-space");
!   staticpro (&Qnobreak_space);
    Qimage = intern ("image");
    staticpro (&Qimage);
    QCmap = intern (":map");
***************
*** 22883,22895 ****
  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'.
  nil means no highlighting.
! other values mean display the escape glyph before the character.  */);
!   Vshow_nonbreak_escape = Qt;
  
    DEFVAR_LISP ("void-text-area-pointer", &Vvoid_text_area_pointer,
      doc: /* *The pointer shape to show in void text areas.
--- 22883,22896 ----
  The face used for trailing whitespace is `trailing-whitespace'.  */);
    Vshow_trailing_whitespace = Qnil;
  
!   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 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.