diff options
| author | Glenn Morris | 2010-11-02 20:49:04 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-11-02 20:49:04 -0700 |
| commit | 537b04b96a8516693acabd5474791f5c77a770d4 (patch) | |
| tree | 74411a3837610730fad60042b727c5126844a38b /src | |
| parent | cf503f7c08c73b89485ac3d00af917875ed13b39 (diff) | |
| download | emacs-537b04b96a8516693acabd5474791f5c77a770d4.tar.gz emacs-537b04b96a8516693acabd5474791f5c77a770d4.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/font.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/font.c b/src/font.c index aee6b483353..c08c211199c 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -1,8 +1,9 @@ | |||
| 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 | ||
| @@ -3443,7 +3444,7 @@ font_load_for_lface (FRAME_PTR f, Lisp_Object *attrs, Lisp_Object 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); |
| @@ -3514,7 +3515,7 @@ font_open_by_name (FRAME_PTR f, const char *name) | |||
| 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 | ||
| @@ -5399,5 +5400,3 @@ init_font (void) | |||
| 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) */ | ||