diff options
| author | Jason Rumney | 2008-04-03 08:17:15 +0000 |
|---|---|---|
| committer | Jason Rumney | 2008-04-03 08:17:15 +0000 |
| commit | 43f4f91cefe88952206b2cb53519acbaa162f98a (patch) | |
| tree | 0d88816faa1b479d36232a6e94c9ff3bfaecdbbb /src | |
| parent | a086d081fae2a95d0c321b21cb4a1f05f634701b (diff) | |
| download | emacs-43f4f91cefe88952206b2cb53519acbaa162f98a.tar.gz emacs-43f4f91cefe88952206b2cb53519acbaa162f98a.zip | |
(ftfont_get_open_type_spec): Check spec->script, not val.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/ftfont.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 663d61bc91a..9d326e29880 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-04-03 Jason Rumney <jasonr@gnu.org> | ||
| 2 | |||
| 3 | * ftfont.c (ftfont_get_open_type_spec): Check spec->script, not val. | ||
| 4 | |||
| 1 | 2008-04-02 Chong Yidong <cyd@stupidchicken.com> | 5 | 2008-04-02 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 6 | ||
| 3 | * callint.c (Vshift_select_mode): New var. | 7 | * callint.c (Vshift_select_mode): New var. |
diff --git a/src/ftfont.c b/src/ftfont.c index aac267b2095..a3ce243f369 100644 --- a/src/ftfont.c +++ b/src/ftfont.c | |||
| @@ -355,7 +355,7 @@ ftfont_get_open_type_spec (Lisp_Object otf_spec) | |||
| 355 | if (! spec) | 355 | if (! spec) |
| 356 | return NULL; | 356 | return NULL; |
| 357 | spec->script = XCAR (otf_spec); | 357 | spec->script = XCAR (otf_spec); |
| 358 | if (! NILP (val)) | 358 | if (! NILP (spec->script)) |
| 359 | { | 359 | { |
| 360 | OTF_SYM_TAG (spec->script, spec->script_tag); | 360 | OTF_SYM_TAG (spec->script, spec->script_tag); |
| 361 | val = assq_no_quit (spec->script, Votf_script_alist); | 361 | val = assq_no_quit (spec->script, Votf_script_alist); |