diff options
| author | Alan Mackenzie <acm@muc.de> | 2023-03-07 15:26:20 +0000 |
|---|---|---|
| committer | Alan Mackenzie <acm@muc.de> | 2023-03-07 15:26:20 +0000 |
| commit | 29f65920fb49588dd4fa29b33e7ed024afc6ffb6 (patch) | |
| tree | 93f825c77b08a24c3f07bd0717de9f6144f16475 | |
| parent | fa83b236111ea024b75a8bb33b78a99f437a9a67 (diff) | |
| download | emacs-29f65920fb49588dd4fa29b33e7ed024afc6ffb6.tar.gz | |
safe-copy-tree. Correct mistakes from earlier patch.
* lisp/emacs-lisp/bytecomp.el (compile-defun): Remove unintended change.
* lisp/subr.el (safe-copy-tree--seen): Correct grammatical error in doc
string.
(safe-copy-tree): Delete hash table at end of function.
* doc/lispref/lists.texi (Building Lists): Add an "@end defun" line.
| -rw-r--r-- | doc/lispref/lists.texi | 1 | ||||
| -rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 9 | ||||
| -rw-r--r-- | lisp/subr.el | 9 |
3 files changed, 8 insertions, 11 deletions
diff --git a/doc/lispref/lists.texi b/doc/lispref/lists.texi index 911defbc211..3478049c84f 100644 --- a/doc/lispref/lists.texi +++ b/doc/lispref/lists.texi @@ -719,6 +719,7 @@ Normally, when @var{tree} is anything other than a cons cell, non-@code{nil}, it copies vectors and records too (and operates recursively on their elements). This function handles circular lists and vectors, and is thus slower than @code{copy-tree} for typical cases. +@end defun @defun flatten-tree tree This function returns a ``flattened'' copy of @var{tree}, that is, diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 243d4b11b5f..12850c27b88 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -2294,19 +2294,12 @@ With argument ARG, insert value in current buffer after the form." (symbols-with-pos-enabled t) (value (eval (displaying-byte-compile-warnings -;;;; NEW STOUGH, 2023-03-05 - (byte-run-strip-symbol-positions -;;;; END OF NEW STOUGH (byte-compile-sexp (let ((form (read-positioning-symbols (current-buffer)))) (push form byte-compile-form-stack) (eval-sexp-add-defvars form - start-read-position))) -;;;; NEW STOUGH, 2023-03-05 - ) -;;;; END OF NEW STOUGH - ) + start-read-position)))) lexical-binding))) (cond (arg (message "Compiling from buffer... done.") diff --git a/lisp/subr.el b/lisp/subr.el index 2066be581d1..e29c8ddd6c4 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -848,8 +848,8 @@ argument VECP, this copies vectors as well as conses." (defvar safe-copy-tree--seen nil "A hash table for conses/vectors/records already seen by safe-copy-tree-1. -It's key is a cons or vector/record seen by the algorithm, and its value is -the corresponding cons/vector/record in the copy.") +Its key is a cons or vector/record seen by the algorithm, and its +value is the corresponding cons/vector/record in the copy.") (defun safe-copy-tree--1 (tree &optional vecp) "Make a copy of TREE, taking circular structure into account. @@ -896,7 +896,10 @@ If TREE is a cons cell, this recursively copies both its car and its cdr. Contrast to `copy-sequence', which copies only along the cdrs. With second argument VECP, this copies vectors and records as well as conses." (setq safe-copy-tree--seen (make-hash-table :test #'eq)) - (safe-copy-tree--1 tree vecp)) + (unwind-protect + (safe-copy-tree--1 tree vecp) + (clrhash safe-copy-tree--seen) + (setq safe-copy-tree--seen nil))) ;;;; Various list-search functions. |