Mercurial > emacs
comparison src/fileio.c @ 83632:cc587bfd19ca
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 781-792)
- Update from CVS
- Merge from gnus--rel--5.10
- Merge from emacs--rel--22
* emacs--rel--22 (patch 33-41)
* gnus--rel--5.10 (patch 226-228)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-21
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 11 Jun 2007 01:00:07 +0000 |
parents | dc002877ce12 61b6704f4b26 |
children | 0ece58f6e0aa |
comparison
equal
deleted
inserted
replaced
83631:7d63b897231b | 83632:cc587bfd19ca |
---|---|
6430 /* In this case, Fcompleting_read has not added an element | 6430 /* In this case, Fcompleting_read has not added an element |
6431 to the history. Maybe we should. */ | 6431 to the history. Maybe we should. */ |
6432 if (! replace_in_history) | 6432 if (! replace_in_history) |
6433 add_to_history = 1; | 6433 add_to_history = 1; |
6434 | 6434 |
6435 val = empty_string; | 6435 val = empty_unibyte_string; |
6436 } | 6436 } |
6437 | 6437 |
6438 unbind_to (count, Qnil); | 6438 unbind_to (count, Qnil); |
6439 UNGCPRO; | 6439 UNGCPRO; |
6440 if (NILP (val)) | 6440 if (NILP (val)) |