(japanese-zenkaku-region): New optional arg KATAKANA-ONLY.

diff --git a/lisp/language/japan-util.el b/lisp/language/japan-util.el
index 6cd54e27114cbe37ed209a18a5b5a3f99f79df45..14932039e791111b574c0146b18935ebe0cfb2a4 100644 (file)
--- a/lisp/language/japan-util.el
+++ b/lisp/language/japan-util.el
@@ -291,16 +291,20 @@ Optional argument ASCII-ONLY non-nil means to convert only to ASCII char."
                                       hankaku)))))))
 
 ;;;###autoload
-(defun japanese-zenkaku-region (from to)
+(defun japanese-zenkaku-region (from to &optional katakana-only)
   "Convert hankaku' chars in the region to Japanese `zenkaku' chars.
 `Zenkaku' chars belong to `japanese-jisx0208'
-`Hankaku' chars belong to `ascii' or `japanese-jisx0201-kana'."
-  (interactive "r")
+`Hankaku' chars belong to `ascii' or `japanese-jisx0201-kana'.
+Optional argument KATAKANA-ONLY non-nil means to convert only KATAKANA char."
+  (interactive "r\nP")
   (save-restriction
     (narrow-to-region from to)
     (save-excursion
       (goto-char (point-min))
-      (while (re-search-forward "\\ca\\|\\ck" nil t)
+      (while (or (and katakana-only
+                     (re-search-forward "\\ck" nil t))
+                (and (not katakana-only)
+                     (re-search-forward "\\ca\\|\\ck" nil t)))
        (let* ((hankaku (preceding-char))
               (composition (get-char-code-property hankaku 'kana-composition))
               next slot)