components/emacs/patches/face_for_font.patch
changeset 4791 fb9a6b5ef98f
parent 4790 9a8e24279fc0
child 4792 969312f27025
equal deleted inserted replaced
4790:9a8e24279fc0 4791:fb9a6b5ef98f
     1 # Elide call to face_for_font() when window system support is not included.
       
     2 # See components/emacs/README.
       
     3 #
       
     4 --- emacs-24.3.orig/src/xdisp.c	2013-02-24 12:21:16.000000000 -0700
       
     5 +++ emacs-24.3/src/xdisp.c	2013-09-24 10:45:08.854361844 -0600
       
     6 @@ -6870,6 +6870,7 @@
       
     7  	}
       
     8      }
       
     9  
       
    10 +#ifdef HAVE_WINDOW_SYSTEM
       
    11    /* Adjust face id for a multibyte character.  There are no multibyte
       
    12       character in unibyte text.  */
       
    13    if ((it->what == IT_CHARACTER || it->what == IT_COMPOSITION)
       
    14 @@ -6910,6 +6911,7 @@
       
    15  	  it->face_id = FACE_FOR_CHAR (it->f, face, c, pos, it->string);
       
    16  	}
       
    17      }
       
    18 +#endif
       
    19  
       
    20   done:
       
    21    /* Is this character the last one of a run of characters with