diff options
| author | Kenichi Handa | 2008-07-11 07:32:32 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2008-07-11 07:32:32 +0000 |
| commit | 38aaf336a128d023147f798fc52c16d9797ff693 (patch) | |
| tree | 4ee2c3057ad672daf355b019a4fc58c56a3c22ae /src | |
| parent | 0b22a5e17ba44f559664af2d59c4828bfe56baaa (diff) | |
| download | emacs-38aaf336a128d023147f798fc52c16d9797ff693.tar.gz emacs-38aaf336a128d023147f798fc52c16d9797ff693.zip | |
(fontset_from_font): Cancel the previous change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/fontset.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 283f8d9ef5d..0580e59f318 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-07-11 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * fontset.c (fontset_from_font): Cancel the previous change. | ||
| 4 | |||
| 1 | 2008-07-11 Dan Nicolaescu <dann@ics.uci.edu> | 5 | 2008-07-11 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 6 | ||
| 3 | * lisp.h: | 7 | * lisp.h: |
diff --git a/src/fontset.c b/src/fontset.c index caa732b6bc6..cde956c93dd 100644 --- a/src/fontset.c +++ b/src/fontset.c | |||
| @@ -1623,6 +1623,7 @@ fontset_from_font (font_object) | |||
| 1623 | ASET (font_spec, FONT_REGISTRY_INDEX, Qiso10646_1); | 1623 | ASET (font_spec, FONT_REGISTRY_INDEX, Qiso10646_1); |
| 1624 | for (i = FONT_WEIGHT_INDEX; i < FONT_EXTRA_INDEX; i++) | 1624 | for (i = FONT_WEIGHT_INDEX; i < FONT_EXTRA_INDEX; i++) |
| 1625 | ASET (font_spec, i, Qnil); | 1625 | ASET (font_spec, i, Qnil); |
| 1626 | Fset_fontset_font (name, Qlatin, font_spec, Qnil, Qnil); | ||
| 1626 | Fset_fontset_font (name, Qnil, font_spec, Qnil, Qnil); | 1627 | Fset_fontset_font (name, Qnil, font_spec, Qnil, Qnil); |
| 1627 | return XINT (FONTSET_ID (fontset)); | 1628 | return XINT (FONTSET_ID (fontset)); |
| 1628 | } | 1629 | } |