Mercurial > emacs
comparison src/minibuf.c @ 90203:187d6a1f84f7
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-71
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 485-492)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 92-94)
- Merge from emacs--cvs-trunk--0
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 22 Jul 2005 08:27:27 +0000 |
parents | f9a65d7ebd29 ea5296a45331 |
children | 2d92f5c9d6ae |
comparison
equal
deleted
inserted
replaced
90202:7597b4a23c3b | 90203:187d6a1f84f7 |
---|---|
347 } | 347 } |
348 | 348 |
349 DEFUN ("minibuffer-prompt-end", Fminibuffer_prompt_end, | 349 DEFUN ("minibuffer-prompt-end", Fminibuffer_prompt_end, |
350 Sminibuffer_prompt_end, 0, 0, 0, | 350 Sminibuffer_prompt_end, 0, 0, 0, |
351 doc: /* Return the buffer position of the end of the minibuffer prompt. | 351 doc: /* Return the buffer position of the end of the minibuffer prompt. |
352 Return (point-min) if current buffer is not a mini-buffer. */) | 352 Return (point-min) if current buffer is not a minibuffer. */) |
353 () | 353 () |
354 { | 354 { |
355 /* This function is written to be most efficient when there's a prompt. */ | 355 /* This function is written to be most efficient when there's a prompt. */ |
356 Lisp_Object beg, end, tem; | 356 Lisp_Object beg, end, tem; |
357 beg = make_number (BEGV); | 357 beg = make_number (BEGV); |
1012 DEFUN ("eval-minibuffer", Feval_minibuffer, Seval_minibuffer, 1, 2, 0, | 1012 DEFUN ("eval-minibuffer", Feval_minibuffer, Seval_minibuffer, 1, 2, 0, |
1013 doc: /* Return value of Lisp expression read using the minibuffer. | 1013 doc: /* Return value of Lisp expression read using the minibuffer. |
1014 Prompt with PROMPT. If non-nil, optional second arg INITIAL-CONTENTS | 1014 Prompt with PROMPT. If non-nil, optional second arg INITIAL-CONTENTS |
1015 is a string to insert in the minibuffer before reading. | 1015 is a string to insert in the minibuffer before reading. |
1016 \(INITIAL-CONTENTS can also be a cons of a string and an integer. Such | 1016 \(INITIAL-CONTENTS can also be a cons of a string and an integer. Such |
1017 arguments are used as in `read-from-minibuffer') */) | 1017 arguments are used as in `read-from-minibuffer'.) */) |
1018 (prompt, initial_contents) | 1018 (prompt, initial_contents) |
1019 Lisp_Object prompt, initial_contents; | 1019 Lisp_Object prompt, initial_contents; |
1020 { | 1020 { |
1021 return Feval (Fread_minibuffer (prompt, initial_contents)); | 1021 return Feval (Fread_minibuffer (prompt, initial_contents)); |
1022 } | 1022 } |
1756 | 1756 |
1757 if ((CONSP (alist) && (!SYMBOLP (XCAR (alist)) || NILP (XCAR (alist)))) | 1757 if ((CONSP (alist) && (!SYMBOLP (XCAR (alist)) || NILP (XCAR (alist)))) |
1758 || NILP (alist)) | 1758 || NILP (alist)) |
1759 { | 1759 { |
1760 tem = Fassoc_string (string, alist, completion_ignore_case ? Qt : Qnil); | 1760 tem = Fassoc_string (string, alist, completion_ignore_case ? Qt : Qnil); |
1761 if NILP (tem) | 1761 if (NILP (tem)) |
1762 return Qnil; | 1762 return Qnil; |
1763 } | 1763 } |
1764 else if (VECTORP (alist)) | 1764 else if (VECTORP (alist)) |
1765 { | 1765 { |
1766 /* Bypass intern-soft as that loses for nil. */ | 1766 /* Bypass intern-soft as that loses for nil. */ |