Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/emacs/patches/face_for_font.patch
author pnyc <petr.nyc@oracle.com>
Thu, 31 Mar 2016 03:53:41 -0700
branchs11u3-sru
changeset 5690 eb56dd968022
parent 2856 47b35501403f
permissions -rw-r--r--
Added tag 0.175.3.7.0.4.0, S11.3SRU7.4 for changeset f1e1312aaa54
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2856
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     1
 
# Elide call to face_for_font() when window system support is not included.
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     2
 
# See components/emacs/README.
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     3
 
#
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     4
 
--- emacs-24.3.orig/src/xdisp.c	2013-02-24 12:21:16.000000000 -0700
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     5
 
+++ emacs-24.3/src/xdisp.c	2013-09-24 10:45:08.854361844 -0600
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     6
 
@@ -6870,6 +6870,7 @@
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     7
 
 	}
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     8
 
     }
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     9
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    10
 
+#ifdef HAVE_WINDOW_SYSTEM
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    11
 
   /* Adjust face id for a multibyte character.  There are no multibyte
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    12
 
      character in unibyte text.  */
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    13
 
   if ((it->what == IT_CHARACTER || it->what == IT_COMPOSITION)
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    14
 
@@ -6910,6 +6911,7 @@
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    15
 
 	  it->face_id = FACE_FOR_CHAR (it->f, face, c, pos, it->string);
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    16
 
 	}
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    17
 
     }
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    18
 
+#endif
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    19
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    20
 
  done:
47b35501403f 17516703 update GNU Emacs to 24.3
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    21
 
   /* Is this character the last one of a run of characters with
upstream/oracle/userland-gate