summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/language/japan-util.el10
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)))))))