summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog22
-rw-r--r--src/xfaces.c2
2 files changed, 23 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 49ba60835a7..97b29b8cb6a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,25 @@
+2005-07-21 Juanma Barranquero <lekktu@gmail.com>
+
+ * buffer.c (syms_of_buffer) <cursor-type>: Doc fix.
+
+ * ccl.c (Fregister_ccl_program): Fix typos in docstring.
+ (Fccl_execute_on_string): Likewise; add usage info.
+
+ * composite.c (Fcompose_region_internal)
+ (Fcompose_string_internal):
+ Improve argument/docstring consistency.
+
+ * minibuf.c (Fminibuffer_prompt_end, Feval_minibuffer):
+ Fix typos in docstrings.
+
+ * textprop.c (Fnext_char_property_change)
+ (Fprevious_char_property_change): Doc fixes.
+
+ * window.c (Fset_window_margins, Fset_window_fringes):
+ Improve argument/docstring consistency.
+
+ * xfaces.c (Finternal_lisp_face_p): Doc fix.
+
2005-07-21 Andreas Schwab <schwab@suse.de>
* eval.c (restore_stack_limits): Return a value.
diff --git a/src/xfaces.c b/src/xfaces.c
index 02513107c67..e4a18a27bbc 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -3907,7 +3907,7 @@ Value is a vector of face attributes. */)
DEFUN ("internal-lisp-face-p", Finternal_lisp_face_p,
Sinternal_lisp_face_p, 1, 2, 0,
doc: /* Return non-nil if FACE names a face.
-If optional second parameter FRAME is non-nil, check for the
+If optional second argument FRAME is non-nil, check for the
existence of a frame-local face with name FACE on that frame.
Otherwise check for the existence of a global face. */)
(face, frame)