* buffer.c (Qclone_number): Remove for now, as it's unused.

(record_buffer, Funrecord_buffer): Rename local to avoid shadowing.
(record_buffer): Remove unused local.
* frame.c (other_visible_frames, frame_buffer_list): Now static.
(set_frame_buffer_list): Remove; unused.
* frame.h (other_visible_frames): Remove decl.
* keyboard.h (menu_items_inuse): Declare only if USE_GTK || USE_MOTIF.
* lisp.h (frame_buffer_list, set_frame_buffer_list): Remove decls.
(add_gpm_wait_descriptor, delete_gpm_wait_descriptor): Declare only
if HAVE_GPM.
* menu.c (menu_items_inuse): Now static unless USE_GTK || USE_MOTIF.
* process.c (add_gpm_wait_descriptor, delete_gpm_wait_descriptor):
Define only if HAVE_GPM.
* widget.c (EmacsFrameResize, emacsFrameClassRec): Now static.
(update_hints_inhibit): Remove; never set.  All uses removed.
* widgetprv.h (emacsFrameClassRec): Remove decl.
* window.c (delete_deletable_window): Now returns void, since it
wasn't returning anything.
(compare_window_configurations): Remove unused locals.
* xfns.c (x_set_scroll_bar_default_width): Remove unused locals.
* xmenu.c (x_menu_set_in_use): Define only if USE_GTK || USE_MOTIF.
Omit no-longer-needed #ifdef USE_X_TOOLKIT, since USE_X_TOOLKIT is
implied by USE_GTK || USE_MOTIF.
(dialog_selection_callback) [!USE_GTK]: Prefer intptr_t for integers
the same widths as pointers.  This follows up on the 2011-05-06 patch.
* xterm.c (x_alloc_lighter_color_for_widget): Define only if USE_LUCID.
* xterm.h: Likewise.
(x_menu_set_in_use): Declare only if USE_GTK || USE_MOTIF.

1 files changed, 9 insertions, 10 deletions

diff --git a/src/buffer.c b/src/buffer.c
index bd059cdbe14..7030fea1002 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -139,7 +139,7 @@ static Lisp_Object Qoverlayp;
 
 Lisp_Object Qpriority, Qbefore_string, Qafter_string;
 
-static Lisp_Object Qclone_number, Qevaporate;
+static Lisp_Object Qevaporate;
 
 Lisp_Object Qmodification_hooks;
 Lisp_Object Qinsert_in_front_hooks;
@@ -1664,9 +1664,8 @@ with SIGHUP.  */)
 void
 record_buffer (Lisp_Object buffer)
 {
-  Lisp_Object aelt, link, tem;
+  Lisp_Object aelt, aelt_cons, tem;
   register struct frame *f = XFRAME (selected_frame);
-  register struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f));
 
   CHECK_BUFFER (buffer);
 
@@ -1676,10 +1675,10 @@ record_buffer (Lisp_Object buffer)
   tem = Vinhibit_quit;
   Vinhibit_quit = Qt;
   aelt = Frassq (buffer, Vbuffer_alist);
-  link = Fmemq (aelt, Vbuffer_alist);
+  aelt_cons = Fmemq (aelt, Vbuffer_alist);
   Vbuffer_alist = Fdelq (aelt, Vbuffer_alist);
-  XSETCDR (link, Vbuffer_alist);
-  Vbuffer_alist = link;
+  XSETCDR (aelt_cons, Vbuffer_alist);
+  Vbuffer_alist = aelt_cons;
   Vinhibit_quit = tem;
 
   /* Update buffer list of selected frame.  */
@@ -1714,7 +1713,7 @@ DEFUN ("unrecord-buffer", Funrecord_buffer, Sunrecord_buffer, 1, 1, 0,
 Return BUFFER.  */)
   (Lisp_Object buffer)
 {
-  Lisp_Object aelt, link, tem;
+  Lisp_Object aelt, aelt_cons, tem;
   register struct frame *f = XFRAME (selected_frame);
 
   CHECK_BUFFER (buffer);
@@ -1725,10 +1724,10 @@ Return BUFFER.  */)
   tem = Vinhibit_quit;
   Vinhibit_quit = Qt;
   aelt = Frassq (buffer, Vbuffer_alist);
-  link = Fmemq (aelt, Vbuffer_alist);
+  aelt_cons = Fmemq (aelt, Vbuffer_alist);
   Vbuffer_alist = Fdelq (aelt, Vbuffer_alist);
-  XSETCDR (link, Qnil);
-  Vbuffer_alist = nconc2 (Vbuffer_alist, link);
+  XSETCDR (aelt_cons, Qnil);
+  Vbuffer_alist = nconc2 (Vbuffer_alist, aelt_cons);
   Vinhibit_quit = tem;
 
   /* Update buffer lists of selected frame.  */