From f9ab15ee19f42f742a88b979a0fe6d097449645a Mon Sep 17 00:00:00 2001 From: Vedang Manerikar Date: Sun, 11 Jun 2023 12:32:01 +0530 Subject: [PATCH] Fix: create alias for x-gtk-* variables for Emacs >28 The x-gtk prefix has been dropped in Emacs 29. --- lisp/pdf-annot.el | 1 + lisp/pdf-util.el | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lisp/pdf-annot.el b/lisp/pdf-annot.el index 344a5c0d..a5e36e60 100644 --- a/lisp/pdf-annot.el +++ b/lisp/pdf-annot.el @@ -26,6 +26,7 @@ (require 'pdf-info) (require 'pdf-cache) (require 'pdf-misc) +(require 'pdf-util) (require 'facemenu) ;; list-colors-duplicates (require 'faces) ;; color-values (require 'org) ;; org-create-formula-image diff --git a/lisp/pdf-util.el b/lisp/pdf-util.el index 1e3b7be5..070e4a5b 100644 --- a/lisp/pdf-util.el +++ b/lisp/pdf-util.el @@ -607,12 +607,18 @@ string." ;; requires us :-( (defvar pdf-view-midnight-colors) +(when (and (> emacs-major-version 28) + (not (boundp 'x-gtk-use-system-tooltips))) + ;; The x-gtk prefix has been dropped Emacs 29 + (defvaralias 'x-gtk-use-system-tooltips 'use-system-tooltips)) + (defun pdf-util-tooltip-arrow (image-top &optional timeout) (pdf-util-assert-pdf-window) (when (floatp image-top) (setq image-top (round (* image-top (cdr (pdf-view-image-size)))))) - (let* (x-gtk-use-system-tooltips ;allow for display property in tooltip + (let* ((x-gtk-use-system-tooltips nil) + ;; ^ allow for display text property in tooltip (dx (+ (or (car (window-margins)) 0) (car (window-fringes)))) (dy image-top)