Mercurial > emacs
comparison src/font.c @ 111333:de02b794c330
Don't be so lax with spelling.
* lisp/net/dbus.el (dbus-name-owner-changed-handler): Doc fix.
* doc/misc/ediff.texi (Quick Help Commands, Miscellaneous): Spelling fix.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Tue, 02 Nov 2010 20:49:04 -0700 |
parents | b8fde5ef9e14 |
children | 1e95f3ea022d |
comparison
equal
deleted
inserted
replaced
111332:13a509edfa26 | 111333:de02b794c330 |
---|---|
1 /* font.c -- "Font" primitives. | 1 /* font.c -- "Font" primitives. |
2 Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 2 |
3 Copyright (C) 2006, 2007, 2008, 2009, 2010 | 3 Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
4 National Institute of Advanced Industrial Science and Technology (AIST) | 4 Copyright (C) 2006, 2007, 2008, 2009, 2010 |
5 Registration Number H13PRO009 | 5 National Institute of Advanced Industrial Science and Technology (AIST) |
6 Registration Number H13PRO009 | |
6 | 7 |
7 This file is part of GNU Emacs. | 8 This file is part of GNU Emacs. |
8 | 9 |
9 GNU Emacs is free software: you can redistribute it and/or modify | 10 GNU Emacs is free software: you can redistribute it and/or modify |
10 it under the terms of the GNU General Public License as published by | 11 it under the terms of the GNU General Public License as published by |
3441 it. */ | 3442 it. */ |
3442 entity = font_matching_entity (f, attrs, spec); | 3443 entity = font_matching_entity (f, attrs, spec); |
3443 if (NILP (entity)) | 3444 if (NILP (entity)) |
3444 return Qnil; | 3445 return Qnil; |
3445 } | 3446 } |
3446 /* Don't loose the original name that was put in initially. We need | 3447 /* Don't lose the original name that was put in initially. We need |
3447 it to re-apply the font when font parameters (like hinting or dpi) have | 3448 it to re-apply the font when font parameters (like hinting or dpi) have |
3448 changed. */ | 3449 changed. */ |
3449 entity = font_open_for_lface (f, entity, attrs, spec); | 3450 entity = font_open_for_lface (f, entity, attrs, spec); |
3450 if (!NILP (entity)) | 3451 if (!NILP (entity)) |
3451 { | 3452 { |
3512 | 3513 |
3513 args[0] = QCname; | 3514 args[0] = QCname; |
3514 args[1] = make_unibyte_string (name, strlen (name)); | 3515 args[1] = make_unibyte_string (name, strlen (name)); |
3515 spec = Ffont_spec (2, args); | 3516 spec = Ffont_spec (2, args); |
3516 ret = font_open_by_spec (f, spec); | 3517 ret = font_open_by_spec (f, spec); |
3517 /* Do not loose name originally put in. */ | 3518 /* Do not lose name originally put in. */ |
3518 if (!NILP (ret)) | 3519 if (!NILP (ret)) |
3519 font_put_extra (ret, QCuser_spec, args[1]); | 3520 font_put_extra (ret, QCuser_spec, args[1]); |
3520 | 3521 |
3521 return ret; | 3522 return ret; |
3522 } | 3523 } |
5397 init_font (void) | 5398 init_font (void) |
5398 { | 5399 { |
5399 Vfont_log = egetenv ("EMACS_FONT_LOG") ? Qnil : Qt; | 5400 Vfont_log = egetenv ("EMACS_FONT_LOG") ? Qnil : Qt; |
5400 } | 5401 } |
5401 | 5402 |
5402 /* arch-tag: 74c9475d-5976-4c93-a327-942ae3072846 | |
5403 (do not change this comment) */ |