User: aidan
Date: 05/12/24 23:31:55
Modified: xemacs/src ChangeLog objects-x.c
Log:
Revert a couple of changes from those last commits.
Revision Changes Path
1.716 +6 -0 XEmacs/xemacs/lisp/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.715
retrieving revision 1.716
diff -u -p -r1.715 -r1.716
--- ChangeLog 2005/12/24 21:59:18 1.715
+++ ChangeLog 2005/12/24 22:31:47 1.716
@@ -1,5 +1,11 @@
2005-12-24 Aidan Kehoe <kehoea(a)parhasard.net>
+ * mule/chinese.el:
+ * mule/chinese.el ('euc-china): Removed. Shouldn't have been
+ uncommented in the first place.
+
+2005-12-24 Aidan Kehoe <kehoea(a)parhasard.net>
+
* mule/mule-cmds.el (set-language-environment-coding-systems):
* mule/mule-cmds.el (init-locale-at-early-startup):
Call set-current-locale (the wrapper for setlocale(3)) before
1.12 +0 -2 XEmacs/xemacs/lisp/mule/chinese.el
Index: chinese.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/chinese.el,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- chinese.el 2005/12/24 21:24:27 1.11
+++ chinese.el 2005/12/24 22:31:51 1.12
@@ -266,8 +266,6 @@ G1: Chinese-GB2312
G2: Sisheng (PinYin - ZhuYin)"
))
-(define-coding-system-alias 'euc-china 'chinese-iso-8bit)
-
;; For consistency with euc-jp, euc-ko
(define-coding-system-alias 'euc-cn 'cn-gb-2312)
1.915 +7 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.914
retrieving revision 1.915
diff -u -p -r1.914 -r1.915
--- ChangeLog 2005/12/24 19:53:59 1.914
+++ ChangeLog 2005/12/24 22:31:52 1.915
@@ -1,5 +1,12 @@
2005-12-24 Aidan Kehoe <kehoea(a)parhasard.net>
+ * objects-x.c (x_font_instance_truename):
+ * objects-x.c (x_find_charset_font):
+ Reintroduce my change of 2005-12-20 and Stephen's of 2005-12-23,
+ which my last commit overrode.
+
+2005-12-24 Aidan Kehoe <kehoea(a)parhasard.net>
+
* event-Xt.c:
Add two new lisp variables, x-us-keymap-description and
x-us-keymap-first-keycode to better provide a fallback to the US
1.35 +4 -3 XEmacs/xemacs/src/objects-x.c
Index: objects-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- objects-x.c 2005/12/24 17:33:34 1.34
+++ objects-x.c 2005/12/24 22:31:53 1.35
@@ -808,7 +808,8 @@ x_font_instance_truename (Lisp_Font_Inst
FcChar8 *res = FcNameUnparse (FONT_INSTANCE_X_XFTFONT (f)->pattern);
if (res)
{
- FONT_INSTANCE_TRUENAME (f) = make_string (res, strlen (res));
+ FONT_INSTANCE_TRUENAME (f) =
+ build_ext_string (res, Qxft_font_name_encoding);
free (res);
return FONT_INSTANCE_TRUENAME (f);
}
@@ -1176,7 +1177,7 @@ x_find_charset_font (Lisp_Object device,
Extbyte **names;
int count = 0;
const Extbyte *patternext;
- Lisp_Object result = Qunbound;
+ Lisp_Object result = Qnil;
int i;
/* #### with Xft need to handle second stage here -- sjt
@@ -1442,7 +1443,7 @@ x_find_charset_font (Lisp_Object device,
if (x_font_spec_matches_charset (XDEVICE (device), charset,
intname, Qnil, 0, -1, 0))
{
- result = make_string (intname, intlen);
+ result = build_ext_string (intname, Qx_font_name_encoding);
break;
}
}
Show replies by date