branch: elpa/scad-mode
commit b130730a3123387e69c85cf10633701ea447fa2a
Author: Daniel Mendler <m...@daniel-mendler.de>
Commit: Daniel Mendler <m...@daniel-mendler.de>
Emacs 31 update
---
scad-mode.el | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/scad-mode.el b/scad-mode.el
index 938d7dfd0ac..590f2ecc018 100644
--- a/scad-mode.el
+++ b/scad-mode.el
@@ -300,7 +300,7 @@ Options are .stl, .off, .amf, .3mf, .csg, .dxf, .svg, .pdf,
.png,
(scad--preview-render))
;; Based on https://github.com/zk-phi/scad-preview
-(defun scad--preview-render (&rest _)
+(defun scad--preview-render (&optional _)
"Render image from current buffer."
(if (not (buffer-live-p scad--preview-buffer))
(scad--preview-status "Dead")
@@ -406,11 +406,13 @@ Options are .stl, .off, .amf, .3mf, .csg, .dxf, .svg,
.pdf, .png,
(add-hook 'kill-buffer-hook #'scad--preview-kill nil 'local)
(add-hook 'kill-buffer-hook #'scad--preview-delete nil 'local)
(add-hook 'window-size-change-functions
- ;; TODO On Emacs 31 `window-size-change-functions' run in the
current buffer
- (let ((buf (current-buffer)))
- (lambda (_)
- (with-current-buffer buf
- (scad--preview-render))))
+ ;; On Emacs 31 `window-size-change-functions' run in current buffer
+ (static-if (>= emacs-major-version 31)
+ #'scad--preview-render
+ (let ((buf (current-buffer)))
+ (lambda (_)
+ (with-current-buffer buf
+ (scad--preview-render)))))
nil 'local))
(defun scad-preview-projection ()
