Mercurial > emacs
changeset 81076:c2b0d8bb6ca7
(ediff-defvar-local, ediff-with-current-buffer):
Add indentation and debugging info. Fix up comment convention.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 25 May 2007 16:41:25 +0000 |
| parents | 8520ffa982fc |
| children | eaa1a54ec3ee |
| files | lisp/ChangeLog lisp/ediff-init.el |
| diffstat | 2 files changed, 11 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri May 25 16:37:01 2007 +0000 +++ b/lisp/ChangeLog Fri May 25 16:41:25 2007 +0000 @@ -1,5 +1,8 @@ 2007-05-25 Stefan Monnier <monnier@iro.umontreal.ca> + * ediff-init.el (ediff-defvar-local, ediff-with-current-buffer): + Add indentation and debugging info. Fix up comment convention. + * cus-dep.el (custom-make-dependencies): Simplify. * composite.el (compose-region, decompose-region):
--- a/lisp/ediff-init.el Fri May 25 16:37:01 2007 +0000 +++ b/lisp/ediff-init.el Fri May 25 16:41:25 2007 +0000 @@ -110,6 +110,7 @@ ;; ;; Plagiarised from `emerge-defvar-local' for XEmacs. (defmacro ediff-defvar-local (var value doc) + (declare (indent defun)) `(progn (defvar ,var ,value ,doc) (make-variable-buffer-local ',var) @@ -258,6 +259,7 @@ ;; Doesn't save the point and mark. ;; This is `with-current-buffer' with the added test for live buffers." (defmacro ediff-with-current-buffer (buffer &rest body) + (declare (indent 1) (debug (form body))) `(if (ediff-buffer-live-p ,buffer) (save-current-buffer (set-buffer ,buffer) @@ -1873,11 +1875,11 @@ -;;; 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: fa31d384-1e70-4d4b-82a7-3e96307c46f5 +;; arch-tag: fa31d384-1e70-4d4b-82a7-3e96307c46f5 ;;; ediff-init.el ends here