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

[Juri Linkov]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.1018 emacs/src/xdisp.c:1.1019
*** emacs/src/xdisp.c:1.1018    Thu Jun  2 12:27:05 2005
--- emacs/src/xdisp.c   Mon Jun  6 12:36:29 2005
***************
*** 350,355 ****
--- 350,359 ----
  
  Lisp_Object Qescape_glyph;
  
+ /* 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.  */
  
***************
*** 5094,5101 ****
                           && it->len == 1)
                          || !CHAR_PRINTABLE_P (it->c)
                          || (!NILP (Vshow_nonbreak_escape)
!                             && (it->c == 0x8ad || it->c == 0x8a0
!                                 || it->c == 0xf2d || it->c == 0xf20)))
                       : (it->c >= 127
                          && (!unibyte_display_via_language_environment
                              || it->c == unibyte_char_to_multibyte (it->c)))))
--- 5098,5107 ----
                           && 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
!                                 || it->c == 0xf20 || it->c == 0xf2d)))
                       : (it->c >= 127
                          && (!unibyte_display_via_language_environment
                              || it->c == unibyte_char_to_multibyte (it->c)))))
***************
*** 5162,5174 ****
                                         it->face_id);
                }
  
!             if (it->c == 0x8a0 || it->c == 0x8ad
!                 || it->c == 0xf20 || it->c == 0xf2d)
                {
!                 XSETINT (it->ctl_chars[0], escape_glyph);
                  g = it->c;
!                 XSETINT (it->ctl_chars[1], g);
!                 ctl_len = 2;
                  goto display_control;
                }
  
--- 5168,5192 ----
                                         it->face_id);
                }
  
!             if (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;
!                 XSETINT (it->ctl_chars[0], g);
!                 ctl_len = 1;
!                 goto display_control;
!               }
! 
!             if (it->c == 0x8ad || it->c == 0x92d
!                 || it->c == 0xe2d || it->c == 0xf2d)
!               {
!                 g = it->c;
!                 XSETINT (it->ctl_chars[0], g);
!                 ctl_len = 1;
                  goto display_control;
                }
  
***************
*** 22714,22719 ****
--- 22732,22739 ----
    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");