Mercurial > hg > xemacs-beta
diff lisp/mule/japan-util.el @ 778:2923009caf47
[xemacs-hg @ 2002-03-16 10:38:59 by ben]
cm.c, file-coding.c: fix warnings.
.cvsignore: Those pesky *.tmp files.
mule\arabic.el, mule\canna-leim.el, mule\china-util.el, mule\chinese.el, mule\cyril-util.el, mule\cyrillic.el, mule\devan-util.el, mule\devanagari.el, mule\english.el, mule\ethio-util.el, mule\ethiopic.el, mule\european.el, mule\greek.el, mule\hebrew.el, mule\indian.el, mule\japan-util.el, mule\japanese.el, mule\korea-util.el, mule\korean.el, mule\lao-util.el, mule\lao.el, mule\misc-lang.el, mule\mule-charset.el, mule\mule-cmds.el, mule\thai-util.el, mule\thai.el, mule\tibet-util.el, mule\tibetan.el, mule\viet-util.el, mule\vietnamese.el, unicode.el: Fix lots of warnings. Sync up some files to FSF 21.1. Copy over
all charset definitions from FSF 21.1, convert them to our format,
and stick them in the relevant files. Eventually we will actually
be able to dump these files (though they may not quite work).
autoload.el: Support defun*, defmacro*.
mule/mule-composite.el, mule/mule-composite-stub.el: New file, stubs for
nonexistent composition funs/vars.
mule/viet-chars.el, dumped-lisp.el: Account for these changes.
font.el, mouse.el, msw-font-menu.el, printer.el, startup.el: fix warnings.
| author | ben |
|---|---|
| date | Sat, 16 Mar 2002 10:39:19 +0000 |
| parents | 79940b592197 |
| children | c10d0c3f965f |
line wrap: on
line diff
--- a/lisp/mule/japan-util.el Fri Mar 15 11:00:56 2002 +0000 +++ b/lisp/mule/japan-util.el Sat Mar 16 10:39:19 2002 +0000 @@ -1,8 +1,9 @@ -;;; japan-util.el --- utilities for Japanese -*- coding: iso-2022-7bit; -*- +;;; japan-util.el --- utilities for Japanese -*- coding: iso-2022-7bit; -*- ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN. ;; Licensed to the Free Software Foundation. +;; Copyright (C) 2001 Free Software Foundation, Inc. ;; Keywords: mule, multilingual, Japanese @@ -23,7 +24,9 @@ ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. -;;; Synched up with: Emacs 21.0.103 (language/japan-util.el). +;;; Synched up with: Emacs 21.1 (language/japan-util.el). + +;;; Commentary: ;;; Code: @@ -104,7 +107,7 @@ (defconst japanese-symbol-table '((?\$B!!(B ?\ ) (?$B!$(B ?, ?(I$(B) (?$B!%(B ?. ?(I!(B) (?$B!"(B ?, ?(I$(B) (?$B!#(B ?. ?(I!(B) (?$B!&(B nil ?(I%(B) (?$B!'(B ?:) (?$B!((B ?\;) (?$B!)(B ??) (?$B!*(B ?!) (?$B!+(B nil ?(I^(B) (?$B!,(B nil ?(I_(B) - (?$B!-(B ?') (?$B!.(B ?`) (?$B!0(B ?^) (?$B!2(B ?_) (?$B!<(B ?-) (?$B!=(B ?-) (?$B!>(B ?-) + (?$B!-(B ?') (?$B!.(B ?`) (?$B!0(B ?^) (?$B!2(B ?_) (?$B!<(B ?- ?(I0(B) (?$B!=(B ?-) (?$B!>(B ?-) (?$B!?(B ?/) (?$B!@(B ?\\) (?$B!A(B ?~) (?$B!C(B ?|) (?$B!F(B ?`) (?$B!G(B ?') (?$B!H(B ?\") (?$B!I(B ?\") (?\$B!J(B ?\() (?\$B!K(B ?\)) (?\$B!N(B ?[) (?\$B!O(B ?]) (?\$B!P(B ?{) (?\$B!Q(B ?}) (?$B!R(B ?<) (?$B!S(B ?>) (?$B!\(B ?+) (?$B!](B ?-) (?$B!a(B ?=) (?$B!c(B ?<) (?$B!d(B ?>) @@ -202,9 +205,9 @@ Optional argument ASCII-ONLY non-nil means to return only ASCII character." (if (stringp obj) (japanese-string-conversion obj 'japanese-hankaku-region ascii-only) - (or (get-char-code-property obj 'ascii) - (and (not ascii-only) + (or (and (not ascii-only) (get-char-code-property obj 'jisx0201)) + (get-char-code-property obj 'ascii) obj))) ;;;###autoload @@ -283,9 +286,9 @@ (goto-char (point-min)) (while (re-search-forward "\\cj" nil t) (let* ((zenkaku (preceding-char)) - (hankaku (or (get-char-code-property zenkaku 'ascii) - (and (not ascii-only) - (get-char-code-property zenkaku 'jisx0201))))) + (hankaku (or (and (not ascii-only) + (get-char-code-property zenkaku 'jisx0201)) + (get-char-code-property zenkaku 'ascii)))) (if hankaku (japanese-replace-region (match-beginning 0) (match-end 0) hankaku)))))))