Hello both, How about the attached patch. I didn't want to introduce a new variable, but I didn't like changing a user customization more.
Best regards, -- Al
>From 006a9c2e30bd5053988ce48cedf20e3aa5714fb4 Mon Sep 17 00:00:00 2001 From: Al Haji-Ali <[email protected]> Date: Thu, 12 Mar 2026 22:51:59 +0000 Subject: [PATCH] Require buframe before use. * preview.el (preview--buframe-error): New variable. (preview--update-buframe): Require buframe before use. --- preview.el | 112 +++++++++++++++++++++++++++++------------------------ 1 file changed, 62 insertions(+), 50 deletions(-) diff --git a/preview.el b/preview.el index b253ef889c..9ba2ac3e4f 100644 --- a/preview.el +++ b/preview.el @@ -509,6 +509,11 @@ where: `buframe-position-right-of-overlay'). FRAME-PARAMETERS Alist of extra frame parameters. BUF-PARAMETERS Alist of buffer-local variables and values." + :set (lambda (sym val) + (when (eq (or (and (consp val) (car val)) val) + 'buframe) + (require 'buframe)) + (set-default sym val)) :group 'preview-appearance :type '(choice (const :tag "Before source (default)" before-string) @@ -4586,61 +4591,68 @@ If not a regular release, the date of the last change.") (declare-function buframe-find "ext:buframe" (&optional frame-or-name buffer parent noerror)) +(defvar preview--buframe-error t + "When non-nil, issue a one-time error if loading buframe fails.") + (defun preview--update-buframe (&optional force) "Show or hide a buframe popup depending on overlays at point. The frame is not updated if the `buframe' property has not changed, unless FORCE is non-nil." - (when (featurep 'buframe) - (let* ((frame-name "auctex-preview") - (buf-name " *auctex-preview-buffer*") - (old-frame (buframe-find frame-name nil nil t))) - (if-let* ((ov (cl-find-if - (lambda (ov) (when (overlay-get ov 'buframe) ov)) - (overlays-at (point)))) - (str (overlay-get ov 'buframe))) - (unless (and (not force) - old-frame - (pcase (frame-parameter old-frame 'auctex-preview) - (`(,o . ,s) (and (eq o ov) (eq s str))))) - (let* ((buf (buframe-make-buffer buf-name - (car-safe - (cddr (cdr-safe - preview-at-point-placement))))) - (max-image-size - (if (integerp max-image-size) - max-image-size - ;; Set the size max-image-size using the current frame - ;; since the popup frame will be small to begin with - (* max-image-size (frame-width))))) - (with-current-buffer buf - (let (buffer-read-only) - (with-silent-modifications - (erase-buffer) - (insert (propertize str - ;; Remove unnecessary properties - 'help-echo nil - 'keymap nil - 'mouse-face nil)) - (goto-char (point-min))))) - (setq old-frame - (buframe-make - frame-name - (lambda (frame) - (funcall - (or (car-safe (cdr-safe preview-at-point-placement)) - #'buframe-position-right-of-overlay) - frame - ov)) - buf - (overlay-buffer ov) - (window-frame) - (car-safe (cdr (cdr-safe preview-at-point-placement))))) - (set-frame-parameter old-frame 'auctex-preview - (cons ov str)))) - (when old-frame - (set-frame-parameter old-frame 'auctex-preview nil) - (buframe-disable old-frame)))))) + (if (require 'buframe nil t) + (let* ((frame-name "auctex-preview") + (buf-name " *auctex-preview-buffer*") + (old-frame (buframe-find frame-name nil nil t))) + (if-let* ((ov (cl-find-if + (lambda (ov) (when (overlay-get ov 'buframe) ov)) + (overlays-at (point)))) + (str (overlay-get ov 'buframe))) + (unless (and (not force) + old-frame + (pcase (frame-parameter old-frame 'auctex-preview) + (`(,o . ,s) (and (eq o ov) (eq s str))))) + (let* ((buf (buframe-make-buffer buf-name + (car-safe + (cddr (cdr-safe + preview-at-point-placement))))) + (max-image-size + (if (integerp max-image-size) + max-image-size + ;; Set the size max-image-size using the current frame + ;; since the popup frame will be small to begin with + (* max-image-size (frame-width))))) + (with-current-buffer buf + (let (buffer-read-only) + (with-silent-modifications + (erase-buffer) + (insert (propertize str + ;; Remove unnecessary properties + 'help-echo nil + 'keymap nil + 'mouse-face nil)) + (goto-char (point-min))))) + (setq old-frame + (buframe-make + frame-name + (lambda (frame) + (funcall + (or (car-safe (cdr-safe preview-at-point-placement)) + #'buframe-position-right-of-overlay) + frame + ov)) + buf + (overlay-buffer ov) + (window-frame) + (car-safe (cdr (cdr-safe preview-at-point-placement))))) + (set-frame-parameter old-frame 'auctex-preview + (cons ov str)))) + (when old-frame + (set-frame-parameter old-frame 'auctex-preview nil) + (buframe-disable old-frame)))) + (when preview--buframe-error + (error "buframe is unavailable for use with preview. \ +See `preview-at-point-placement'.") + (setq preview--buframe-error nil)))) ;;;###autoload (defun preview-report-bug () "Report a bug in the preview-latex package." -- 2.50.1 (Apple Git-155)
_______________________________________________ bug-auctex mailing list [email protected] https://lists.gnu.org/mailman/listinfo/bug-auctex
