aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ediff-init.el4
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el
index 24a5002822d..9eadd0b8556 100644
--- a/lisp/ediff-init.el
+++ b/lisp/ediff-init.el
@@ -192,6 +192,10 @@ that Ediff doesn't know about.")
192 (error ediff-KILLED-VITAL-BUFFER)) 192 (error ediff-KILLED-VITAL-BUFFER))
193 )))) 193 ))))
194 194
195(put 'ediff-eval-in-buffer 'lisp-indent-function 1)
196(put 'ediff-eval-in-buffer 'lisp-indent-hook 1)
197(put 'ediff-eval-in-buffer 'edebug-form-spec '(form body))
198
195 199
196(defsubst ediff-multiframe-setup-p () 200(defsubst ediff-multiframe-setup-p ()
197 (and (ediff-window-display-p) ediff-multiframe)) 201 (and (ediff-window-display-p) ediff-multiframe))