diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-09 23:04:56 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-09 23:04:56 -0800 |
| commit | be6d99804b3efdecf3660c4b51da1945e955fb4d (patch) | |
| tree | 99b523c445f7b95572ab668f4e878cd703ff3527 /src/font.c | |
| parent | dd4638842ad1921562bc66049ec81a4530651cdf (diff) | |
| parent | 67f02b82f496be403353a1dc918cc4f2278841bb (diff) | |
| download | emacs-be6d99804b3efdecf3660c4b51da1945e955fb4d.tar.gz emacs-be6d99804b3efdecf3660c4b51da1945e955fb4d.tar.bz2 emacs-be6d99804b3efdecf3660c4b51da1945e955fb4d.zip | |
Merge from mainline.
Diffstat (limited to 'src/font.c')
| -rw-r--r-- | src/font.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/font.c b/src/font.c index 394c0055328..841125a0587 100644 --- a/src/font.c +++ b/src/font.c @@ -3982,7 +3982,6 @@ Layout tags. */) val = fontp->driver->otf_capability (fontp); else val = Fcons (Qnil, Qnil); - font_put_extra (font, QCotf, val); } else val = Fcdr (val); |