aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Paul Wallington2002-09-26 09:59:44 +0000
committerJohn Paul Wallington2002-09-26 09:59:44 +0000
commit6d1b1d7b831ae47ae45bb5b7c983e0010b390a91 (patch)
tree0a7cbd761a825a46c052cbc4977fa87e9295014e /src
parent54580ab2035a3d6960d181be08ffebba2eb65581 (diff)
downloademacs-6d1b1d7b831ae47ae45bb5b7c983e0010b390a91.tar.gz
emacs-6d1b1d7b831ae47ae45bb5b7c983e0010b390a91.zip
(Fminibufferp): Add an optional `buffer' argument.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/minibuf.c17
2 files changed, 17 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2396c9562ad..0a45273d24c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12002-09-26 John Paul Wallington <jpw@shootybangbang.com>
2
3 * minibuf.c (Fminibufferp): Add an optional `buffer' argument.
4
12002-09-26 Kenichi Handa <handa@etl.go.jp> 52002-09-26 Kenichi Handa <handa@etl.go.jp>
2 6
3 * xfaces.c (try_font_list): New arg PREFER_FACE_FAMILY. If it is 7 * xfaces.c (try_font_list): New arg PREFER_FACE_FAMILY. If it is
diff --git a/src/minibuf.c b/src/minibuf.c
index 4b5185abdb1..bb391d44d7c 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -319,13 +319,22 @@ read_minibuf_noninteractive (map, initial, prompt, backup_n, expflag,
319} 319}
320 320
321DEFUN ("minibufferp", Fminibufferp, 321DEFUN ("minibufferp", Fminibufferp,
322 Sminibufferp, 0, 0, 0, 322 Sminibufferp, 0, 1, 0,
323 doc: /* Return t if the current buffer is a minibuffer. */) 323 doc: /* Return t if BUFFER is a minibuffer.
324 () 324No argument or nil as argument means use current buffer as BUFFER.*/)
325 (buffer)
326 Lisp_Object buffer;
325{ 327{
326 Lisp_Object tem; 328 Lisp_Object tem;
327 329
328 tem = Fmemq (Fcurrent_buffer (), Vminibuffer_list); 330 if (NILP (buffer))
331 buffer = Fcurrent_buffer ();
332 else if (STRINGP (buffer))
333 buffer = Fget_buffer (buffer);
334 else
335 CHECK_BUFFER (buffer);
336
337 tem = Fmemq (buffer, Vminibuffer_list);
329 return ! NILP (tem) ? Qt : Qnil; 338 return ! NILP (tem) ? Qt : Qnil;
330} 339}
331 340