diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-01-31 22:10:22 +0000 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-01-31 22:10:22 +0000 |
commit | fa043571b26751e8e6cb9bb246ecd0aafacd1ca7 (patch) | |
tree | b515d06d95ecd17c103ed8dc1638204f9012d55f /lisp/ediff-merg.el | |
parent | 062ca6f69ab2b8f1ddac138d8b212e003a13e330 (diff) | |
download | emacs-fa043571b26751e8e6cb9bb246ecd0aafacd1ca7.tar.gz |
Follow commenting conventions.
Diffstat (limited to 'lisp/ediff-merg.el')
-rw-r--r-- | lisp/ediff-merg.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el index 20c77448da6..35ea4348d0e 100644 --- a/lisp/ediff-merg.el +++ b/lisp/ediff-merg.el @@ -385,11 +385,11 @@ Combining is done according to the specifications in variable (provide 'ediff-merg) -;;; Local Variables: -;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) -;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) -;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) -;;; End: +;; Local Variables: +;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) +;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) +;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) +;; End: ;; arch-tag: 9b798cf9-02ba-487f-a62e-b63aa823dbfb ;;; ediff-merg.el ends here |