diff options
| author | Richard M. Stallman | 2014-04-02 13:21:34 -0400 |
|---|---|---|
| committer | Richard M. Stallman | 2014-04-02 13:21:34 -0400 |
| commit | 4fd68bf6cc1dce6c95001fbbac95cef32c86359d (patch) | |
| tree | 04d7e94dcdf18481392c751fdc2e124f879e67d0 | |
| parent | ed859c7aea4db00135a2c0e692895b3d13e99351 (diff) | |
| download | emacs-4fd68bf6cc1dce6c95001fbbac95cef32c86359d.tar.gz emacs-4fd68bf6cc1dce6c95001fbbac95cef32c86359d.zip | |
Revert subr.el workaround for GC bug.
* subr.el (set-transient-map): Comment out previous change.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/subr.el | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 294eb110691..f754e5e852b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-04-02 Richard Stallman <rms@gnu.org> | ||
| 2 | |||
| 3 | * subr.el (set-transient-map): Comment out previous change. | ||
| 4 | |||
| 1 | 2014-04-02 Glenn Morris <rgm@gnu.org> | 5 | 2014-04-02 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * menu-bar.el (menu-bar-file-menu): | 7 | * 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." | |||
| 4316 | (remove-hook 'pre-command-hook clearfun) | 4316 | (remove-hook 'pre-command-hook clearfun) |
| 4317 | (when on-exit (funcall on-exit)) | 4317 | (when on-exit (funcall on-exit)) |
| 4318 | ;; Comment out the fset if you want to debug the GC bug. | 4318 | ;; Comment out the fset if you want to debug the GC bug. |
| 4319 | (fset clearfun nil) | 4319 | ;;; (fset clearfun nil) |
| 4320 | (set clearfun nil))))) | 4320 | ;;; (set clearfun nil) |
| 4321 | )))) | ||
| 4321 | (add-hook 'pre-command-hook clearfun) | 4322 | (add-hook 'pre-command-hook clearfun) |
| 4322 | (internal-push-keymap map 'overriding-terminal-local-map))) | 4323 | (internal-push-keymap map 'overriding-terminal-local-map))) |
| 4323 | 4324 | ||