/[emacs]/emacs/lisp/ediff-wind.el
ViewVC logotype

Diff of /emacs/lisp/ediff-wind.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.40 by ttn, Sat Aug 6 22:13:42 2005 UTC revision 1.41 by kifer, Thu Oct 6 00:09:48 2005 UTC
# Line 900  into icons, regardless of the window man Line 900  into icons, regardless of the window man
900    
901      (ediff-with-current-buffer ctl-buffer      (ediff-with-current-buffer ctl-buffer
902        (ediff-cond-compile-for-xemacs-or-emacs        (ediff-cond-compile-for-xemacs-or-emacs
903         (set-buffer-menubar nil) ; xemacs         (when (featurep 'menubar) (set-buffer-menubar nil)) ; xemacs
904         nil ; emacs         nil ; emacs
905         )         )
906        ;;(setq user-grabbed-mouse (ediff-user-grabbed-mouse))        ;;(setq user-grabbed-mouse (ediff-user-grabbed-mouse))
# Line 1054  into icons, regardless of the window man Line 1054  into icons, regardless of the window man
1054      (if (and (ediff-window-display-p) (frame-live-p ediff-control-frame))      (if (and (ediff-window-display-p) (frame-live-p ediff-control-frame))
1055          (let ((ctl-frame ediff-control-frame))          (let ((ctl-frame ediff-control-frame))
1056            (ediff-cond-compile-for-xemacs-or-emacs            (ediff-cond-compile-for-xemacs-or-emacs
1057             (set-buffer-menubar default-menubar) ; xemacs             (when (featurep 'menubar)
1058                 (set-buffer-menubar default-menubar)) ; xemacs
1059             nil ; emacs             nil ; emacs
1060             )             )
1061            (setq ediff-control-frame nil)            (setq ediff-control-frame nil)

Legend:
Removed from v.1.40  
changed lines
  Added in v.1.41

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26