diff options
| author | Gerd Moellmann <gerd@gnu.org> | 2001-05-28 11:03:17 +0000 |
|---|---|---|
| committer | Gerd Moellmann <gerd@gnu.org> | 2001-05-28 11:03:17 +0000 |
| commit | c79cb28320c392df58574025e0f09208a50f23e3 (patch) | |
| tree | ab0a87262b0490670c9e84b7731404ff3bc22190 /lisp | |
| parent | 719bb352adc90907db9a84275d5e53f51b0e9c9a (diff) | |
| download | emacs-c79cb28320c392df58574025e0f09208a50f23e3.tar.gz emacs-c79cb28320c392df58574025e0f09208a50f23e3.tar.bz2 emacs-c79cb28320c392df58574025e0f09208a50f23e3.zip | |
(japanese-hankaku): Prefer the charset
`jisx0201' when the optional argument `ascii-only' is not specified.
(japanese-hankaku-region): Ditto.
From Katsumi Yamaoka <yamaoka@jpl.org>
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/language/japan-util.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/language/japan-util.el b/lisp/language/japan-util.el index 282926db926..36dbefb4af7 100644 --- a/lisp/language/japan-util.el +++ b/lisp/language/japan-util.el @@ -201,9 +201,9 @@ The argument object is not altered--the value is a copy. 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 @@ -282,9 +282,9 @@ Optional argument ASCII-ONLY non-nil means to convert only to ASCII char." (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))))))) |