Mercurial > emacs
changeset 81334:c5bcf5ad255f
2007-06-12 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-ptch.el (ediff-context-diff-label-regexp): spurious
parenthesis.
* ediff-init.el: doc strings.
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Tue, 12 Jun 2007 21:18:46 +0000 |
| parents | fc32f1336974 |
| children | 6bfc3121df97 |
| files | lisp/ChangeLog lisp/ediff-init.el lisp/ediff-ptch.el |
| diffstat | 3 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Jun 12 21:03:32 2007 +0000 +++ b/lisp/ChangeLog Tue Jun 12 21:18:46 2007 +0000 @@ -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.
--- a/lisp/ediff-init.el Tue Jun 12 21:03:32 2007 +0000 +++ b/lisp/ediff-init.el Tue Jun 12 21:18:46 2007 +0000 @@ -102,7 +102,7 @@ (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 @@ ;; ;; 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 @@ ;; 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
--- a/lisp/ediff-ptch.el Tue Jun 12 21:03:32 2007 +0000 +++ b/lisp/ediff-ptch.el Tue Jun 12 21:18:46 2007 +0000 @@ -139,7 +139,7 @@ "^\\*\\*\\* \\([^\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."