XEmacs 21.4.15

[chise/xemacs-chise.git.1] / src / buffer.c

diff --git a/src/buffer.c b/src/buffer.c
index a1620b7..bd44a47 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -356,7 +356,7 @@ get_buffer (Lisp_Object name, int error_if_deleted_or_does_not_exist)
 struct buffer *
 decode_buffer (Lisp_Object buffer, int allow_string)
 {
 struct buffer *
 decode_buffer (Lisp_Object buffer, int allow_string)
 {

-  if (NILP (buffer))
+  if (NILP (buffer) || (!POINTER_TYPE_P( XTYPE(buffer))))

     return current_buffer;
 
   if (allow_string && STRINGP (buffer))
     return current_buffer;
 
   if (allow_string && STRINGP (buffer))

@@ -998,8 +998,8 @@ The ordering is for this frame; If second optional argument FRAME
 is provided, then the ordering is for that frame.  If the second arg
 is t, then the global ordering is returned.
 
 is provided, then the ordering is for that frame.  If the second arg
 is t, then the global ordering is returned.
 

-Note: In FSF Emacs, this function takes two arguments: BUFFER and
-VISIBLE-OK.
+Note: In FSF Emacs, this function takes the arguments in the order of
+BUFFER, VISIBLE-OK and FRAME.

 */
        (buffer, frame, visible_ok))
 {
 */
        (buffer, frame, visible_ok))
 {