diff options
author | Karoly Lorentey <karoly@lorentey.hu> | 2007-04-22 12:12:29 +0000 |
---|---|---|
committer | Karoly Lorentey <karoly@lorentey.hu> | 2007-04-22 12:12:29 +0000 |
commit | e18c709364b095ea0be8ecabe458ac9a642a252f (patch) | |
tree | efe814a842f932f387b3947c572bf43a548d17ef /lisp/replace.el | |
parent | 81088e260b086fe28f36964f32b6338210ec6fd8 (diff) | |
parent | 9f25e707aaad5ed14a9448e9c5d345ff0bdbc5a7 (diff) | |
download | emacs-e18c709364b095ea0be8ecabe458ac9a642a252f.tar.gz |
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-660
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-661
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-662
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-663
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-664
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-665
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-666
Fix read-only prompt problem in isearch
* emacs@sv.gnu.org/emacs--devo--0--patch-667
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-668
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-669
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-670
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-671
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-672
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-673
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-206
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-207
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-208
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-600
Diffstat (limited to 'lisp/replace.el')
-rw-r--r-- | lisp/replace.el | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lisp/replace.el b/lisp/replace.el index 5b970681ea7..a42f4ff4b57 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -849,10 +849,12 @@ Compatibility function for \\[next-error] invocations." (defface match '((((class color) (min-colors 88) (background light)) - :background "Tan") + :background "yellow") (((class color) (min-colors 88) (background dark)) :background "RoyalBlue3") - (((class color) (min-colors 8)) + (((class color) (min-colors 8) (background light)) + :background "yellow" :foreground "black") + (((class color) (min-colors 8) (background dark)) :background "blue" :foreground "white") (((type tty) (class mono)) :inverse-video t) @@ -1049,7 +1051,9 @@ See also `multi-occur'." (with-current-buffer occur-buf (occur-mode) - (let ((inhibit-read-only t)) + (let ((inhibit-read-only t) + ;; Don't generate undo entries for creation of the initial contents. + (buffer-undo-list t)) (erase-buffer) (let ((count (occur-engine regexp active-bufs occur-buf @@ -1086,8 +1090,6 @@ See also `multi-occur'." title-face prefix-face match-face keep-props) (with-current-buffer out-buf (let ((globalcount 0) - ;; Don't generate undo entries for creation of the initial contents. - (buffer-undo-list t) (coding nil)) ;; Map over all the buffers (dolist (buf buffers) |