From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 5 Mar 1994 20:32:35 +0000 (+0000)
Subject: (save_excursion_restore): Don't call Vrun_hooks if nil.
X-Git-Tag: emacs-19.34~9646
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9fed2b18527d163fa2d9134295371aead803b2e1;p=emacs.git

(save_excursion_restore): Don't call Vrun_hooks if nil.
---

diff --git a/src/editfns.c b/src/editfns.c
index e12e39e82f1..037c00d3c8b 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -324,10 +324,13 @@ save_excursion_restore (info)
 
   tem1 = current_buffer->mark_active;
   current_buffer->mark_active = Fcdr (tem);
-  if (! NILP (current_buffer->mark_active))
-    call1 (Vrun_hooks, intern ("activate-mark-hook"));
-  else if (! NILP (tem1))
-    call1 (Vrun_hooks, intern ("deactivate-mark-hook"));
+  if (!NILP (Vrun_hooks))
+    {
+      if (! NILP (current_buffer->mark_active))
+	call1 (Vrun_hooks, intern ("activate-mark-hook"));
+      else if (! NILP (tem1))
+	call1 (Vrun_hooks, intern ("deactivate-mark-hook"));
+    }
   return Qnil;
 }