* src/buffer.c (Fother_buffer): Add CHECK_FRAME.

(Fswitch_to_buffer): Remove unused variable `err'.

2 files changed, 7 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 864d873e30e..49fb791c6dd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-03  Juri Linkov  <juri@jurta.org>
+
+        * buffer.c (Fother_buffer): Add CHECK_FRAME.
+        (Fswitch_to_buffer): Remove unused variable `err'.
+
 2010-06-03  Glenn Morris  <rgm@gnu.org>
 
         * m/template.h (NO_SOCK_SIGIO): Remove, no longer used.
diff --git a/src/buffer.c b/src/buffer.c
index b19286c6ea9..3762b33bdaf 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1300,6 +1300,8 @@ If BUFFER is omitted or nil, some interesting buffer is returned.  */)
   if (NILP (frame))
     frame = selected_frame;
 
+  CHECK_FRAME (frame);
+
   tail = Vbuffer_alist;
   pred = frame_buffer_predicate (frame);
 
@@ -1785,8 +1787,6 @@ messing with the window-buffer correspondences.  */)
      (buffer_or_name, norecord)
      Lisp_Object buffer_or_name, norecord;
 {
-  char *err;
-
   if (EQ (buffer_or_name, Fwindow_buffer (selected_window)))
     {
       /* Basically a NOP.  Avoid signalling an error in the case where