From 6739aa327c06a399ec93731cb742db1e89a98fb6 Mon Sep 17 00:00:00 2001 From: Mario Lang Date: Thu, 2 Apr 2020 08:28:29 +0200 Subject: [PATCH] Use `cl-gensym' to fix Emacs 25 compatibility (Fixes #24) `gensym' used to be an alias for `cl-gensym'. It was replaced with a "native" implementation in subr.el with Emacs 26.1. Go back to using `cl-gensym' to make sure Emacs 25 still works. --- el/sclang-help.el | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/el/sclang-help.el b/el/sclang-help.el index 6d5b2e5..e70a864 100644 --- a/el/sclang-help.el +++ b/el/sclang-help.el @@ -192,9 +192,9 @@ `(push (cons ,font-id (intern ,font-name)) (sclang-rtf-state-font-table ,state))) (defmacro sclang-rtf-state-apply (state) - (let ((pos (gensym)) - (font (gensym)) - (face (gensym))) + (let ((pos (cl-gensym)) + (font (cl-gensym)) + (face (cl-gensym))) `(with-current-buffer (sclang-rtf-state-output ,state) (let ((,pos (or (sclang-rtf-state-pos ,state) (point-min))) (,font (cdr (assq @@ -216,7 +216,7 @@ (setf (sclang-rtf-state-font ,state) ,font))) (defmacro sclang-rtf-state-push-face (state face) - (let ((list (gensym))) + (let ((list (cl-gensym))) `(let ((,list (sclang-rtf-state-face state))) (sclang-rtf-state-apply ,state) (unless (memq ,face ,list) @@ -224,7 +224,7 @@ (append ,list (list ,face))))))) (defmacro sclang-rtf-state-pop-face (state face) - (let ((list (gensym))) + (let ((list (cl-gensym))) `(let* ((,list (sclang-rtf-state-face ,state))) (sclang-rtf-state-apply ,state) (setf (sclang-rtf-state-face ,state) (delq ,face ,list))))) @@ -326,9 +326,9 @@ (define-key map "\C-c\C-v" 'sclang-edit-help-file)) (defmacro sclang-help-mode-limit-point-to-code (&rest body) - (let ((min (gensym)) - (max (gensym)) - (res (gensym))) + (let ((min (cl-gensym)) + (max (cl-gensym)) + (res (cl-gensym))) `(if (and (sclang-code-p (point)) (not (or (bobp) (eobp))) (sclang-code-p (1- (point)))