Mercurial > emacs
changeset 108880:f4a583b69ffa
* src/buffer.c (Fother_buffer): Add CHECK_FRAME.
(Fswitch_to_buffer): Remove unused variable `err'.
author | Juri Linkov <juri@jurta.org> |
---|---|
date | Thu, 03 Jun 2010 21:50:00 +0300 |
parents | 30e304f37b04 |
children | 5582106cddf0 |
files | src/ChangeLog src/buffer.c |
diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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