* lisp.h (make_local_string): Nitpick indent.

* print.c (Fprin1_to_string): Remove unused GCPROs.

diff --git a/src/ChangeLog b/src/ChangeLog
index 8433127b7c2c78bccbd75ad0e20c469f5517e9d9..6f76ddd0cda46e88ee7f22a2d4973e89ac9761a7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-11  Dmitry Antipov  <dmantipov@yandex.ru>
+
+       * lisp.h (make_local_string): Nitpick indent.
+       * print.c (Fprin1_to_string): Remove unused GCPROs.
+
 2014-09-11  Paul Eggert  <eggert@cs.ucla.edu>
 
        Pacify --enable-gcc-warnings when no window system is used.

diff --git a/src/lisp.h b/src/lisp.h
index 468e8f9fa1c8e6ce5cfc4fd452ef3c8a0ebc2a02..9cfcb24489196ff5626f3ae85d02eb49008df089 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -4594,8 +4594,8 @@ verify (sizeof (struct Lisp_Cons) == sizeof (union Aligned_Cons));
        Lisp_Object string_;                                            \
        if (nbytes_ <= MAX_ALLOCA - sizeof (struct Lisp_String) - 1)    \
         {                                                              \
-          struct Lisp_String *ptr_ = alloca (sizeof (struct Lisp_String) + 1 \
-                                             + nbytes_);               \
+          struct Lisp_String *ptr_                                     \
+            = alloca (sizeof (struct Lisp_String) + 1 + nbytes_);      \
           string_ = local_string_init (ptr_, data_, nbytes_);          \
         }                                                              \
        else                                                            \

diff --git a/src/print.c b/src/print.c
index d6ed3e412848051313c32b64e16ea18b433d3cb8..7381db61211cc352b50c740416de41f9ad2349b6 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -583,7 +583,6 @@ A printed representation of an object is text which describes that object.  */)
 {
   Lisp_Object printcharfun;
   bool prev_abort_on_gc;
-  /* struct gcpro gcpro1, gcpro2; */
   Lisp_Object save_deactivate_mark;
   ptrdiff_t count = SPECPDL_INDEX ();
   struct buffer *previous;
@@ -597,7 +596,6 @@ A printed representation of an object is text which describes that object.  */)
        but we don't want to deactivate the mark just for that.
        No need for specbind, since errors deactivate the mark.  */
     save_deactivate_mark = Vdeactivate_mark;
-    /* GCPRO2 (object, save_deactivate_mark); */
     prev_abort_on_gc = abort_on_gc;
     abort_on_gc = 1;
 
@@ -621,7 +619,6 @@ A printed representation of an object is text which describes that object.  */)
   set_buffer_internal (previous);
 
   Vdeactivate_mark = save_deactivate_mark;
-  /* UNGCPRO; */
 
   abort_on_gc = prev_abort_on_gc;
   return unbind_to (count, object);