diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2010-10-14 16:32:27 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2010-10-14 16:32:27 +0200 |
| commit | 220d91b834f7f7252b9953460422151b86b3520c (patch) | |
| tree | 8f3e16983e83ac0da6beef346cb05cd2591a7f83 /lisp/international | |
| parent | 31e96eecc09283b5169faf0d5dc1c8efd58539ac (diff) | |
| parent | 9d4f32e88a1b642070f0adb41df04a0846c31970 (diff) | |
| download | emacs-220d91b834f7f7252b9953460422151b86b3520c.tar.gz emacs-220d91b834f7f7252b9953460422151b86b3520c.tar.bz2 emacs-220d91b834f7f7252b9953460422151b86b3520c.zip | |
Merge changes from emacs-23 branch.
Diffstat (limited to 'lisp/international')
| -rw-r--r-- | lisp/international/ccl.el | 2 | ||||
| -rw-r--r-- | lisp/international/fontset.el | 2 | ||||
| -rw-r--r-- | lisp/international/mule.el | 2 | ||||
| -rw-r--r-- | lisp/international/titdic-cnv.el | 2 |
4 files changed, 4 insertions, 4 deletions
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 753b1ab25e7..07557aacc88 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] diff --git a/lisp/international/mule.el b/lisp/international/mule.el index 151373e27ea..df362d96c07 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el @@ -646,7 +646,7 @@ VALUE must be a function to call after all functions in `write-region-annotate-functions' and `buffer-file-format' are called, and before the text is encoded by the coding system itself. This function should convert the whole text in the -current buffer. For backward compatibility, this funciton is +current buffer. For backward compatibility, this function is passed two arguments which can be ignored. `:default-char' diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el index afe5dda1f57..92b4251b49c 100644 --- a/lisp/international/titdic-cnv.el +++ b/lisp/international/titdic-cnv.el @@ -108,7 +108,7 @@ For double-width GB2312 characters correponding to ASCII, use the input method `chinese-qj'.") ("chinese-ecdict" "$(05CKH(B" -"In this input method, you enter a Chinese (Big5) charactere or word +"In this input method, you enter a Chinese (Big5) character or word by typing the corresponding English word. For example, if you type \"computer\", \"$(0IZH+(B\" is input. |