[Emacs-diffs] Changes to emacs/lisp/international/isearch-x.el

[Juri Linkov]

Index: emacs/lisp/international/isearch-x.el
diff -c emacs/lisp/international/isearch-x.el:1.20 
emacs/lisp/international/isearch-x.el:1.21
*** emacs/lisp/international/isearch-x.el:1.20  Mon Jul  4 17:22:27 2005
--- emacs/lisp/international/isearch-x.el       Mon Jul 18 14:32:51 2005
***************
*** 98,106 ****
  (defun isearch-process-search-multibyte-characters (last-char)
    (if (eq this-command 'isearch-printing-char)
        (let ((overriding-terminal-local-map nil)
!           (prompt (concat (isearch-message-prefix)))
            (minibuffer-local-map isearch-minibuffer-local-map)
!           str)
        (if isearch-input-method-function
            (let (;; Let input method work rather tersely.
                  (input-method-verbose-flag nil))
--- 98,106 ----
  (defun isearch-process-search-multibyte-characters (last-char)
    (if (eq this-command 'isearch-printing-char)
        (let ((overriding-terminal-local-map nil)
!           (prompt (isearch-message-prefix))
            (minibuffer-local-map isearch-minibuffer-local-map)
!           str junk-hist)
        (if isearch-input-method-function
            (let (;; Let input method work rather tersely.
                  (input-method-verbose-flag nil))
***************
*** 108,115 ****
                    (cons 'with-input-method
                          (cons last-char unread-command-events))
                    ;; Inherit current-input-method in a minibuffer.
!                   str (read-string prompt isearch-message nil nil t))
!             (if (not str)
                  ;; All inputs were deleted while the input method
                  ;; was working.
                  (setq str "")
--- 108,115 ----
                    (cons 'with-input-method
                          (cons last-char unread-command-events))
                    ;; Inherit current-input-method in a minibuffer.
!                   str (read-string prompt isearch-message 'junk-hist nil t))
!             (if (or (not str) (< (length str) (length isearch-message)))
                  ;; All inputs were deleted while the input method
                  ;; was working.
                  (setq str "")
***************
*** 124,130 ****
            (setq unread-command-events
                  (cons 'with-keyboard-coding
                        (cons last-char unread-command-events))
!                 str (read-string prompt)))
  
        (if (and str (> (length str) 0))
            (let ((unread-command-events nil))
--- 124,130 ----
            (setq unread-command-events
                  (cons 'with-keyboard-coding
                        (cons last-char unread-command-events))
!                 str (read-string prompt nil 'junk-hist)))
  
        (if (and str (> (length str) 0))
            (let ((unread-command-events nil))