[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/np/backports-26.2 0058ef3 6/9: Fix cl-print for ci
From: |
Noam Postavsky |
Subject: |
[Emacs-diffs] scratch/np/backports-26.2 0058ef3 6/9: Fix cl-print for circular sublists (Bug#31146) |
Date: |
Sun, 3 Jun 2018 08:02:32 -0400 (EDT) |
branch: scratch/np/backports-26.2
commit 0058ef3ad5fe6b8c20ce383dfe48363e9363575c
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>
Fix cl-print for circular sublists (Bug#31146)
* lisp/emacs-lisp/cl-print.el (cl-print-object) <cons>: Push each
element of list being printed onto cl-print--currently-printing.
* test/lisp/emacs-lisp/cl-print-tests.el (cl-print-circle-2): New
test.
(cherry picked from commit b8aa7ecf54c9b164a59f1b0e9f9fe90531dadd20)
---
lisp/emacs-lisp/cl-print.el | 9 ++++++---
test/lisp/emacs-lisp/cl-print-tests.el | 10 ++++++++++
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/lisp/emacs-lisp/cl-print.el b/lisp/emacs-lisp/cl-print.el
index de41d82..7c0e81c 100644
--- a/lisp/emacs-lisp/cl-print.el
+++ b/lisp/emacs-lisp/cl-print.el
@@ -62,9 +62,12 @@ call other entry points instead, such as `cl-prin1'."
(princ "(" stream)
(cl-print-object car stream)
(while (and (consp object)
- (not (if cl-print--number-table
- (numberp (gethash object cl-print--number-table))
- (memq object cl-print--currently-printing))))
+ (not (cond
+ (cl-print--number-table
+ (numberp (gethash object cl-print--number-table)))
+ ((memq object cl-print--currently-printing))
+ (t (push object cl-print--currently-printing)
+ nil))))
(princ " " stream)
(cl-print-object (pop object) stream))
(when object
diff --git a/test/lisp/emacs-lisp/cl-print-tests.el
b/test/lisp/emacs-lisp/cl-print-tests.el
index 660d5c8..d986c40 100644
--- a/test/lisp/emacs-lisp/cl-print-tests.el
+++ b/test/lisp/emacs-lisp/cl-print-tests.el
@@ -55,4 +55,14 @@
(let ((print-circle t))
(should (equal "(#1=(a . #1#) #1#)" (cl-prin1-to-string x))))))
+(ert-deftest cl-print-circle-2 ()
+ ;; Bug#31146.
+ (let ((x '(0 . #1=(0 . #1#))))
+ (let ((print-circle nil))
+ (should (string-match "\\`(0 0 . #[0-9])\\'"
+ (cl-prin1-to-string x))))
+ (let ((print-circle t))
+ (should (equal "(0 . #1=(0 . #1#))" (cl-prin1-to-string x))))))
+
+
;;; cl-print-tests.el ends here.
- [Emacs-diffs] branch scratch/np/backports-26.2 created (now 2305ee7), Noam Postavsky, 2018/06/03
- [Emacs-diffs] scratch/np/backports-26.2 4491b27 2/9: Fix CHECK_ALLOCATED_AND_LIVE abort during GC, Noam Postavsky, 2018/06/03
- [Emacs-diffs] scratch/np/backports-26.2 09d0493 4/9: Centralize Bug#30931 fix, Noam Postavsky, 2018/06/03
- [Emacs-diffs] scratch/np/backports-26.2 e54624a 1/9: Don't wait for visible frames to become visible, Noam Postavsky, 2018/06/03
- [Emacs-diffs] scratch/np/backports-26.2 0058ef3 6/9: Fix cl-print for circular sublists (Bug#31146),
Noam Postavsky <=
- [Emacs-diffs] scratch/np/backports-26.2 9c78312 3/9: Fix another case of freed markers in the undo-list (Bug#30931), Noam Postavsky, 2018/06/03
- [Emacs-diffs] scratch/np/backports-26.2 c1a5546 7/9: * lisp/epa.el (epa-decrypt-file): Apply epa-pinentry-mode (Bug#30363)., Noam Postavsky, 2018/06/03
- [Emacs-diffs] scratch/np/backports-26.2 47ab98e 8/9: esh-opt.el: Fix improper parsing of first argument (Bug#28323), Noam Postavsky, 2018/06/03
- [Emacs-diffs] scratch/np/backports-26.2 2305ee7 9/9: Fix bug#30846, along with misc cleanups found along the way, Noam Postavsky, 2018/06/03
- [Emacs-diffs] scratch/np/backports-26.2 67f164a 5/9: Revert "Make mail-extract-address-components return the user name more", Noam Postavsky, 2018/06/03