Remove prototype for no_switch_window.

2 files changed, 12 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ea52334bb07..ed825a8e954 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2008-10-21  Martin Rudalics  <rudalics@gmx.at>
+
+        * buffer.c (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
+        Rename arg "buffer" to "buffer_or_name".
+        (Fkill_buffer): Rename arg "buffer" to "buffer_or_name" and make
+        it optional.
+        (no_switch_window): Remove since the return value is not used.
+        (Fswitch_to_buffer):  Rename arg "buffer" to "buffer_or_name".
+        Consider window as dedicated when Fwindow_dedicated_p returns a
+        non-nil value.
+        * lisp.h: Remove prototype for no_switch_window.
+
 2008-10-21  Jan Djärv  <jan.h.d@swipnet.se>
 
         * emacs.c (main): Unconditionally set PER_LINUX32 and exec
diff --git a/src/lisp.h b/src/lisp.h
index 38c7b8920a0..df7f9669175 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2841,7 +2841,6 @@ extern void set_time_zone_rule P_ ((char *));
 /* defined in buffer.c */
 extern int mouse_face_overlay_overlaps P_ ((Lisp_Object));
 extern void nsberror P_ ((Lisp_Object)) NO_RETURN;
-extern char *no_switch_window P_ ((Lisp_Object window));
 EXFUN (Fset_buffer_multibyte, 1);
 EXFUN (Foverlay_start, 1);
 EXFUN (Foverlay_end, 1);