From 20ce031c4016c61e38945eb67916686b9c59932b Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 3 Mar 2008 21:07:12 +0000 Subject: [PATCH] (byte-compile-trueconstp, byte-compile-nilconstp): No recursion in defsubst. --- lisp/ChangeLog | 3 +++ lisp/emacs-lisp/byte-opt.el | 12 ++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7ca350a1a7f..417b4de04d0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2008-03-03 Stefan Monnier + * emacs-lisp/byte-opt.el (byte-compile-trueconstp) + (byte-compile-nilconstp): Can't use recursion in a defsubst. + * textmodes/tex-mode.el (latex-mode): Remove % from paragraph-separate so that M-q can fill comments. (tex-executable-exists-p, tex-compile): Extend with special syntax for diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index 92d83b0ef67..d65cf3904e9 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el @@ -632,20 +632,28 @@ (defsubst byte-compile-trueconstp (form) "Return non-nil if FORM always evaluates to a non-nil value." + (while (eq (car-safe form) 'progn) + (setq form (car (last (cdr form))))) (cond ((consp form) (case (car form) (quote (cadr form)) - (progn (byte-compile-trueconstp (car (last (cdr form))))))) + ;; Can't use recursion in a defsubst. + ;; (progn (byte-compile-trueconstp (car (last (cdr form))))) + )) ((not (symbolp form))) ((eq form t)) ((keywordp form)))) (defsubst byte-compile-nilconstp (form) "Return non-nil if FORM always evaluates to a nil value." + (while (eq (car-safe form) 'progn) + (setq form (car (last (cdr form))))) (cond ((consp form) (case (car form) (quote (null (cadr form))) - (progn (byte-compile-nilconstp (car (last (cdr form))))))) + ;; Can't use recursion in a defsubst. + ;; (progn (byte-compile-nilconstp (car (last (cdr form))))) + )) ((not (symbolp form)) nil) ((null form)))) -- 2.39.2