diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2005-10-06 00:09:49 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2005-10-06 00:09:49 +0000 |
| commit | e2de3a29450c31966bcb8336c1f52b2ad495298a (patch) | |
| tree | b0eabde48df09afaec7eb3f7ec30876c0711196b /lisp/ediff-wind.el | |
| parent | 20ef86730cca82a1a2e212a665c0b119ed2d70b2 (diff) | |
| download | emacs-e2de3a29450c31966bcb8336c1f52b2ad495298a.tar.gz | |
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-merge.el (ediff-merge-region-is-non-clash): new defsubst.
(ediff-merge-region-is-non-clash-to-skip): previouslu called
ediff-merge-region-is-non-clash.
* ediff-mult.el (ediff-append-custom-diff,ediff-meta-show-patch): use
insert-buffer-substring.
* ediff-ptch.el (ediff-fixup-patch-map): use better heuristics for
selecting files to patch. Also bug fixes.
* ediff-util.el (ediff-setup): bug fix.
(ediff-next-difference): Never skip clashes that differ in white space
only.
* ediff-wind.el (ediff-setup-control-frame,ediff-destroy-control-frame):
check the menubar feature.
* viper-cmd.el (viper-normalize-minor-mode-map-alist,
viper-refresh-mode-line): use make-local-variable to localize some vars
instead of make-variable-buffer-local. Suggested by Stefan Monnier.
* viper-init.el (viper-make-variable-buffer-local): delete alias.
(viper-restore-cursor-type,viper-set-insert-cursor-type): use
make-local-variable instead of make-variable-buffer-local. Suggested by
Stefan Monnier.
* viper.el (viper-mode): don't use viper-make-variable-buffer-local.
(viper-comint-mode-hook): use make-local-variable on
require-final-newline.
(viper-non-hook-settings): don't use make-variable-buffer-local.
Diffstat (limited to 'lisp/ediff-wind.el')
| -rw-r--r-- | lisp/ediff-wind.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el index 26ff106088f..e15c92d4bc9 100644 --- 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) |