]> git.eshelyaron.com Git - emacs.git/commitdiff
Avoid breaking non-xwidget Emacs that happen to load xwidget.el.
authorGlenn Morris <rgm@gnu.org>
Tue, 19 Jan 2016 23:06:30 +0000 (18:06 -0500)
committerGlenn Morris <rgm@gnu.org>
Tue, 19 Jan 2016 23:06:30 +0000 (18:06 -0500)
* lisp/xwidget.el (window-configuration-change-hook)
(kill-buffer-query-functions): Only modify these hooks if
compiled with xwidget support.

lisp/xwidget.el

index 17fcf3dae91226b810e4531ce84137ad78ca696d..ff3b977ade5bb348a71f59f387020ee8b870f14f 100644 (file)
@@ -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)