Fix minor problems found by static checking.

* alloc.c, lisp.h (SAVE_TYPE_INT_OBJ, make_save_int_obj):
Remove; now unused.
* buffer.h (decode_buffer): Doc and indentation fixes.
* fns.c (Qstring_collate_lessp, Qstring_collate_equalp): Now static.

5 files changed, 13 insertions, 16 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 562edf09b9f..0b53c80d9e1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2014-09-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix minor problems found by static checking.
+        * alloc.c, lisp.h (SAVE_TYPE_INT_OBJ, make_save_int_obj):
+        Remove; now unused.
+        * buffer.h (decode_buffer): Doc and indentation fixes.
+        * fns.c (Qstring_collate_lessp, Qstring_collate_equalp): Now static.
+
 2014-09-17  Dmitry Antipov  <dmantipov@yandex.ru>
 
         Avoid clang-specific warnings.
diff --git a/src/alloc.c b/src/alloc.c
index d28db1e58b8..2dd5fae7d8e 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -3657,17 +3657,6 @@ make_save_ptr_int (void *a, ptrdiff_t b)
   return val;
 }
 
-Lisp_Object
-make_save_int_obj (ptrdiff_t a, Lisp_Object b)
-{
-  Lisp_Object val = allocate_misc (Lisp_Misc_Save_Value);
-  struct Lisp_Save_Value *p = XSAVE_VALUE (val);
-  p->save_type = SAVE_TYPE_INT_OBJ;
-  p->data[0].integer = a;
-  p->data[1].object = b;
-  return val;
-}
-
 #if ! (defined USE_X_TOOLKIT || defined USE_GTK)
 Lisp_Object
 make_save_ptr_ptr (void *a, void *b)
diff --git a/src/buffer.h b/src/buffer.h
index 61ef15d9c3d..284cfa7b4a8 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -1088,8 +1088,9 @@ extern void mmap_set_vars (bool);
 extern void restore_buffer (Lisp_Object);
 extern void set_buffer_if_live (Lisp_Object);
 
-INLINE
-struct buffer *
+/* Return B as a struct buffer pointer, defaulting to the current buffer.  */
+
+INLINE struct buffer *
 decode_buffer (Lisp_Object b)
 {
   return NILP (b) ? current_buffer : (CHECK_BUFFER (b), XBUFFER (b));
diff --git a/src/fns.c b/src/fns.c
index 3461de5db08..2ddff0fa818 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -41,7 +41,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "xterm.h"
 #endif
 
-Lisp_Object Qstring_lessp, Qstring_collate_lessp, Qstring_collate_equalp;
+Lisp_Object Qstring_lessp;
+static Lisp_Object Qstring_collate_lessp, Qstring_collate_equalp;
 static Lisp_Object Qprovide, Qrequire;
 static Lisp_Object Qyes_or_no_p_history;
 Lisp_Object Qcursor_in_echo_area;
diff --git a/src/lisp.h b/src/lisp.h
index 1a6c69559ce..9cbc7473fc1 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1967,7 +1967,6 @@ enum Lisp_Save_Type
     SAVE_TYPE_OBJ_OBJ_OBJ_OBJ
       = SAVE_OBJECT + (SAVE_TYPE_OBJ_OBJ_OBJ << SAVE_SLOT_BITS),
     SAVE_TYPE_PTR_INT = SAVE_POINTER + (SAVE_INTEGER << SAVE_SLOT_BITS),
-    SAVE_TYPE_INT_OBJ = SAVE_INTEGER + (SAVE_OBJECT << SAVE_SLOT_BITS),
     SAVE_TYPE_PTR_OBJ = SAVE_POINTER + (SAVE_OBJECT << SAVE_SLOT_BITS),
     SAVE_TYPE_PTR_PTR = SAVE_POINTER + (SAVE_POINTER << SAVE_SLOT_BITS),
     SAVE_TYPE_FUNCPTR_PTR_OBJ
@@ -3798,7 +3797,6 @@ extern Lisp_Object make_save_obj_obj_obj_obj (Lisp_Object, Lisp_Object,
 extern Lisp_Object make_save_ptr (void *);
 extern Lisp_Object make_save_ptr_int (void *, ptrdiff_t);
 extern Lisp_Object make_save_ptr_ptr (void *, void *);
-extern Lisp_Object make_save_int_obj (ptrdiff_t, Lisp_Object);
 extern Lisp_Object make_save_funcptr_ptr_obj (void (*) (void), void *,
                                               Lisp_Object);
 extern Lisp_Object make_save_memory (Lisp_Object *, ptrdiff_t);