diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-05-25 16:41:25 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-05-25 16:41:25 +0000 |
| commit | f4a7decd96ccc0e52933f5da881d4a887d4716a8 (patch) | |
| tree | ea3060206f9e3ee03e77106a4cce047ec27b8e6f /lisp | |
| parent | 178f6d1fc7c3199009c997587e74625d4f00f2c1 (diff) | |
| download | emacs-f4a7decd96ccc0e52933f5da881d4a887d4716a8.tar.gz | |
(ediff-defvar-local, ediff-with-current-buffer):
Add indentation and debugging info. Fix up comment convention.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/ediff-init.el | 14 |
2 files changed, 11 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7aeed1d185b..e00e3593e46 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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): diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index 0ecc809797f..d37096f9e89 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el @@ -110,6 +110,7 @@ that Ediff doesn't know about.") ;; ;; 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 @@ It needs to be killed when we quit the session.") ;; 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 @@ Unless optional argument INPLACE is non-nil, return a new string." -;;; 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 |