diff options
| author | Karoly Lorentey | 2004-07-18 21:49:24 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2004-07-18 21:49:24 +0000 |
| commit | 31d7e9bc5a474c2da8c40f4812ea3e09cd5fb82c (patch) | |
| tree | 729a3c238e43ed5625290e994d9ef0d09c18241a /lisp/replace.el | |
| parent | 4cb2afc64f004ba91ff0bd37cf8ca6669b228988 (diff) | |
| parent | cdfa3eccb179fe579a5e38949d0a2ad3d2757524 (diff) | |
| download | emacs-31d7e9bc5a474c2da8c40f4812ea3e09cd5fb82c.tar.gz emacs-31d7e9bc5a474c2da8c40f4812ea3e09cd5fb82c.zip | |
Merged in changes from CVS trunk.
Patches applied:
* lorentey@elte.hu--2004/emacs--hacks--0--patch-2
Prevent special events from appending dashes to the echo string.
* lorentey@elte.hu--2004/emacs--hacks--0--patch-4
Added ChangeLog entry.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-454
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-455
Bash the dashes
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-456
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-457
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-458
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-459
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-460
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-219
Diffstat (limited to 'lisp/replace.el')
| -rw-r--r-- | lisp/replace.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/replace.el b/lisp/replace.el index 60c28d6c48a..f81c6f53914 100644 --- a/lisp/replace.el +++ b/lisp/replace.el | |||
| @@ -786,7 +786,8 @@ If the value is nil, don't highlight the buffer names specially." | |||
| 786 | nil | 786 | nil |
| 787 | nil | 787 | nil |
| 788 | nil | 788 | nil |
| 789 | 'regexp-history))) | 789 | 'regexp-history |
| 790 | default))) | ||
| 790 | (if (equal input "") | 791 | (if (equal input "") |
| 791 | default | 792 | default |
| 792 | input)) | 793 | input)) |