/[emacs]/emacs/src/coding.c
ViewVC logotype

Diff of /emacs/src/coding.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.293 by handa, Tue Oct 7 23:34:15 2003 UTC revision 1.294 by handa, Fri Nov 7 05:55:27 2003 UTC
# Line 1689  coding_allocate_composition_data (coding Line 1689  coding_allocate_composition_data (coding
1689      coding->cmp_data->next = cmp_data;      coding->cmp_data->next = cmp_data;
1690    coding->cmp_data = cmp_data;    coding->cmp_data = cmp_data;
1691    coding->cmp_data_start = 0;    coding->cmp_data_start = 0;
1692      coding->composing = COMPOSITION_NO;
1693  }  }
1694    
1695  /* Handle composition start sequence ESC 0, ESC 2, ESC 3, or ESC 4.  /* Handle composition start sequence ESC 0, ESC 2, ESC 3, or ESC 4.
# Line 5440  coding_restore_composition (coding, obj) Line 5441  coding_restore_composition (coding, obj)
5441            enum composition_method method = (enum composition_method) data[3];            enum composition_method method = (enum composition_method) data[3];
5442            Lisp_Object components;            Lisp_Object components;
5443    
5444              if (data[0] < 0 || i + data[0] > cmp_data->used)
5445                /* Invalid composition data.  */
5446                break;
5447    
5448            if (method == COMPOSITION_RELATIVE)            if (method == COMPOSITION_RELATIVE)
5449              components = Qnil;              components = Qnil;
5450            else            else
# Line 5453  coding_restore_composition (coding, obj) Line 5458  coding_restore_composition (coding, obj)
5458                for (j = 0; j < len; j++)                for (j = 0; j < len; j++)
5459                  args[j] = make_number (data[4 + j]);                  args[j] = make_number (data[4 + j]);
5460                components = (method == COMPOSITION_WITH_ALTCHARS                components = (method == COMPOSITION_WITH_ALTCHARS
5461                              ? Fstring (len, args) : Fvector (len, args));                              ? Fstring (make_number (len), args)
5462                                : Fvector (make_number (len), args));
5463              }              }
5464            compose_text (data[1], data[2], components, Qnil, obj);            compose_text (data[1], data[2], components, Qnil, obj);
5465          }          }

Legend:
Removed from v.1.293  
changed lines
  Added in v.1.294

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26