From: Dmitry Antipov Date: Thu, 11 Sep 2014 06:21:55 +0000 (+0400) Subject: * lisp.h (make_local_string): Nitpick indent. X-Git-Tag: emacs-25.0.90~2635^2~679^2~308 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6e5fd4936d0d56abe13352a6b80446e62fab040a;p=emacs.git * lisp.h (make_local_string): Nitpick indent. * print.c (Fprin1_to_string): Remove unused GCPROs. --- diff --git a/src/ChangeLog b/src/ChangeLog index 8433127b7c2..6f76ddd0cda 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-09-11 Dmitry Antipov + + * lisp.h (make_local_string): Nitpick indent. + * print.c (Fprin1_to_string): Remove unused GCPROs. + 2014-09-11 Paul Eggert Pacify --enable-gcc-warnings when no window system is used. diff --git a/src/lisp.h b/src/lisp.h index 468e8f9fa1c..9cfcb244891 100644 --- 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 d6ed3e41284..7381db61211 100644 --- 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);