Patch

Douglas Katzman <[email protected]> Fri, 21 Apr 2017 17:11:27 -0400
Newsgroups gmane.lisp.slime.devel,gmane.lisp.steel-bank.devel
Message-ID <CAOrNasx1xTB8L_mz_p4BsGWW0Mb+UxcBG4ie7HujjFfdvh-Low@mail.gmail.com>
Please apply this forward-and-backward-compatible change for SBCL
0001-Use-predicates-not-widetags.patch (text/x-patch, 1.6 KB)
From 6d6f2b5abce043786e021430e8f8bcc8bb28f714 Mon Sep 17 00:00:00 2001
From: Douglas Katzman <[email protected]>
Date: Fri, 21 Apr 2017 17:10:11 -0400
Subject: [PATCH] Use predicates, not widetags

---
 swank/sbcl.lisp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/swank/sbcl.lisp b/swank/sbcl.lisp
index aaa2604c..9b21d800 100644
--- a/swank/sbcl.lisp
+++ b/swank/sbcl.lisp
@@ -1581,22 +1581,21 @@ stack."
                             append (label-value-line i value))))))))
 
 (defmethod emacs-inspect ((o function))
-  (let ((header (sb-kernel:widetag-of o)))
-    (cond ((= header sb-vm:simple-fun-header-widetag)
+    (cond ((sb-kernel:simple-fun-p o)
                    (label-value-line*
                     (:name (sb-kernel:%simple-fun-name o))
                     (:arglist (sb-kernel:%simple-fun-arglist o))
                     (:next (sb-kernel:%simple-fun-next o))
                     (:type (sb-kernel:%simple-fun-type o))
                     (:code (sb-kernel:fun-code-header o))))
-          ((= header sb-vm:closure-header-widetag)
+          ((sb-kernel:closurep o)
                    (append
                     (label-value-line :function (sb-kernel:%closure-fun o))
                     `("Closed over values:" (:newline))
                     (loop for i below (1- (sb-kernel:get-closure-length o))
                           append (label-value-line
                                   i (sb-kernel:%closure-index-ref o i)))))
-          (t (call-next-method o)))))
+          (t (call-next-method o))))
 
 (defmethod emacs-inspect ((o sb-kernel:code-component))
   (append
-- 
2.12.2.816.g2cccc81164-goog