(texinfo-mode): Change charset of one quotation mark

[gnu-emacs] / lisp / ediff-wind.el

diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el
index 26ff106088f3afd8b6df31ec8347513aa3e16303..e15c92d4bc9d0460b95272bad5fe2170ef2070e8 100644 (file)
--- a/lisp/ediff-wind.el
+++ b/lisp/ediff-wind.el
@@ -900,7 +900,7 @@ into icons, regardless of the window manager."
 
     (ediff-with-current-buffer ctl-buffer
       (ediff-cond-compile-for-xemacs-or-emacs
-       (set-buffer-menubar nil) ; xemacs
+       (when (featurep 'menubar) (set-buffer-menubar nil)) ; xemacs
        nil ; emacs
        )
       ;;(setq user-grabbed-mouse (ediff-user-grabbed-mouse))
@@ -1054,7 +1054,8 @@ into icons, regardless of the window manager."
     (if (and (ediff-window-display-p) (frame-live-p ediff-control-frame))
        (let ((ctl-frame ediff-control-frame))
          (ediff-cond-compile-for-xemacs-or-emacs
-          (set-buffer-menubar default-menubar) ; xemacs
+          (when (featurep 'menubar)
+            (set-buffer-menubar default-menubar)) ; xemacs
           nil ; emacs
           )
          (setq ediff-control-frame nil)