[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src ChangeLog font.c font.h ftfont.c xfont.c
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] emacs/src ChangeLog font.c font.h ftfont.c xfont.c |
Date: |
Fri, 17 Apr 2009 18:38:02 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 09/04/17 18:38:02
Modified files:
src : ChangeLog font.c font.h ftfont.c xfont.c
Log message:
* font.c (Qja, Qko): Move definitions here from ftfont.c.
* font.h (Qja, Qko): Extern them.
* ftfont.c (Qja, Qko): Remove declarations.
* xfont.c (Qja, Qko): Remove declarations.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7494&r2=1.7495
http://cvs.savannah.gnu.org/viewcvs/emacs/src/font.c?cvsroot=emacs&r1=1.123&r2=1.124
http://cvs.savannah.gnu.org/viewcvs/emacs/src/font.h?cvsroot=emacs&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ftfont.c?cvsroot=emacs&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xfont.c?cvsroot=emacs&r1=1.25&r2=1.26
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7494
retrieving revision 1.7495
diff -u -b -r1.7494 -r1.7495
--- ChangeLog 17 Apr 2009 02:15:17 -0000 1.7494
+++ ChangeLog 17 Apr 2009 18:38:00 -0000 1.7495
@@ -1,3 +1,13 @@
+2009-04-17 Chong Yidong <address@hidden>
+
+ * font.c (Qja, Qko): Move definitions here from ftfont.c.
+
+ * font.h (Qja, Qko): Extern them.
+
+ * ftfont.c (Qja, Qko): Remove declarations.
+
+ * xfont.c (Qja, Qko): Remove declarations.
+
2009-04-17 Kenichi Handa <address@hidden>
* editfns.c (Ftranslate_region_internal): Use Fconcat to make a
Index: font.c
===================================================================
RCS file: /sources/emacs/emacs/src/font.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- font.c 16 Apr 2009 01:32:44 -0000 1.123
+++ font.c 17 Apr 2009 18:38:02 -0000 1.124
@@ -143,6 +143,9 @@
Lisp_Object QCantialias, QCfont_entity, QCfc_unknown_spec;
/* Symbols representing values of font spacing property. */
Lisp_Object Qc, Qm, Qp, Qd;
+/* Special ADSTYLE properties to avoid fonts used for Latin
+ characters; used in xfont.c and ftfont.c. */
+Lisp_Object Qja, Qko;
Lisp_Object Vfont_encoding_alist;
@@ -5135,6 +5138,9 @@
DEFSYM (Qp, "p");
DEFSYM (Qd, "d");
+ DEFSYM (Qja, "ja");
+ DEFSYM (Qko, "ko");
+
staticpro (&null_vector);
null_vector = Fmake_vector (make_number (0), Qnil);
Index: font.h
===================================================================
RCS file: /sources/emacs/emacs/src/font.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- font.h 11 Mar 2009 11:45:33 -0000 1.32
+++ font.h 17 Apr 2009 18:38:02 -0000 1.33
@@ -240,6 +240,9 @@
extern Lisp_Object Qascii_0;
extern Lisp_Object Qiso8859_1, Qiso10646_1, Qunicode_bmp, Qunicode_sip;
+/* Special ADSTYLE properties to avoid fonts used for Latin characters. */
+extern Lisp_Object Qja, Qko;
+
/* Structure for a font-spec. */
struct font_spec
Index: ftfont.c
===================================================================
RCS file: /sources/emacs/emacs/src/ftfont.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- ftfont.c 17 Apr 2009 00:55:41 -0000 1.53
+++ ftfont.c 17 Apr 2009 18:38:02 -0000 1.54
@@ -43,9 +43,6 @@
/* Fontconfig's generic families and their aliases. */
static Lisp_Object Qmonospace, Qsans_serif, Qserif, Qmono, Qsans, Qsans__serif;
-/* Special ADSTYLE properties to avoid fonts used for Latin characters. */
-Lisp_Object Qja, Qko;
-
/* Flag to tell if FcInit is already called or not. */
static int fc_initialized;
@@ -2229,8 +2226,6 @@
DEFSYM (Qmono, "mono");
DEFSYM (Qsans, "sans");
DEFSYM (Qsans__serif, "sans serif");
- DEFSYM (Qja, "ja");
- DEFSYM (Qko, "ko");
staticpro (&freetype_font_cache);
freetype_font_cache = Fcons (Qt, Qnil);
Index: xfont.c
===================================================================
RCS file: /sources/emacs/emacs/src/xfont.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- xfont.c 16 Apr 2009 01:39:08 -0000 1.25
+++ xfont.c 17 Apr 2009 18:38:02 -0000 1.26
@@ -792,8 +792,6 @@
return 0;
}
-extern Lisp_Object Qja, Qko;
-
static int
xfont_has_char (font, c)
Lisp_Object font;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/src ChangeLog font.c font.h ftfont.c xfont.c,
Chong Yidong <=