Mercurial > emacs
comparison lisp/ediff-merg.el @ 101721:c55394eee0de
Follow commenting conventions.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Sat, 31 Jan 2009 22:10:22 +0000 |
| parents | a9dc0e7c3f2b |
| children | affb617d6101 |
comparison
equal
deleted
inserted
replaced
| 101720:02a61aa59953 | 101721:c55394eee0de |
|---|---|
| 383 | 383 |
| 384 | 384 |
| 385 (provide 'ediff-merg) | 385 (provide 'ediff-merg) |
| 386 | 386 |
| 387 | 387 |
| 388 ;;; Local Variables: | 388 ;; Local Variables: |
| 389 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) | 389 ;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) |
| 390 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) | 390 ;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) |
| 391 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) | 391 ;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) |
| 392 ;;; End: | 392 ;; End: |
| 393 | 393 |
| 394 ;; arch-tag: 9b798cf9-02ba-487f-a62e-b63aa823dbfb | 394 ;; arch-tag: 9b798cf9-02ba-487f-a62e-b63aa823dbfb |
| 395 ;;; ediff-merg.el ends here | 395 ;;; ediff-merg.el ends here |