diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/ediff-init.el | 4 | ||||
| -rw-r--r-- | lisp/ediff-ptch.el | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 728dd0f8135..ac8e69d4c08 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2007-06-12 Michael Kifer <kifer@cs.stonybrook.edu> + + * ediff-ptch.el (ediff-context-diff-label-regexp): spurious + parenthesis. + + * ediff-init.el: doc strings. + 2007-06-12 Stefan Monnier <monnier@iro.umontreal.ca> * emacs-lisp/bytecomp.el (byte-compile-current-group): New var. 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 diff --git a/lisp/ediff-ptch.el b/lisp/ediff-ptch.el index 5b345a8d4d6..45fb1e2a3f6 100644 --- a/lisp/ediff-ptch.el +++ b/lisp/ediff-ptch.el @@ -139,7 +139,7 @@ patch. So, don't change these variables, unless the default doesn't work." "^\\*\\*\\* \\([^\t]+\\)[^*]+[\t ]*\n--- \\([^\t]+\\)" "\\|" ; GNU unified format diff 2-liner "^--- \\([^\t]+\\)[\t ]+.*\n\\+\\+\\+ \\([^\t]+\\)" - "\\)")) + "\\)") "*Regexp matching filename 2-liners at the start of each context diff. You probably don't want to change that, unless you are using an obscure patch program." |