diff options
| author | Sean Whitton | 2025-03-12 10:09:09 +0800 |
|---|---|---|
| committer | Sean Whitton | 2025-03-12 10:09:09 +0800 |
| commit | 99852fb867e4d7d2090cbb82ff12d86d2a6ed9cc (patch) | |
| tree | 7d597de0644e89ee082f7d4c324a250d19cf4e88 /lisp/language | |
| parent | 85b147d32100d8da89366a19ab77f996fe011043 (diff) | |
| parent | 894b0e3a2fe064690eecda546f3b577886638140 (diff) | |
| download | emacs-99852fb867e4d7d2090cbb82ff12d86d2a6ed9cc.tar.gz emacs-99852fb867e4d7d2090cbb82ff12d86d2a6ed9cc.zip | |
Merge from origin/emacs-30
894b0e3a2fe ; Adapt comment in tramp.el
cc87717fa07 Add keyword placeholder to tramp.el
7d0d61d8549 Rewrite ERT manual introduction
b2f124f2a88 ; cperl-mode.el: Don't misinterpret exec_fcn as keyword exec
59d1aac49df Document return values of the various read-* functions
Diffstat (limited to 'lisp/language')
| -rw-r--r-- | lisp/language/japan-util.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/language/japan-util.el b/lisp/language/japan-util.el index c61e98c8fca..718c469d562 100644 --- a/lisp/language/japan-util.el +++ b/lisp/language/japan-util.el | |||
| @@ -317,7 +317,8 @@ Optional argument KATAKANA-ONLY non-nil means to convert only KATAKANA char." | |||
| 317 | ;;;###autoload | 317 | ;;;###autoload |
| 318 | (defun read-hiragana-string (prompt &optional initial-input) | 318 | (defun read-hiragana-string (prompt &optional initial-input) |
| 319 | "Read a Hiragana string from the minibuffer, prompting with string PROMPT. | 319 | "Read a Hiragana string from the minibuffer, prompting with string PROMPT. |
| 320 | If non-nil, second arg INITIAL-INPUT is a string to insert before reading." | 320 | If non-nil, second arg INITIAL-INPUT is a string to insert before reading. |
| 321 | Return the string read from the minibuffer." | ||
| 321 | (read-multilingual-string prompt initial-input "japanese-hiragana")) | 322 | (read-multilingual-string prompt initial-input "japanese-hiragana")) |
| 322 | 323 | ||
| 323 | ;; | 324 | ;; |