summaryrefslogtreecommitdiff
path: root/lisp/xwidget.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2016-01-19 18:06:30 -0500
committerGlenn Morris <rgm@gnu.org>2016-01-19 18:06:30 -0500
commitb88f4a2c7624362081aca2bc81cc0c5c72b7245d (patch)
tree33e88399cf210038385e2fd1d10eeaff7fbdef96 /lisp/xwidget.el
parent22977b5c51f5c0ffe318fc3cf8a88b7b14983b15 (diff)
downloademacs-b88f4a2c7624362081aca2bc81cc0c5c72b7245d.tar.gz
Avoid breaking non-xwidget Emacs that happen to load xwidget.el.
* lisp/xwidget.el (window-configuration-change-hook) (kill-buffer-query-functions): Only modify these hooks if compiled with xwidget support.
Diffstat (limited to 'lisp/xwidget.el')
-rw-r--r--lisp/xwidget.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index 17fcf3dae91..ff3b977ade5 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -571,7 +571,8 @@ It can be retrieved with `(xwidget-get XWIDGET PROPNAME)'."
;; This would have felt better in C, but this seems to work well in
;; practice though.
-(add-hook 'window-configuration-change-hook 'xwidget-delete-zombies)
+(if (featurep 'xwidget-internal)
+ (add-hook 'window-configuration-change-hook 'xwidget-delete-zombies))
(defun xwidget-kill-buffer-query-function ()
"Ask beforek illing a buffer that has xwidgets."
@@ -582,7 +583,8 @@ It can be retrieved with `(xwidget-get XWIDGET PROPNAME)'."
(format "Buffer %S has xwidgets; kill it? "
(buffer-name (current-buffer)))))))
-(add-hook 'kill-buffer-query-functions 'xwidget-kill-buffer-query-function)
+(if (featurep 'xwidget-internal)
+ (add-hook 'kill-buffer-query-functions 'xwidget-kill-buffer-query-function))
(provide 'xwidget)