Mercurial > emacs
changeset 19408:7457b6e05a60
(isearch-multibyte-characters-flag): Deleted.
(isearch-mode): Do not bind isearch-multibyte-characters-flag and
isearch-input-method.
(isearch-printing-char): Use current-input-method instead of
isearch-input-method.
(isearch-message-prefix): Likewise.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Mon, 18 Aug 1997 10:53:05 +0000 |
| parents | 50444ccff3f2 |
| children | c816908e9589 |
| files | lisp/isearch.el |
| diffstat | 1 files changed, 3 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/isearch.el Mon Aug 18 10:51:45 1997 +0000 +++ b/lisp/isearch.el Mon Aug 18 10:53:05 1997 +0000 @@ -369,9 +369,6 @@ ;; Flag to indicate a yank occurred, so don't move the cursor. (defvar isearch-yank-flag nil) -;; Flag to indicate that we are searching multibyte characaters. -(defvar isearch-multibyte-characters-flag nil) - ;;; A function to be called after each input character is processed. ;;; (It is not called after characters that exit the search.) ;;; It is only set from an optional argument to `isearch-mode'. @@ -521,8 +518,6 @@ isearch-other-end nil isearch-small-window nil isearch-just-started t - isearch-multibyte-characters-flag nil - isearch-input-method nil isearch-opoint (point) search-ring-yank-pointer nil @@ -1183,7 +1178,7 @@ (defun isearch-printing-char () "Add this ordinary printing character to the search string and search." (interactive) - (if isearch-input-method + (if current-input-method (isearch-process-search-multibyte-characters (isearch-last-command-char)) (isearch-process-search-char (isearch-last-command-char)))) @@ -1419,8 +1414,8 @@ (if isearch-regexp "regexp " "") (if nonincremental "search" "I-search") (if isearch-forward "" " backward") - (if isearch-input-method - (concat " [" isearch-input-method-title "]: ") + (if current-input-method + (concat " [" current-input-method-title "]: ") ": ") ))) (aset m 0 (upcase (aref m 0)))