aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2008-10-23 23:52:14 +0000
committerJuanma Barranquero2008-10-23 23:52:14 +0000
commit802393f64281c404db5100c1ab67d30fa001661b (patch)
tree11066013d58fe781f85e366851fbcd1e6cbbecca
parent6623890a73421cb0d0605969fd054687be74c5a6 (diff)
downloademacs-802393f64281c404db5100c1ab67d30fa001661b.tar.gz
emacs-802393f64281c404db5100c1ab67d30fa001661b.zip
* edmacro.el (edmacro-eight-bits, edmacro-mode): Fix docstring typos.
(edmacro-mismatch, edmacro-sanitize-for-string): Doc fixes.
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/edmacro.el9
2 files changed, 11 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index db3f9268e04..0c942ad14e6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12008-10-23 Juanma Barranquero <lekktu@gmail.com>
2
3 * edmacro.el (edmacro-eight-bits, edmacro-mode): Fix docstring typos.
4 (edmacro-mismatch, edmacro-sanitize-for-string): Doc fixes.
5
12008-10-23 Chong Yidong <cyd@stupidchicken.com> 62008-10-23 Chong Yidong <cyd@stupidchicken.com>
2 7
3 * filesets.el: Update author email. 8 * filesets.el: Update author email.
@@ -5,8 +10,7 @@
5 10
62008-10-23 Jens Petersen <petersen@redhat.com> 112008-10-23 Jens Petersen <petersen@redhat.com>
7 12
8 * pcmpl-rpm.el (pcomplete/rpm): Make "rpm -qp" use file 13 * pcmpl-rpm.el (pcomplete/rpm): Make "rpm -qp" use file completion.
9 completion.
10 14
112008-10-23 Ulrich Mueller <ulm@kph.uni-mainz.de> 152008-10-23 Ulrich Mueller <ulm@kph.uni-mainz.de>
12 16
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 @@
78 78
79;;;###autoload 79;;;###autoload
80(defvar edmacro-eight-bits nil 80(defvar edmacro-eight-bits nil
81 "*Non-nil if edit-kbd-macro should leave 8-bit characters intact. 81 "*Non-nil if `edit-kbd-macro' should leave 8-bit characters intact.
82Default nil means to write characters above \\177 in octal notation.") 82Default nil means to write characters above \\177 in octal notation.")
83 83
84(defvar edmacro-mode-map nil) 84(defvar edmacro-mode-map nil)
@@ -349,7 +349,7 @@ or nil, use a compact 80-column format."
349 (insert (edmacro-format-keys key) " "))) 349 (insert (edmacro-format-keys key) " ")))
350 350
351(defun edmacro-mode () 351(defun edmacro-mode ()
352 "\\<edmacro-mode-map>Keyboard Macro Editing mode. Press 352 "\\<edmacro-mode-map>Keyboard Macro Editing mode. Press \
353\\[edmacro-finish-edit] to save and exit. 353\\[edmacro-finish-edit] to save and exit.
354To abort the edit, just kill this buffer with \\[kill-buffer] RET. 354To abort the edit, just kill this buffer with \\[kill-buffer] RET.
355 355
@@ -597,7 +597,8 @@ doubt, use whitespace."
597(defun edmacro-mismatch (cl-seq1 cl-seq2 cl-start1 cl-end1 cl-start2 cl-end2) 597(defun edmacro-mismatch (cl-seq1 cl-seq2 cl-start1 cl-end1 cl-start2 cl-end2)
598 "Compare SEQ1 with SEQ2, return index of first mismatching element. 598 "Compare SEQ1 with SEQ2, return index of first mismatching element.
599Return nil if the sequences match. If one sequence is a prefix of the 599Return nil if the sequences match. If one sequence is a prefix of the
600other, the return value indicates the end of the shorted sequence." 600other, the return value indicates the end of the shorted sequence.
601\n(fn SEQ1 SEQ2 START1 END1 START2 END2)"
601 (let (cl-test cl-test-not cl-key cl-from-end) 602 (let (cl-test cl-test-not cl-key cl-from-end)
602 (or cl-end1 (setq cl-end1 (length cl-seq1))) 603 (or cl-end1 (setq cl-end1 (length cl-seq1)))
603 (or cl-end2 (setq cl-end2 (length cl-seq2))) 604 (or cl-end2 (setq cl-end2 (length cl-seq2)))
@@ -647,7 +648,7 @@ If START or END is negative, it counts from the end."
647 res)))))) 648 res))))))
648 649
649(defun edmacro-sanitize-for-string (seq) 650(defun edmacro-sanitize-for-string (seq)
650 "Convert a key sequence vector into a string. 651 "Convert a key sequence vector SEQ into a string.
651The string represents the same events; Meta is indicated by bit 7. 652The string represents the same events; Meta is indicated by bit 7.
652This function assumes that the events can be stored in a string." 653This function assumes that the events can be stored in a string."
653 (setq seq (copy-sequence seq)) 654 (setq seq (copy-sequence seq))