Mercurial > hg > xemacs-beta

diff lisp/ediff/ediff-merg.el @ 78:c7528f8e288d r20-0b34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-0b34
author cvs
date Mon, 13 Aug 2007 09:05:42 +0200
parents 131b0175ea99
children 1ce6082ce73f
line wrap: on
line diff
--- a/lisp/ediff/ediff-merg.el	Mon Aug 13 09:05:11 2007 +0200
+++ b/lisp/ediff/ediff-merg.el	Mon Aug 13 09:05:42 2007 +0200
@@ -264,6 +264,12 @@
 	)))
   
 
+;;; 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