commit 700afe62a4cbd9ecf24551ddc4747e6319fb51a2 (HEAD, refs/remotes/origin/master) Author: Tino Calancha Date: Sun Jun 5 01:06:12 2016 +0300 isearch-edit-string resumes multi isearches * lisp/isearch.el (with-isearch-suspended): Remember and restore multi-isearch variables. (Bug#21663) diff --git a/lisp/isearch.el b/lisp/isearch.el index 7360a0b..eabf05b 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -1259,6 +1259,11 @@ You can update the global isearch variables by setting new values to (isearch-adjusted isearch-adjusted) (isearch-yank-flag isearch-yank-flag) (isearch-error isearch-error) + + (multi-isearch-file-list-new multi-isearch-file-list) + (multi-isearch-buffer-list-new multi-isearch-buffer-list) + (multi-isearch-next-buffer-function multi-isearch-next-buffer-current-function) + (multi-isearch-current-buffer-new multi-isearch-current-buffer) ;;; Don't bind this. We want isearch-search, below, to set it. ;;; And the old value won't matter after that. ;;; (isearch-other-end isearch-other-end) @@ -1313,7 +1318,10 @@ You can update the global isearch variables by setting new values to isearch-message isearch-new-message isearch-forward isearch-new-forward isearch-regexp-function isearch-new-regexp-function - isearch-case-fold-search isearch-new-case-fold) + isearch-case-fold-search isearch-new-case-fold + multi-isearch-current-buffer multi-isearch-current-buffer-new + multi-isearch-file-list multi-isearch-file-list-new + multi-isearch-buffer-list multi-isearch-buffer-list-new) ;; Restore the minibuffer message before moving point. (funcall (or isearch-message-function #'isearch-message) nil t) commit abfe07ad61d6f95c3dc0b1aee179a397f1d0f9fc Author: Eli Zaretskii Date: Sat Jun 4 18:27:49 2016 +0300 Fix Eshell display when RTL characters are involved * lisp/eshell/esh-mode.el (eshell-mode): Set 'bidi-paragraph-direction' to 'left-to-right'. (Bug#23652) diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el index 074b94c..104841d 100644 --- a/lisp/eshell/esh-mode.el +++ b/lisp/eshell/esh-mode.el @@ -380,6 +380,11 @@ and the hook `eshell-exit-hook'." (make-local-variable 'eshell-modules-list) (setq eshell-modules-list modules-list)) + ;; This is to avoid making the paragraph base direction + ;; right-to-left if the first word just happens to start with a + ;; strong R2L character. + (setq bidi-paragraph-direction 'left-to-right) + ;; load extension modules into memory. This will cause any global ;; variables they define to be visible, since some of the core ;; modules sometimes take advantage of their functionality if used.