From: Richard M. Stallman <rms@gnu.org>
Date: Wed, 2 Apr 2014 17:21:34 +0000 (-0400)
Subject: Revert subr.el workaround for GC bug.
X-Git-Tag: emacs-25.0.90~2640^2~277
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4fd68bf6cc1dce6c95001fbbac95cef32c86359d;p=emacs.git

Revert subr.el workaround for GC bug.

* subr.el (set-transient-map): Comment out previous change.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 294eb110691..f754e5e852b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-02  Richard Stallman  <rms@gnu.org>
+
+	* subr.el (set-transient-map): Comment out previous change.
+
 2014-04-02  Glenn Morris  <rgm@gnu.org>
 
 	* menu-bar.el (menu-bar-file-menu):
diff --git a/lisp/subr.el b/lisp/subr.el
index 38ded7d70be..79d90862ed5 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -4316,8 +4316,9 @@ lookup sequence then continues."
                 (remove-hook 'pre-command-hook clearfun)
 		(when on-exit (funcall on-exit))
 ;; Comment out the fset if you want to debug the GC bug.
-		(fset clearfun nil)
-                (set clearfun nil)))))
+;;;		(fset clearfun nil)
+;;;             (set clearfun nil)
+		))))
     (add-hook 'pre-command-hook clearfun)
     (internal-push-keymap map 'overriding-terminal-local-map)))