summaryrefslogtreecommitdiff
path: root/lisp/ediff-util.el
diff options
context:
space:
mode:
authorKarl Heuer <kwzh@gnu.org>1995-05-29 06:27:18 +0000
committerKarl Heuer <kwzh@gnu.org>1995-05-29 06:27:18 +0000
commitf4069e8f8c9a5d1a3711ac76ac1b0e760f13504c (patch)
treea160f56e92307bad1edc190a2cfb06c1ca8fdf90 /lisp/ediff-util.el
parentd03c66076e88e8e35524932bec1606901efa624f (diff)
downloademacs-f4069e8f8c9a5d1a3711ac76ac1b0e760f13504c.tar.gz
(ediff-setup): Don't make default-minibuffer-frame
a buffer-local variable.
Diffstat (limited to 'lisp/ediff-util.el')
-rw-r--r--lisp/ediff-util.el6
1 files changed, 1 insertions, 5 deletions
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index 7555d0775c4..f598824b851 100644
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -303,11 +303,7 @@ to invocation.")
(if ediff-diff3-job
'ediff-setup-diff-regions3
'ediff-setup-diff-regions))
-
- (if ediff-xemacs-p
- ()
- (make-local-variable 'default-minibuffer-frame))
-
+
(setq ediff-wide-bounds
(list (ediff-make-bullet-proof-overlay
'(point-min) '(point-max) ediff-buffer-A)