diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2007-06-12 21:18:46 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2007-06-12 21:18:46 +0000 |
| commit | 77c572708d87f2fc87612018d30eecccaa3031a6 (patch) | |
| tree | 3ad85da71e7fcc6b67f3715088702c29e7a631a3 /lisp/ediff-init.el | |
| parent | b8104a2bf5bee4a07cd6f3105a980f9f3324af8f (diff) | |
| download | emacs-77c572708d87f2fc87612018d30eecccaa3031a6.tar.gz | |
2007-06-12 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-ptch.el (ediff-context-diff-label-regexp): spurious
parenthesis.
* ediff-init.el: doc strings.
Diffstat (limited to 'lisp/ediff-init.el')
| -rw-r--r-- | lisp/ediff-init.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index d37096f9e89..8d05f2def09 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el @@ -102,7 +102,7 @@ that Ediff doesn't know about.") (boundp 'ediff-use-toolbar-p) ediff-use-toolbar-p)) ;Does the user want it ? -;; Defines SYMBOL as an advertised local variable. +;; Defines VAR as an advertised local variable. ;; Performs a defvar, then executes `make-variable-buffer-local' on ;; the variable. Also sets the `permanent-local' property, ;; so that `kill-all-local-variables' (called by major-mode setting @@ -110,6 +110,7 @@ that Ediff doesn't know about.") ;; ;; Plagiarised from `emerge-defvar-local' for XEmacs. (defmacro ediff-defvar-local (var value doc) + "Defines VAR as a local variable." (declare (indent defun)) `(progn (defvar ,var ,value ,doc) @@ -259,6 +260,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) + "Evaluates BODY in BUFFER." (declare (indent 1) (debug (form body))) `(if (ediff-buffer-live-p ,buffer) (save-current-buffer |