# HG changeset patch # User Juanma Barranquero # Date 1286896617 -7200 # Node ID e0f89e89ed02cb8a1c2fa43f578ad6cfebdafcde # Parent 9a99465a61b94fb811b1945dd7c9c2ad5959e88a Fix typos in docstrings, comments and ChangeLogs. * lisp/composite.el (compose-region): * src/ccl.c (Fccl_execute_on_string): Fix typo in docstring. diff -r 9a99465a61b9 -r e0f89e89ed02 lisp/ChangeLog --- a/lisp/ChangeLog Tue Oct 12 21:52:28 2010 +0900 +++ b/lisp/ChangeLog Tue Oct 12 17:16:57 2010 +0200 @@ -1,11 +1,15 @@ - 2010-10-10 Jan Djärv - - * 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 + + * composite.el (compose-region): Fix typo in docstring. + +2010-10-10 Jan Djärv + + * 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 * Makefile.in (ELCFILES): Update. diff -r 9a99465a61b9 -r e0f89e89ed02 lisp/ChangeLog.7 --- a/lisp/ChangeLog.7 Tue Oct 12 21:52:28 2010 +0900 +++ b/lisp/ChangeLog.7 Tue Oct 12 17:16:57 2010 +0200 @@ -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 -r 9a99465a61b9 -r e0f89e89ed02 lisp/ChangeLog.8 --- a/lisp/ChangeLog.8 Tue Oct 12 21:52:28 2010 +0900 +++ b/lisp/ChangeLog.8 Tue Oct 12 17:16:57 2010 +0200 @@ -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 diff -r 9a99465a61b9 -r e0f89e89ed02 lisp/ChangeLog.9 --- a/lisp/ChangeLog.9 Tue Oct 12 21:52:28 2010 +0900 +++ b/lisp/ChangeLog.9 Tue Oct 12 17:16:57 2010 +0200 @@ -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 diff -r 9a99465a61b9 -r e0f89e89ed02 lisp/composite.el --- a/lisp/composite.el Tue Oct 12 21:52:28 2010 +0900 +++ b/lisp/composite.el Tue Oct 12 17:16:57 2010 +0200 @@ -210,7 +210,7 @@ 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 -r 9a99465a61b9 -r e0f89e89ed02 lisp/gnus/ecomplete.el --- a/lisp/gnus/ecomplete.el Tue Oct 12 21:52:28 2010 +0900 +++ b/lisp/gnus/ecomplete.el Tue Oct 12 17:16:57 2010 +0200 @@ -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 -r 9a99465a61b9 -r e0f89e89ed02 lisp/international/ccl.el --- a/lisp/international/ccl.el Tue Oct 12 21:52:28 2010 +0900 +++ b/lisp/international/ccl.el Tue Oct 12 17:16:57 2010 +0200 @@ -1437,7 +1437,7 @@ ;; 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 -r 9a99465a61b9 -r e0f89e89ed02 lisp/international/fontset.el --- a/lisp/international/fontset.el Tue Oct 12 21:52:28 2010 +0900 +++ b/lisp/international/fontset.el Tue Oct 12 17:16:57 2010 +0200 @@ -700,7 +700,7 @@ ;; "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] diff -r 9a99465a61b9 -r e0f89e89ed02 src/ChangeLog --- a/src/ChangeLog Tue Oct 12 21:52:28 2010 +0900 +++ b/src/ChangeLog Tue Oct 12 17:16:57 2010 +0200 @@ -1,3 +1,7 @@ +2010-10-12 Juanma Barranquero + + * ccl.c (Fccl_execute_on_string): Fix typo in docstring. + 2010-10-10 Jan Djärv * nsterm.m (Qleft): Declare. diff -r 9a99465a61b9 -r e0f89e89ed02 src/ChangeLog.7 --- a/src/ChangeLog.7 Tue Oct 12 21:52:28 2010 +0900 +++ b/src/ChangeLog.7 Tue Oct 12 17:16:57 2010 +0200 @@ -491,7 +491,7 @@ * xselect.c (selection_data_to_lisp_data): Set Vlast_coding_system_used. - (lisp_data_to_selection_data): Likewize. + (lisp_data_to_selection_data): Likesize. 1998-07-07 Richard Stallman @@ -502,7 +502,7 @@ * editfns.c (Fformat): Replace explicit numeric constants with proper macros. - * fns.c (concat): Likewize. + * fns.c (concat): Likewise. 1998-07-06 Kenichi Handa diff -r 9a99465a61b9 -r e0f89e89ed02 src/ccl.c --- a/src/ccl.c Tue Oct 12 21:52:28 2010 +0900 +++ b/src/ccl.c Tue Oct 12 17:16:57 2010 +0200 @@ -450,7 +450,7 @@ Therefore, the instruction code range is 0..16384(0x3fff). */ -/* Read a multibyte characeter. +/* Read a multibyte character. A code point is stored into reg[rrr]. A charset ID is stored into reg[RRR]. */ @@ -2058,7 +2058,7 @@ If IC is nil, it is initialized to head of the CCL program. If optional 4th arg CONTINUE is non-nil, keep IC on read operation -when read buffer is exausted, else, IC is always set to the end of +when read buffer is exhausted, else, IC is always set to the end of CCL-PROGRAM on exit. It returns the contents of write buffer as a string, diff -r 9a99465a61b9 -r e0f89e89ed02 src/dispextern.h --- a/src/dispextern.h Tue Oct 12 21:52:28 2010 +0900 +++ b/src/dispextern.h Tue Oct 12 17:16:57 2010 +0200 @@ -1873,7 +1873,7 @@ are not iterating over a composition now. */ int id; /* If non-negative, character that triggers the automatic - composition at `stop_pos', and this is an automatic compositoin. + composition at `stop_pos', and this is an automatic composition. If negative, this is a static composition. This is set to -2 temporarily if searching of composition reach a limit or a newline. */ diff -r 9a99465a61b9 -r e0f89e89ed02 src/font.h --- a/src/font.h Tue Oct 12 21:52:28 2010 +0900 +++ b/src/font.h Tue Oct 12 17:16:57 2010 +0200 @@ -574,7 +574,7 @@ FONT-ENTITY and it must be opened to check it, return -1. */ int (*has_char) P_ ((Lisp_Object font, int c)); - /* Return a glyph code of FONT for characer C (Unicode code point). + /* Return a glyph code of FONT for character C (Unicode code point). If FONT doesn't have such a glyph, return FONT_INVALID_CODE. */ unsigned (*encode_char) P_ ((struct font *font, int c)); diff -r 9a99465a61b9 -r e0f89e89ed02 src/print.c --- a/src/print.c Tue Oct 12 21:52:28 2010 +0900 +++ b/src/print.c Tue Oct 12 17:16:57 2010 +0200 @@ -1450,7 +1450,7 @@ #define PRINT_STRING_NON_CHARSET_FOUND 1 #define PRINT_STRING_UNSAFE_CHARSET_FOUND 2 -/* Bitwize or of the abobe macros. */ +/* Bitwise or of the above macros. */ static int print_check_string_result; static void diff -r 9a99465a61b9 -r e0f89e89ed02 src/regex.c --- a/src/regex.c Tue Oct 12 21:52:28 2010 +0900 +++ b/src/regex.c Tue Oct 12 17:16:57 2010 +0200 @@ -4145,7 +4145,7 @@ && match_any_multibyte_characters == false) { /* Set fastmap[I] to 1 where I is a leading code of each - multibyte characer in the range table. */ + multibyte character in the range table. */ int c, count; unsigned char lc1, lc2; diff -r 9a99465a61b9 -r e0f89e89ed02 src/w32font.c --- a/src/w32font.c Tue Oct 12 21:52:28 2010 +0900 +++ b/src/w32font.c Tue Oct 12 17:16:57 2010 +0200 @@ -346,7 +346,7 @@ } /* w32 implementation of encode_char for font backend. - Return a glyph code of FONT for characer C (Unicode code point). + Return a glyph code of FONT for character C (Unicode code point). If FONT doesn't have such a glyph, return FONT_INVALID_CODE. For speed, the gdi backend uses unicode (Emacs calls encode_char diff -r 9a99465a61b9 -r e0f89e89ed02 src/w32uniscribe.c --- a/src/w32uniscribe.c Tue Oct 12 21:52:28 2010 +0900 +++ b/src/w32uniscribe.c Tue Oct 12 17:16:57 2010 +0200 @@ -448,7 +448,7 @@ } /* Uniscribe implementation of encode_char for font backend. - Return a glyph code of FONT for characer C (Unicode code point). + Return a glyph code of FONT for character C (Unicode code point). If FONT doesn't have such a glyph, return FONT_INVALID_CODE. */ static unsigned uniscribe_encode_char (font, c)