procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge from trunk

Browse source
This commit is contained in:
Joakim Verona 2013-08-27 18:12:47 +02:00
commit 9d6363e6a7
2 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lisp/ChangeLog
View file

@ -1,3 +1,14 @@
2013-08-27 Juri Linkov <juri@jurta.org>
* isearch.el (isearch-other-meta-char): Don't store kmacro commands
in the keyboard macro. (Bug#15126)
2013-08-27 Juri Linkov <juri@jurta.org>
* isearch.el (isearch-quote-char): Comment out converting unibyte
to multibyte, thus syncing with its `quoted-insert' counterpart.
(Bug#15166)
2013-08-27 Martin Rudalics <rudalics@gmx.at>
* window.el (display-buffer-use-some-window): Add missing

19
lisp/isearch.el
View file

@ -2386,6 +2386,13 @@ Isearch mode."
(isearch-unread-key-sequence keylist)
(setq main-event (car unread-command-events))
;; Don't store special commands in the keyboard macro.
(let (overriding-terminal-local-map)
(when (memq (key-binding key)
'(kmacro-start-macro
kmacro-end-macro kmacro-end-and-call-macro))
(cancel-kbd-macro-events)))
;; If we got a mouse click event, that event contains the
;; window clicked on. maybe it was read with the buffer
;; it was clicked on. If so, that buffer, not the current one,
@ -2430,10 +2437,14 @@ With argument, add COUNT copies of the character."
(if (subregexp-context-p isearch-string (length isearch-string))
(isearch-process-search-string "[ ]" " ")
(isearch-process-search-char char count))
(and enable-multibyte-characters
(>= char ?\200)
(<= char ?\377)
(setq char (unibyte-char-to-multibyte char)))
;; This used to assume character codes 0240 - 0377 stand for
;; characters in some single-byte character set, and converted them
;; to Emacs characters. But in 23.1 this feature is deprecated
;; in favor of inserting the corresponding Unicode characters.
;; (and enable-multibyte-characters
;; (>= char ?\200)
;; (<= char ?\377)
;; (setq char (unibyte-char-to-multibyte char)))
(isearch-process-search-char char count))))
(defun isearch-printing-char (&optional char count)