Mercurial Mercurial > upstream > oracle > xnv / 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.
open-src/lib/libX11/6714036.patch
author X gate hg captive account <xhg@xserver.sfbay.sun.com>
Fri, 23 Sep 2011 15:47:54 -0700
changeset 1216 3838ec082c2e
parent 1064 3395ca7a91bf
permissions -rw-r--r--
Added tag nv_175a for changeset 924b7feb31b8
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
688
ec7ff53634c7 6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 604
diff changeset 
     1
 
diff -urp -x '*~' -x '*.orig' modules/lc/gen/lcGenConv.c modules/lc/gen/lcGenConv.c
1064
3395ca7a91bf 7012962 Update libX11 to 1.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 688
diff changeset 
     2
 
--- modules/lc/gen/lcGenConv.c	2010-09-03 22:52:38.000000000 -0700
3395ca7a91bf 7012962 Update libX11 to 1.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 688
diff changeset 
     3
 
+++ modules/lc/gen/lcGenConv.c	2010-11-21 18:47:57.083531216 -0800
3395ca7a91bf 7012962 Update libX11 to 1.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 688
diff changeset 
     4
 
@@ -1784,9 +1784,6 @@ mbtocs(
604
6fe48a3a12bf 6789219 xterm, xfd take long time to start when miss fonts
Xue Wei <Wei.Xue@Sun.COM>
parents:
diff changeset 
     5
 
         return( 0 );
6fe48a3a12bf 6789219 xterm, xfd take long time to start when miss fonts
Xue Wei <Wei.Xue@Sun.COM>
parents:
diff changeset 
     6
 
     }
6fe48a3a12bf 6789219 xterm, xfd take long time to start when miss fonts
Xue Wei <Wei.Xue@Sun.COM>
parents:
diff changeset 
     7
6fe48a3a12bf 6789219 xterm, xfd take long time to start when miss fonts
Xue Wei <Wei.Xue@Sun.COM>
parents:
diff changeset 
     8
 
-    if (*from_left > *to_left)
6fe48a3a12bf 6789219 xterm, xfd take long time to start when miss fonts
Xue Wei <Wei.Xue@Sun.COM>
parents:
diff changeset 
     9
 
-        *from_left = *to_left;
6fe48a3a12bf 6789219 xterm, xfd take long time to start when miss fonts
Xue Wei <Wei.Xue@Sun.COM>
parents:
diff changeset 
    10
 
-
6fe48a3a12bf 6789219 xterm, xfd take long time to start when miss fonts
Xue Wei <Wei.Xue@Sun.COM>
parents:
diff changeset 
    11
 
     while (*from_left && *to_left) {
6fe48a3a12bf 6789219 xterm, xfd take long time to start when miss fonts
Xue Wei <Wei.Xue@Sun.COM>
parents:
diff changeset 
    12
6fe48a3a12bf 6789219 xterm, xfd take long time to start when miss fonts
Xue Wei <Wei.Xue@Sun.COM>
parents:
diff changeset 
    13
 
 	ch = *inbufptr++;
upstream/oracle/xnv