diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index db3f9268e04..0c942ad14e6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-23  Juanma Barranquero  <lekktu@gmail.com>
+
+	* edmacro.el (edmacro-eight-bits, edmacro-mode): Fix docstring typos.
+	(edmacro-mismatch, edmacro-sanitize-for-string): Doc fixes.
+
 2008-10-23  Chong Yidong  <cyd@stupidchicken.com>
 
 	* filesets.el: Update author email.
@@ -5,8 +10,7 @@
 
 2008-10-23  Jens Petersen  <petersen@redhat.com>
 
-	* pcmpl-rpm.el (pcomplete/rpm): Make "rpm -qp" use file
-	completion.
+	* pcmpl-rpm.el (pcomplete/rpm): Make "rpm -qp" use file completion.
 
 2008-10-23  Ulrich Mueller  <ulm@kph.uni-mainz.de>
 
diff --git a/lisp/edmacro.el b/lisp/edmacro.el
index 872d853c4b1..3d40e211cd4 100644
--- a/lisp/edmacro.el
+++ b/lisp/edmacro.el
@@ -78,7 +78,7 @@
 
 ;;;###autoload
 (defvar edmacro-eight-bits nil
-  "*Non-nil if edit-kbd-macro should leave 8-bit characters intact.
+  "*Non-nil if `edit-kbd-macro' should leave 8-bit characters intact.
 Default nil means to write characters above \\177 in octal notation.")
 
 (defvar edmacro-mode-map nil)
@@ -349,7 +349,7 @@ or nil, use a compact 80-column format."
     (insert (edmacro-format-keys key) " ")))
 
 (defun edmacro-mode ()
-  "\\<edmacro-mode-map>Keyboard Macro Editing mode.  Press
+  "\\<edmacro-mode-map>Keyboard Macro Editing mode.  Press \
 \\[edmacro-finish-edit] to save and exit.
 To abort the edit, just kill this buffer with \\[kill-buffer] RET.
 
@@ -597,7 +597,8 @@ doubt, use whitespace."
 (defun edmacro-mismatch (cl-seq1 cl-seq2 cl-start1 cl-end1 cl-start2 cl-end2)
   "Compare SEQ1 with SEQ2, return index of first mismatching element.
 Return nil if the sequences match.  If one sequence is a prefix of the
-other, the return value indicates the end of the shorted sequence."
+other, the return value indicates the end of the shorted sequence.
+\n(fn SEQ1 SEQ2 START1 END1 START2 END2)"
   (let (cl-test cl-test-not cl-key cl-from-end)
     (or cl-end1 (setq cl-end1 (length cl-seq1)))
     (or cl-end2 (setq cl-end2 (length cl-seq2)))
@@ -647,7 +648,7 @@ If START or END is negative, it counts from the end."
 	       res))))))
 
 (defun edmacro-sanitize-for-string (seq)
-  "Convert a key sequence vector into a string.
+  "Convert a key sequence vector SEQ into a string.
 The string represents the same events; Meta is indicated by bit 7.
 This function assumes that the events can be stored in a string."
   (setq seq (copy-sequence seq))