From 112fbe35153b2cb66b4daca32a84b18192c814db Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Sun, 13 Aug 2017 10:06:45 -0400 Subject: [PATCH] Minor simplification for byte-compile-constant-push * lisp/emacs-lisp/bytecomp.el (byte-compile-constant): Move the meat of the code from here... (byte-compile-constant-push): ... to here. No need to bind byte-compile--for-effect anymore. --- lisp/emacs-lisp/bytecomp.el | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 48bbd618712..dc8839e6f99 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -3342,15 +3342,14 @@ for symbols generated by the byte compiler itself." (defun byte-compile-constant (const) (if byte-compile--for-effect (setq byte-compile--for-effect nil) - (when (symbolp const) - (byte-compile-set-symbol-position const)) - (byte-compile-out 'byte-constant (byte-compile-get-constant const)))) + (inline (byte-compile-push-constant const)))) ;; Use this for a constant that is not the value of its containing form. ;; This ignores byte-compile--for-effect. (defun byte-compile-push-constant (const) - (let ((byte-compile--for-effect nil)) - (inline (byte-compile-constant const)))) + (when (symbolp const) + (byte-compile-set-symbol-position const)) + (byte-compile-out 'byte-constant (byte-compile-get-constant const))) ;; Compile those primitive ordinary functions ;; which have special byte codes just for speed. -- 2.39.2