Changeset 13951 for branches

Timestamp:

Jul 9, 2010, 8:44:09 PM (14 years ago)

Author:

R. Matthew Emerson

Message:

Merge changes from trunk.

Location:

branches/rme-fpe

Files:

• . (modified) (1 prop)
• contrib (deleted)
• lib/pprint.lisp (modified) (2 diffs)

branches/rme-fpe/lib/pprint.lisp

@@ -950 +950 @@
   (let ((ostream (xp-out-stream xp))
         (len (xp-buffer-ptr xp)))
-    (when (commit-hook *print-pprint-dispatch*)
+    (when (and *print-pprint-dispatch* (commit-hook *print-pprint-dispatch*))
       (funcall (commit-hook *print-pprint-dispatch*) xp len 0))
     (when ostream      
@@ -1002 +1002 @@
       (throw 'line-limit-abbreviation-exit T))
     (setf (xp-line-no xp)(%i+ 1 (xp-line-no xp)))
-    (when (commit-hook *print-pprint-dispatch*)
+    (when (and *print-pprint-dispatch* (commit-hook *print-pprint-dispatch*))
       (funcall (commit-hook *print-pprint-dispatch*) xp out-point prefix-end))
     (let ((bstream (xp-out-stream xp)))