Mercurial > emacs
comparison lisp/ediff-util.el @ 11977:4b293ac1eef6
(ediff-setup): Don't make default-minibuffer-frame
a buffer-local variable.
author | Karl Heuer <kwzh@gnu.org> |
---|---|
date | Mon, 29 May 1995 06:27:18 +0000 |
parents | 4d2a2fe1d8d7 |
children | 589a32fa67a9 |
comparison
equal
deleted
inserted
replaced
11976:e862c6697f39 | 11977:4b293ac1eef6 |
---|---|
301 ;; parameters are processed. | 301 ;; parameters are processed. |
302 (setq ediff-setup-diff-regions-function | 302 (setq ediff-setup-diff-regions-function |
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) |
314 (ediff-make-bullet-proof-overlay | 310 (ediff-make-bullet-proof-overlay |
315 '(point-min) '(point-max) ediff-buffer-B) | 311 '(point-min) '(point-max) ediff-buffer-B) |