Mercurial > emacs
comparison src/minibuf.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 | 5a45becb5728 d27a83277a4b |
children | 0ece58f6e0aa |
comparison
equal
deleted
inserted
replaced
83631:7d63b897231b | 83632:cc587bfd19ca |
---|---|
527 store them away before we can GC. Don't need to protect | 527 store them away before we can GC. Don't need to protect |
528 BACKUP_N because we use the value only if it is an integer. */ | 528 BACKUP_N because we use the value only if it is an integer. */ |
529 GCPRO5 (map, initial, val, ambient_dir, input_method); | 529 GCPRO5 (map, initial, val, ambient_dir, input_method); |
530 | 530 |
531 if (!STRINGP (prompt)) | 531 if (!STRINGP (prompt)) |
532 prompt = empty_string; | 532 prompt = empty_unibyte_string; |
533 | 533 |
534 if (!enable_recursive_minibuffers | 534 if (!enable_recursive_minibuffers |
535 && minibuf_level > 0) | 535 && minibuf_level > 0) |
536 { | 536 { |
537 if (EQ (selected_window, minibuf_window)) | 537 if (EQ (selected_window, minibuf_window)) |