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

[Kim F . Storm]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.986 emacs/src/xdisp.c:1.987
*** emacs/src/xdisp.c:1.986     Sun Feb 27 10:53:09 2005
--- emacs/src/xdisp.c   Tue Mar  1 13:38:34 2005
***************
*** 5087,5097 ****
                 display.  Then, set IT->dpvec to these glyphs.  */
              GLYPH g;
              int ctl_len;
!             int face_id, lface_id;
              GLYPH escape_glyph;
  
              if (it->c < 128 && it->ctl_arrow_p)
                {
                  /* Set IT->ctl_chars[0] to the glyph for `^'.  */
                  if (it->dp
                      && INTEGERP (DISP_CTRL_GLYPH (it->dp))
--- 5087,5098 ----
                 display.  Then, set IT->dpvec to these glyphs.  */
              GLYPH g;
              int ctl_len;
!             int face_id, lface_id = 0 ;
              GLYPH escape_glyph;
  
              if (it->c < 128 && it->ctl_arrow_p)
                {
+                 g = '^';           /* default glyph for Control */
                  /* Set IT->ctl_chars[0] to the glyph for `^'.  */
                  if (it->dp
                      && INTEGERP (DISP_CTRL_GLYPH (it->dp))
***************
*** 5099,5117 ****
                    {
                      g = XINT (DISP_CTRL_GLYPH (it->dp));
                      lface_id = FAST_GLYPH_FACE (g);
!                     if (lface_id)
!                       {
!                         g = FAST_GLYPH_CHAR (g);
!                         face_id = merge_faces (it->f, Qt, lface_id,
!                                                it->face_id);
!                       }
                    }
                  else
                    {
                      /* Merge the escape-glyph face into the current face.  */
                      face_id = merge_faces (it->f, Qescape_glyph, 0,
                                             it->face_id);
-                     g = '^';
                    }
  
                  XSETINT (it->ctl_chars[0], g);
--- 5100,5117 ----
                    {
                      g = XINT (DISP_CTRL_GLYPH (it->dp));
                      lface_id = FAST_GLYPH_FACE (g);
!                   }
!                 if (lface_id)
!                   {
!                      g = FAST_GLYPH_CHAR (g);
!                      face_id = merge_faces (it->f, Qt, lface_id,
!                                             it->face_id);
                    }
                  else
                    {
                      /* Merge the escape-glyph face into the current face.  */
                      face_id = merge_faces (it->f, Qescape_glyph, 0,
                                             it->face_id);
                    }
  
                  XSETINT (it->ctl_chars[0], g);
***************
*** 5121,5145 ****
                  goto display_control;
                }
  
              if (it->dp
                  && INTEGERP (DISP_ESCAPE_GLYPH (it->dp))
                  && GLYPH_CHAR_VALID_P (XFASTINT (DISP_ESCAPE_GLYPH (it->dp))))
                {
                  escape_glyph = XFASTINT (DISP_ESCAPE_GLYPH (it->dp));
                  lface_id = FAST_GLYPH_FACE (escape_glyph);
!                 if (lface_id)
!                   {
!                     escape_glyph = FAST_GLYPH_CHAR (escape_glyph);
!                     face_id = merge_faces (it->f, Qt, lface_id,
!                                            it->face_id);
!                   }
                }
              else
                {
                  /* Merge the escape-glyph face into the current face.  */
                  face_id = merge_faces (it->f, Qescape_glyph, 0,
                                         it->face_id);
-                 escape_glyph = '\\';
                }
  
              if (it->c == 0x8a0 || it->c == 0x8ad)
--- 5121,5145 ----
                  goto display_control;
                }
  
+             escape_glyph = '\\';    /* default for Octal display */
              if (it->dp
                  && INTEGERP (DISP_ESCAPE_GLYPH (it->dp))
                  && GLYPH_CHAR_VALID_P (XFASTINT (DISP_ESCAPE_GLYPH (it->dp))))
                {
                  escape_glyph = XFASTINT (DISP_ESCAPE_GLYPH (it->dp));
                  lface_id = FAST_GLYPH_FACE (escape_glyph);
!               }
!             if (lface_id)
!               {
!                 escape_glyph = FAST_GLYPH_CHAR (escape_glyph);
!                 face_id = merge_faces (it->f, Qt, lface_id,
!                                        it->face_id);
                }
              else
                {
                  /* Merge the escape-glyph face into the current face.  */
                  face_id = merge_faces (it->f, Qescape_glyph, 0,
                                         it->face_id);
                }
  
              if (it->c == 0x8a0 || it->c == 0x8ad)