From: Karl Heuer <kwzh@gnu.org>
Date: Tue, 21 May 1996 17:24:24 +0000 (+0000)
Subject: (Fprin1_to_string): Preserve Vdeactivate_mark.
X-Git-Tag: emacs-19.34~592
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2a42e8f6ac76be9765a5a6de69ec8489554c4eaa;p=emacs.git

(Fprin1_to_string): Preserve Vdeactivate_mark.
---

diff --git a/src/print.c b/src/print.c
index 600dcda55b0..22b5c140b22 100644
--- a/src/print.c
+++ b/src/print.c
@@ -527,7 +527,14 @@ second argument NOESCAPE is non-nil.")
   int old_point = -1;
   int start_point;
   Lisp_Object original, printcharfun;
-  struct gcpro gcpro1;
+  struct gcpro gcpro1, gcpro2;
+  Lisp_Object tem;
+
+  /* Save and restore this--we are altering a buffer
+     but we don't want to deactivate the mark just for that.
+     No need for specbind, since errors deactivate the mark.  */
+  tem = Vdeactivate_mark;
+  GCPRO2 (object, tem);
 
   printcharfun = Vprin1_to_string_buffer;
   PRINTPREPARE;
@@ -538,9 +545,10 @@ second argument NOESCAPE is non-nil.")
   set_buffer_internal (XBUFFER (Vprin1_to_string_buffer));
   object = Fbuffer_string ();
 
-  GCPRO1 (object);
   Ferase_buffer ();
   set_buffer_internal (old);
+
+  Vdeactivate_mark = tem;
   UNGCPRO;
 
   return object;