# HG changeset patch
# User Juri Linkov <juri@jurta.org>
# Date 1275591000 -10800
# Node ID f4a583b69ffa8228e1de775f4bca84e32631ad98
# Parent  30e304f37b04ae98a19a5ab9a9b84eb2a1a2439c
* src/buffer.c (Fother_buffer): Add CHECK_FRAME.
(Fswitch_to_buffer): Remove unused variable `err'.

diff -r 30e304f37b04 -r f4a583b69ffa src/ChangeLog
--- a/src/ChangeLog	Thu Jun 03 13:22:27 2010 -0400
+++ b/src/ChangeLog	Thu Jun 03 21:50:00 2010 +0300
@@ -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 -r 30e304f37b04 -r f4a583b69ffa src/buffer.c
--- a/src/buffer.c	Thu Jun 03 13:22:27 2010 -0400
+++ b/src/buffer.c	Thu Jun 03 21:50:00 2010 +0300
@@ -1300,6 +1300,8 @@
   if (NILP (frame))
     frame = selected_frame;
 
+  CHECK_FRAME (frame);
+
   tail = Vbuffer_alist;
   pred = frame_buffer_predicate (frame);
 
@@ -1785,8 +1787,6 @@
      (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