aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Heuer1995-05-29 06:27:18 +0000
committerKarl Heuer1995-05-29 06:27:18 +0000
commitd601f32599d521eed4b4d3736a001040265dc5af (patch)
tree843381579113018e9ac950fbae4b6d938442b95c
parenta8a2d6cade3f8e28dfbefda0da9a31346c9f35f0 (diff)
downloademacs-d601f32599d521eed4b4d3736a001040265dc5af.tar.gz
emacs-d601f32599d521eed4b4d3736a001040265dc5af.zip
(ediff-setup): Don't make default-minibuffer-frame
a buffer-local variable.
-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.")
303 (if ediff-diff3-job 303 (if ediff-diff3-job
304 'ediff-setup-diff-regions3 304 'ediff-setup-diff-regions3
305 'ediff-setup-diff-regions)) 305 'ediff-setup-diff-regions))
306 306
307 (if ediff-xemacs-p
308 ()
309 (make-local-variable 'default-minibuffer-frame))
310
311 (setq ediff-wide-bounds 307 (setq ediff-wide-bounds
312 (list (ediff-make-bullet-proof-overlay 308 (list (ediff-make-bullet-proof-overlay
313 '(point-min) '(point-max) ediff-buffer-A) 309 '(point-min) '(point-max) ediff-buffer-A)