summaryrefslogtreecommitdiff
path: root/lisp/ediff-merg.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ediff-merg.el')
-rw-r--r--lisp/ediff-merg.el6
1 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el
index 80275c46f30..a07dc8d8c16 100644
--- a/lisp/ediff-merg.el
+++ b/lisp/ediff-merg.el
@@ -264,6 +264,12 @@ Combining is done according to the specifications in variable
)))
+;;; Local Variables:
+;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
+;;; eval: (put 'ediff-eval-in-buffer 'lisp-indent-hook 1)
+;;; eval: (put 'ediff-eval-in-buffer 'edebug-form-spec '(form body))
+;;; End:
+
(provide 'ediff-merg)
;; ediff-merg.el ends here