summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2010-10-12 17:16:57 +0200
committerJuanma Barranquero <lekktu@gmail.com>2010-10-12 17:16:57 +0200
commit51e4f4a88de94846f6b44b3e11496c7b67aa2f5e (patch)
tree0eeaf52c6c802c1ac20b70b917927788f94500e3 /lisp
parentad1746f5db1b4c52da8d7bdc52359d6b0a5a5e24 (diff)
downloademacs-51e4f4a88de94846f6b44b3e11496c7b67aa2f5e.tar.gz
Fix typos in docstrings, comments and ChangeLogs.
* lisp/composite.el (compose-region): * src/ccl.c (Fccl_execute_on_string): Fix typo in docstring.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog20
-rw-r--r--lisp/ChangeLog.74
-rw-r--r--lisp/ChangeLog.82
-rw-r--r--lisp/ChangeLog.912
-rw-r--r--lisp/composite.el2
-rw-r--r--lisp/gnus/ecomplete.el2
-rw-r--r--lisp/international/ccl.el2
-rw-r--r--lisp/international/fontset.el2
8 files changed, 25 insertions, 21 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f3275116a9b..6e922bcacd4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,11 +1,15 @@
- 2010-10-10 Jan Djärv <jan.h.d@swipnet.se>
-
- * term/ns-win.el (ns-right-alternate-modifier): New defvar.
- (ns-right-option-modifier): New alias for ns-right-alternate-modifier.
- (mac-right-option-modifier): New alias for ns-right-option-modifier.
-
- * cus-start.el (all): ns-right-alternate-modifier is new.
-
+2010-10-12 Juanma Barranquero <lekktu@gmail.com>
+
+ * composite.el (compose-region): Fix typo in docstring.
+
+2010-10-10 Jan Djärv <jan.h.d@swipnet.se>
+
+ * term/ns-win.el (ns-right-alternate-modifier): New defvar.
+ (ns-right-option-modifier): New alias for ns-right-alternate-modifier.
+ (mac-right-option-modifier): New alias for ns-right-option-modifier.
+
+ * cus-start.el (all): ns-right-alternate-modifier is new.
+
2010-10-10 Andreas Schwab <schwab@linux-m68k.org>
* Makefile.in (ELCFILES): Update.
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7
index 6858c07d852..cc813b263c0 100644
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@@ -1043,10 +1043,10 @@
(quail-prev-translation-block): Likewise.
(quail-conversion-backward-char): Call quail-error instead of
error. Set quail-translating to nil.
- (quail-conversion-forward-char): Likewize.
+ (quail-conversion-forward-char): Likewise.
(quail-conversion-delete-char): Call quail-error instead of error.
If conversion region gets vacant, set quail-converting to nil.
- (quail-conversion-backward-delete-char): Likewize.
+ (quail-conversion-backward-delete-char): Likewise.
(quail-no-conversion): Just set quail-converting to nil.
(quail-mouse-choose-completion): Call quai-error instead of error.
(quail-choose-completion-string): Likewise.
diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8
index 8ecf3f0e33a..fadec1174c8 100644
--- a/lisp/ChangeLog.8
+++ b/lisp/ChangeLog.8
@@ -4926,7 +4926,7 @@
* language/ethio-util.el (setup-ethiopic-environment-internal):
Use quail-activate-hook instead of obsolete hook quail-mode-hook.
- (exit-ethiopic-environment): Likewize.
+ (exit-ethiopic-environment): Likewise.
1999-06-12 Richard M. Stallman <rms@gnu.org>
diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9
index 135eb8edbb3..6250bd0917a 100644
--- a/lisp/ChangeLog.9
+++ b/lisp/ChangeLog.9
@@ -16606,7 +16606,7 @@
0. Give correct argument to set-auto-coding-function.
(tar-expunge): For goto-char, use (point-min), not 0.
(tar-clear-modification-flags): For goto-char, use (point-min), not 1.
- (tar-subfile-save-buffer): Likewize.
+ (tar-subfile-save-buffer): Likewise.
* international/mule.el
(after-insert-file-set-buffer-file-coding-system): Call
@@ -16910,7 +16910,7 @@
(ccl-decode-viscii): Use translate-character.
(ccl-encode-viscii, ccl-encode-viscii-font)
(ccl-decode-vscii, ccl-encode-vscii, ccl-encode-vscii-font):
- Likewize.
+ Likewise.
* language/cyrillic.el: Remove eval-when-compile.
(cyrillic-koi8-r-nonascii-translation-table): Define it as a
@@ -16918,14 +16918,14 @@
(cyrillic-koi8-r-encode-table): Define it as a translation table
made from the reverse map of above.
(ccl-decode-koi8): Use translate-character.
- (ccl-encode-koi8, ccl-encode-koi8-font): Likewize
+ (ccl-encode-koi8, ccl-encode-koi8-font): Likewise.
(cyrillic-alternativnyj-nonascii-translation-table): Define it as
a translation table made from cyrillic-alternativnyj-decode-table.
(cyrillic-alternativnyj-encode-table): Define it as a translation
table made from the reverse map of above.
(ccl-decode-alternativnyj): Use translate-character.
(ccl-encode-alternativnyj, ccl-encode-alternativnyj-font):
- Likewize
+ Likewise.
* international/mule-diag.el (non-iso-charset-alist): Specify
translation table symbol instead of translation table itself.
@@ -18071,8 +18071,8 @@
* emacs-lisp/cl-macs.el: Doc fixes; mainly avoid duplicating arg
list in doc string. Don't quote keyword symbols.
- * emacs-lisp/cl.el: Likewise
- * emacs-lisp/cl-seq.el: Likewise
+ * emacs-lisp/cl.el: Likewise.
+ * emacs-lisp/cl-seq.el: Likewise.
2000-05-05 Gerd Moellmann <gerd@gnu.org>
diff --git a/lisp/composite.el b/lisp/composite.el
index 5b01718fc71..b5ef9b510c6 100644
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -210,7 +210,7 @@ of the text in the region.
If it is a string, the elements are alternate characters. In
this case, TAB element has a special meaning. If the first
-characer is TAB, the glyphs are displayed with left padding space
+character is TAB, the glyphs are displayed with left padding space
so that no pixel overlaps with the previous column. If the last
character is TAB, the glyphs are displayed with right padding
space so that no pixel overlaps with the following column.
diff --git a/lisp/gnus/ecomplete.el b/lisp/gnus/ecomplete.el
index 7952c37f396..7aca7492a6d 100644
--- a/lisp/gnus/ecomplete.el
+++ b/lisp/gnus/ecomplete.el
@@ -147,7 +147,7 @@
(save-restriction
(narrow-to-region (point) (point-at-eol))
(while (not (eobp))
- ;; Put the 'region face on any charactes on this line that
+ ;; Put the 'region face on any characters on this line that
;; aren't already highlighted.
(unless (get-text-property (point) 'face)
(put-text-property (point) (1+ (point)) 'face 'highlight))
diff --git a/lisp/international/ccl.el b/lisp/international/ccl.el
index 09510cd8b00..4dc54859ec5 100644
--- a/lisp/international/ccl.el
+++ b/lisp/international/ccl.el
@@ -1437,7 +1437,7 @@ OPERATOR :=
;; Normal arithmethic operators (same meaning as C code).
+ | - | * | / | %
- ;; Bitwize operators (same meaning as C code)
+ ;; Bitwise operators (same meaning as C code)
| & | `|' | ^
;; Shifting operators (same meaning as C code)
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index ecb2088de89..1a5823826dd 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -700,7 +700,7 @@ Internal use only. Should be called at startup time."
;; "HP-Hebrew8" [36]
;; HPHEBREW8 8-bit character set
;; "HP-Japanese15" [36]
-;; HPJAPAN15 15-bit characer set,
+;; HPJAPAN15 15-bit character set,
;; modified from industry defacto
;; standard Shift-JIS
;; "HP-Kana8" [36]