aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2008-05-08 04:07:39 +0000
committerJuanma Barranquero2008-05-08 04:07:39 +0000
commit67b5d7deb1ce5dc2b525d292377dfcdb70864877 (patch)
tree4b0235de0993d526391594c596a3f9321d4b189e
parent4d4e54a0a08fcb8948844115b626d4971a6d173b (diff)
downloademacs-67b5d7deb1ce5dc2b525d292377dfcdb70864877.tar.gz
emacs-67b5d7deb1ce5dc2b525d292377dfcdb70864877.zip
(Ffont_match_p): Don't use `iff' in docstring.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/font.c2
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 @@
12008-05-08 Juanma Barranquero <lekktu@gmail.com>
2
3 * font.c (Ffont_match_p): Don't use `iff' in docstring.
4
12008-05-07 Dan Nicolaescu <dann@ics.uci.edu> 52008-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
4027DEFUN ("font-match-p", Ffont_match_p, Sfont_match_p, 2, 2, 0, 4027DEFUN ("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.
4029FONT is a font-spec, font-entity, or font-object. */) 4029FONT 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;