Commit 57cfde4d authored by Juri Linkov's avatar Juri Linkov
Browse files

(isearch-process-search-multibyte-characters): Remove unneeded `concat'.

Add intermediate values to `junk-hist' instead of `minibuffer-history'.
Test the length of `str'.
parent 6f2df0f4
2005-07-18 Juri Linkov <juri@jurta.org>
* isearch.el (isearch-mode-map): Remove key bindings for regexp
chars * ? } |.
(isearch-fallback): Don't call `isearch-process-search-char'.
(isearch-*-char, isearch-}-char, isearch-|-char): Remove functions.
(isearch-process-search-char): Call `isearch-fallback' for regexp
chars * ? } |.
(isearch-return-char): Make obsolete with `make-obsolete' instead
of simply documenting it as obsolete in the docstring.
(isearch-fallback): Refill docstring.
* international/isearch-x.el
(isearch-process-search-multibyte-characters): Remove unneeded `concat'.
Add intermediate values to `junk-hist' instead of `minibuffer-history'.
Test the length of `str'.
2005-07-18 Juanma Barranquero <lekktu@gmail.com>
 
* allout.el (allout-resolve-xref): Fix typos in error strings.
......
......@@ -98,9 +98,9 @@
(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)))
(prompt (isearch-message-prefix))
(minibuffer-local-map isearch-minibuffer-local-map)
str)
str junk-hist)
(if isearch-input-method-function
(let (;; Let input method work rather tersely.
(input-method-verbose-flag nil))
......@@ -108,8 +108,8 @@
(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)
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,7 +124,7 @@
(setq unread-command-events
(cons 'with-keyboard-coding
(cons last-char unread-command-events))
str (read-string prompt)))
str (read-string prompt nil 'junk-hist)))
(if (and str (> (length str) 0))
(let ((unread-command-events nil))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment