mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 08:43:40 -07:00
Code Issues Projects Releases Wiki Activity

(ediff-defvar-local, ediff-with-current-buffer):

Browse source 
Add indentation and debugging info.  Fix up comment convention.
This commit is contained in:
Stefan Monnier 2007-05-25 16:41:25 +00:00
parent 178f6d1fc7
commit f4a7decd96
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -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):

14
lisp/ediff-init.el
View file

@ -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