Fix macro hygiene issues

This commit is contained in:
Nathaniel Nicandro 2019-06-30 12:16:29 -05:00
parent 4c3168d53f
commit f5d852dc6d
2 changed files with 9 additions and 7 deletions

View file

@ -175,7 +175,7 @@ returned."
(declare (indent 3) (debug (symbolp symbolp form body))) (declare (indent 3) (debug (symbolp symbolp form body)))
`(let ((,beg (point-marker)) `(let ((,beg (point-marker))
(,end (point-marker))) (,end (point-marker)))
(set-marker-insertion-type end t) (set-marker-insertion-type ,end t)
(unwind-protect (unwind-protect
(prog1 ,bodyform ,@afterforms) (prog1 ,bodyform ,@afterforms)
(set-marker ,beg nil) (set-marker ,beg nil)

View file

@ -92,12 +92,14 @@ find the display in the REPL buffer. See
"Handle control codes in any produced output generated by evaluating BODY. "Handle control codes in any produced output generated by evaluating BODY.
After BODY is evaluated, call `jupyter-handle-control-codes' After BODY is evaluated, call `jupyter-handle-control-codes'
on the region inserted by BODY." on the region inserted by BODY."
(let ((beg (make-symbol "beg"))
(end (make-symbol "end")))
`(jupyter-with-insertion-bounds `(jupyter-with-insertion-bounds
beg end (progn ,@body) ,beg ,end (progn ,@body)
;; Handle continuation from previous messages ;; Handle continuation from previous messages
(when (eq (char-before beg) ?\r) (when (eq (char-before ,beg) ?\r)
(move-marker beg (1- beg))) (move-marker ,beg (1- ,beg)))
(jupyter-handle-control-codes beg end))) (jupyter-handle-control-codes ,beg ,end))))
;;; Fontificiation routines ;;; Fontificiation routines