summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDmitry Antipov <dmantipov@yandex.ru>2014-09-11 10:21:55 +0400
committerDmitry Antipov <dmantipov@yandex.ru>2014-09-11 10:21:55 +0400
commit6e5fd4936d0d56abe13352a6b80446e62fab040a (patch)
tree9dca4408ab965e4e317d61bcc1203da61083e3af /src
parentb3ed13e84d591eeb2f0dde2e7c2558e7abcc66ca (diff)
downloademacs-6e5fd4936d0d56abe13352a6b80446e62fab040a.tar.gz
* lisp.h (make_local_string): Nitpick indent.
* print.c (Fprin1_to_string): Remove unused GCPROs.
Diffstat (limited to 'src')
-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 @@
+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 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);