diff options
| author | Juanma Barranquero | 2008-05-08 04:07:39 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2008-05-08 04:07:39 +0000 |
| commit | 67b5d7deb1ce5dc2b525d292377dfcdb70864877 (patch) | |
| tree | 4b0235de0993d526391594c596a3f9321d4b189e | |
| parent | 4d4e54a0a08fcb8948844115b626d4971a6d173b (diff) | |
| download | emacs-67b5d7deb1ce5dc2b525d292377dfcdb70864877.tar.gz emacs-67b5d7deb1ce5dc2b525d292377dfcdb70864877.zip | |
(Ffont_match_p): Don't use `iff' in docstring.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/font.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e29fe0e6650..e68efb42094 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-05-08 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * font.c (Ffont_match_p): Don't use `iff' in docstring. | ||
| 4 | |||
| 1 | 2008-05-07 Dan Nicolaescu <dann@ics.uci.edu> | 5 | 2008-05-07 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 6 | ||
| 3 | * macfns.c (Fx_create_frame): Make a copy of frame parameters | 7 | * macfns.c (Fx_create_frame): Make a copy of frame parameters |
diff --git a/src/font.c b/src/font.c index 197d7a74498..5ed33fcf4b4 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -4025,7 +4025,7 @@ Each element is a vector [GLYPH-CODE LBEARING RBEARING WIDTH ASCENT DESCENT]. * | |||
| 4025 | } | 4025 | } |
| 4026 | 4026 | ||
| 4027 | DEFUN ("font-match-p", Ffont_match_p, Sfont_match_p, 2, 2, 0, | 4027 | DEFUN ("font-match-p", Ffont_match_p, Sfont_match_p, 2, 2, 0, |
| 4028 | doc: /* Return t iff font-spec SPEC matches with FONT. | 4028 | doc: /* Return t if and only if font-spec SPEC matches with FONT. |
| 4029 | FONT is a font-spec, font-entity, or font-object. */) | 4029 | FONT is a font-spec, font-entity, or font-object. */) |
| 4030 | (spec, font) | 4030 | (spec, font) |
| 4031 | Lisp_Object spec, font; | 4031 | Lisp_Object spec, font; |