diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 1996-09-20 01:10:05 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 1996-09-20 01:10:05 +0000 |
| commit | a013cdbb1e43acf8ca017fe2baf4bfe84c812492 (patch) | |
| tree | f13671364d74f93110bff267ee5df4067b44d9bb /lisp/ediff-merg.el | |
| parent | c1afbab1edcbced1a853ef0b8f5ae9940ca26db5 (diff) | |
| download | emacs-a013cdbb1e43acf8ca017fe2baf4bfe84c812492.tar.gz | |
*** empty log message ***
Diffstat (limited to 'lisp/ediff-merg.el')
| -rw-r--r-- | lisp/ediff-merg.el | 6 |
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 |