aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Antipov2014-09-11 10:21:55 +0400
committerDmitry Antipov2014-09-11 10:21:55 +0400
commit6e5fd4936d0d56abe13352a6b80446e62fab040a (patch)
tree9dca4408ab965e4e317d61bcc1203da61083e3af
parentb3ed13e84d591eeb2f0dde2e7c2558e7abcc66ca (diff)
downloademacs-6e5fd4936d0d56abe13352a6b80446e62fab040a.tar.gz
emacs-6e5fd4936d0d56abe13352a6b80446e62fab040a.zip
* lisp.h (make_local_string): Nitpick indent.
* print.c (Fprin1_to_string): Remove unused GCPROs.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/lisp.h4
-rw-r--r--src/print.c3
3 files changed, 7 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8433127b7c2..6f76ddd0cda 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12014-09-11 Dmitry Antipov <dmantipov@yandex.ru>
2
3 * lisp.h (make_local_string): Nitpick indent.
4 * print.c (Fprin1_to_string): Remove unused GCPROs.
5
12014-09-11 Paul Eggert <eggert@cs.ucla.edu> 62014-09-11 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Pacify --enable-gcc-warnings when no window system is used. 8 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));
4594 Lisp_Object string_; \ 4594 Lisp_Object string_; \
4595 if (nbytes_ <= MAX_ALLOCA - sizeof (struct Lisp_String) - 1) \ 4595 if (nbytes_ <= MAX_ALLOCA - sizeof (struct Lisp_String) - 1) \
4596 { \ 4596 { \
4597 struct Lisp_String *ptr_ = alloca (sizeof (struct Lisp_String) + 1 \ 4597 struct Lisp_String *ptr_ \
4598 + nbytes_); \ 4598 = alloca (sizeof (struct Lisp_String) + 1 + nbytes_); \
4599 string_ = local_string_init (ptr_, data_, nbytes_); \ 4599 string_ = local_string_init (ptr_, data_, nbytes_); \
4600 } \ 4600 } \
4601 else \ 4601 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. */)
583{ 583{
584 Lisp_Object printcharfun; 584 Lisp_Object printcharfun;
585 bool prev_abort_on_gc; 585 bool prev_abort_on_gc;
586 /* struct gcpro gcpro1, gcpro2; */
587 Lisp_Object save_deactivate_mark; 586 Lisp_Object save_deactivate_mark;
588 ptrdiff_t count = SPECPDL_INDEX (); 587 ptrdiff_t count = SPECPDL_INDEX ();
589 struct buffer *previous; 588 struct buffer *previous;
@@ -597,7 +596,6 @@ A printed representation of an object is text which describes that object. */)
597 but we don't want to deactivate the mark just for that. 596 but we don't want to deactivate the mark just for that.
598 No need for specbind, since errors deactivate the mark. */ 597 No need for specbind, since errors deactivate the mark. */
599 save_deactivate_mark = Vdeactivate_mark; 598 save_deactivate_mark = Vdeactivate_mark;
600 /* GCPRO2 (object, save_deactivate_mark); */
601 prev_abort_on_gc = abort_on_gc; 599 prev_abort_on_gc = abort_on_gc;
602 abort_on_gc = 1; 600 abort_on_gc = 1;
603 601
@@ -621,7 +619,6 @@ A printed representation of an object is text which describes that object. */)
621 set_buffer_internal (previous); 619 set_buffer_internal (previous);
622 620
623 Vdeactivate_mark = save_deactivate_mark; 621 Vdeactivate_mark = save_deactivate_mark;
624 /* UNGCPRO; */
625 622
626 abort_on_gc = prev_abort_on_gc; 623 abort_on_gc = prev_abort_on_gc;
627 return unbind_to (count, object); 624 return unbind_to (count, object);