Mercurial > emacs
changeset 37913:49a0ec256ceb
(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>
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Mon, 28 May 2001 11:03:17 +0000 |
| parents | 351539ffdaba |
| children | 055740f4bc36 |
| files | lisp/language/japan-util.el |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/language/japan-util.el Mon May 28 07:24:57 2001 +0000 +++ b/lisp/language/japan-util.el Mon May 28 11:03:17 2001 +0000 @@ -201,9 +201,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 @@ -282,9 +282,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)))))))