[Emacs-diffs] Changes to emacs/lisp/ediff-wind.el

[Michael Kifer]

Index: emacs/lisp/ediff-wind.el
diff -c emacs/lisp/ediff-wind.el:1.40 emacs/lisp/ediff-wind.el:1.41
*** emacs/lisp/ediff-wind.el:1.40       Sat Aug  6 22:13:42 2005
--- emacs/lisp/ediff-wind.el    Thu Oct  6 00:09:48 2005
***************
*** 900,906 ****
  
      (ediff-with-current-buffer ctl-buffer
        (ediff-cond-compile-for-xemacs-or-emacs
!        (set-buffer-menubar nil) ; xemacs
         nil ; emacs
         )
        ;;(setq user-grabbed-mouse (ediff-user-grabbed-mouse))
--- 900,906 ----
  
      (ediff-with-current-buffer ctl-buffer
        (ediff-cond-compile-for-xemacs-or-emacs
!        (when (featurep 'menubar) (set-buffer-menubar nil)) ; xemacs
         nil ; emacs
         )
        ;;(setq user-grabbed-mouse (ediff-user-grabbed-mouse))
***************
*** 1054,1060 ****
      (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
           nil ; emacs
           )
          (setq ediff-control-frame nil)
--- 1054,1061 ----
      (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
!          (when (featurep 'menubar)
!            (set-buffer-menubar default-menubar)) ; xemacs
           nil ; emacs
           )
          (setq ediff-control-frame nil)