aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2007-07-15 17:56:23 +0000
committerRichard M. Stallman2007-07-15 17:56:23 +0000
commit0a2ea418fcf2061ad0cc0e88e98f1cbf9363278a (patch)
tree7798441aa9d4fa3863a0a0a9a8e413c1e1ae8a36
parent98738cd927eb3769566816595d5c644be9ca69bd (diff)
downloademacs-0a2ea418fcf2061ad0cc0e88e98f1cbf9363278a.tar.gz
emacs-0a2ea418fcf2061ad0cc0e88e98f1cbf9363278a.zip
(isearch-mode, isearch-done): Delete unintended code in previous change.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/isearch.el4
2 files changed, 3 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2a89382a5cd..6fd0a3b3e44 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12007-07-15 Richard Stallman <rms@gnu.org> 12007-07-15 Richard Stallman <rms@gnu.org>
2 2
3 * isearch.el (isearch-mode, isearch-done):
4 Delete unintended code in previous change.
5
3 * ps-print.el (ps-default-bg): Change to White. 6 * ps-print.el (ps-default-bg): Change to White.
4 7
52007-07-15 Aaron Hawley <aaronh@garden.org> 82007-07-15 Aaron Hawley <aaronh@garden.org>
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 1804233847f..71e5e4bccd3 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -674,8 +674,6 @@ is treated as a regexp. See \\[isearch-forward] for more info."
674 (make-local-variable 'input-method-function)) 674 (make-local-variable 'input-method-function))
675 (setq input-method-function nil) 675 (setq input-method-function nil)
676 676
677 (setq cursor-in-echo-area t)
678
679 (looking-at "") 677 (looking-at "")
680 (setq isearch-window-configuration 678 (setq isearch-window-configuration
681 (if isearch-slow-terminal-mode (current-window-configuration) nil)) 679 (if isearch-slow-terminal-mode (current-window-configuration) nil))
@@ -800,8 +798,6 @@ NOPUSH is t and EDIT is t."
800 (setq input-method-function isearch-input-method-function) 798 (setq input-method-function isearch-input-method-function)
801 (kill-local-variable 'input-method-function)) 799 (kill-local-variable 'input-method-function))
802 800
803 (setq cursor-in-echo-area nil)
804
805 (force-mode-line-update) 801 (force-mode-line-update)
806 802
807 ;; If we ended in the middle of some intangible text, 803 ;; If we ended in the middle of some intangible text,