[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/composite.c,v
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] Changes to emacs/src/composite.c,v |
Date: |
Wed, 14 May 2008 01:23:15 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kenichi Handa <handa> 08/05/14 01:23:13
Index: composite.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/composite.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- composite.c 21 Feb 2008 07:55:04 -0000 1.47
+++ composite.c 14 May 2008 01:23:13 -0000 1.48
@@ -159,7 +159,6 @@
/* Temporary variable used in macros COMPOSITION_XXX. */
Lisp_Object composition_temp;
-extern int enable_font_backend;
/* Return COMPOSITION-ID of a composition at buffer position
CHARPOS/BYTEPOS and length NCHARS. The `composition' property of
@@ -276,9 +275,7 @@
vector or a list. It should be a sequence of:
char1 rule1 char2 rule2 char3 ... ruleN charN+1 */
-#ifdef USE_FONT_BACKEND
- if (enable_font_backend
- && VECTORP (components)
+ if (VECTORP (components)
&& ASIZE (components) >= 2
&& VECTORP (AREF (components, 0)))
{
@@ -289,9 +286,7 @@
if (! VECTORP (AREF (key, i)))
goto invalid_composition;
}
- else
-#endif /* USE_FONT_BACKEND */
- if (VECTORP (components) || CONSP (components))
+ else if (VECTORP (components) || CONSP (components))
{
int len = XVECTOR (key)->size;
@@ -324,12 +319,10 @@
: ((INTEGERP (components) || STRINGP (components))
? COMPOSITION_WITH_ALTCHARS
: COMPOSITION_WITH_RULE_ALTCHARS));
-#ifdef USE_FONT_BACKEND
if (cmp->method == COMPOSITION_WITH_RULE_ALTCHARS
&& VECTORP (components)
&& ! INTEGERP (AREF (components, 0)))
cmp->method = COMPOSITION_WITH_GLYPH_STRING;
-#endif /* USE_FONT_BACKEND */
cmp->hash_index = hash_index;
glyph_len = (cmp->method == COMPOSITION_WITH_RULE_ALTCHARS
? (XVECTOR (key)->size + 1) / 2
@@ -338,16 +331,13 @@
cmp->offsets = (short *) xmalloc (sizeof (short) * glyph_len * 2);
cmp->font = NULL;
-#ifdef USE_FONT_BACKEND
+ /* Calculate the width of overall glyphs of the composition. */
if (cmp->method == COMPOSITION_WITH_GLYPH_STRING)
{
cmp->width = 1; /* Should be fixed later. */
cmp->glyph_len--;
}
- else
-#endif /* USE_FONT_BACKEND */
- /* Calculate the width of overall glyphs of the composition. */
- if (cmp->method != COMPOSITION_WITH_RULE_ALTCHARS)
+ else if (cmp->method != COMPOSITION_WITH_RULE_ALTCHARS)
{
/* Relative composition. */
cmp->width = 0;
@@ -652,12 +642,6 @@
{
Lisp_Object prop;
-#if 0
- if (VECTORP (components) && ASIZE (components) > 1
- && VECTORP (AREF (components, 0)))
- prop = components;
- else
-#endif /* USE_FONT_BACKEND */
prop = Fcons (Fcons (make_number (end - start), components),
modification_func);
Fput_text_property (make_number (start), make_number (end),
- [Emacs-diffs] Changes to emacs/src/composite.c,v,
Kenichi Handa <=