aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2011-09-18 23:28:45 +0300
committerJuri Linkov2011-09-18 23:28:45 +0300
commit80302a817e470464590b79cda28aefaa36edadf6 (patch)
tree9b9ea2eb61bd3c036aaf4526e8972f8c7ed4be2a
parent46c5cf6650c166aca02bc2305d0c4e2784e1de3a (diff)
downloademacs-80302a817e470464590b79cda28aefaa36edadf6.tar.gz
emacs-80302a817e470464590b79cda28aefaa36edadf6.zip
Preserve current isearch case-fold value in `isearch-edit-string'.
* lisp/isearch.el (isearch-edit-string): Bind `isearch-new-case-fold' to `isearch-case-fold-search' and restore its original value after the `isearch-mode' call.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/isearch.el4
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c8e9faa3a2b..e32fe1505b6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
12011-09-18 Juri Linkov <juri@jurta.org> 12011-09-18 Juri Linkov <juri@jurta.org>
2 2
3 * isearch.el (isearch-edit-string): Bind `isearch-new-case-fold'
4 to `isearch-case-fold-search' and restore its original value
5 after the `isearch-mode' call.
6
72011-09-18 Juri Linkov <juri@jurta.org>
8
3 * progmodes/grep.el (grep-process-setup): Don't check code for 1 9 * progmodes/grep.el (grep-process-setup): Don't check code for 1
4 because `zgrep' returns 1 for successful matches (bug#9226). 10 because `zgrep' returns 1 for successful matches (bug#9226).
5 11
diff --git a/lisp/isearch.el b/lisp/isearch.el
index e07f1429119..81e0b4bf3b7 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1110,6 +1110,7 @@ The following additional command keys are active while editing.
1110 (isearch-new-message isearch-message) 1110 (isearch-new-message isearch-message)
1111 (isearch-new-forward isearch-forward) 1111 (isearch-new-forward isearch-forward)
1112 (isearch-new-word isearch-word) 1112 (isearch-new-word isearch-word)
1113 (isearch-new-case-fold isearch-case-fold-search)
1113 1114
1114 (isearch-regexp isearch-regexp) 1115 (isearch-regexp isearch-regexp)
1115 (isearch-op-fun isearch-op-fun) 1116 (isearch-op-fun isearch-op-fun)
@@ -1203,7 +1204,8 @@ The following additional command keys are active while editing.
1203 (setq isearch-string isearch-new-string 1204 (setq isearch-string isearch-new-string
1204 isearch-message isearch-new-message 1205 isearch-message isearch-new-message
1205 isearch-forward isearch-new-forward 1206 isearch-forward isearch-new-forward
1206 isearch-word isearch-new-word)) 1207 isearch-word isearch-new-word
1208 isearch-case-fold-search isearch-new-case-fold))
1207 1209
1208 ;; Empty isearch-string means use default. 1210 ;; Empty isearch-string means use default.
1209 (when (= 0 (length isearch-string)) 1211 (when (= 0 (length isearch-string))