mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-31 11:13:50 +00:00
Code Issues Releases Activity

2007-06-12 Michael Kifer <kifer@cs.stonybrook.edu>

Browse Source 
* ediff-ptch.el (ediff-context-diff-label-regexp): spurious
	parenthesis.

	* ediff-init.el: doc strings.
This commit is contained in:
Michael Kifer 2007-06-12 21:18:46 +00:00
parent b8104a2bf5
commit 77c572708d
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/ChangeLog
View File

@ -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> 2007-06-12 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/bytecomp.el (byte-compile-current-group): New var. * emacs-lisp/bytecomp.el (byte-compile-current-group): New var.

4
lisp/ediff-init.el
View File

@ -102,7 +102,7 @@ that Ediff doesn't know about.")
(boundp 'ediff-use-toolbar-p) (boundp 'ediff-use-toolbar-p)
ediff-use-toolbar-p)) ;Does the user want it ? 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 ;; Performs a defvar, then executes `make-variable-buffer-local' on
;; the variable. Also sets the `permanent-local' property, ;; the variable. Also sets the `permanent-local' property,
;; so that `kill-all-local-variables' (called by major-mode setting ;; 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. ;; Plagiarised from `emerge-defvar-local' for XEmacs.
(defmacro ediff-defvar-local (var value doc) (defmacro ediff-defvar-local (var value doc)
"Defines VAR as a local variable."
(declare (indent defun)) (declare (indent defun))
`(progn `(progn
(defvar ,var ,value ,doc) (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. ;; Doesn't save the point and mark.
;; This is `with-current-buffer' with the added test for live buffers." ;; This is `with-current-buffer' with the added test for live buffers."
(defmacro ediff-with-current-buffer (buffer &rest body) (defmacro ediff-with-current-buffer (buffer &rest body)
"Evaluates BODY in BUFFER."
(declare (indent 1) (debug (form body))) (declare (indent 1) (debug (form body)))
`(if (ediff-buffer-live-p ,buffer) `(if (ediff-buffer-live-p ,buffer)
(save-current-buffer (save-current-buffer

2
lisp/ediff-ptch.el
View File

@ -139,7 +139,7 @@ patch. So, don't change these variables, unless the default doesn't work."
"^\\*\\*\\* \\([^\t]+\\)[^*]+[\t ]*\n--- \\([^\t]+\\)" "^\\*\\*\\* \\([^\t]+\\)[^*]+[\t ]*\n--- \\([^\t]+\\)"
"\\|" ; GNU unified format diff 2-liner "\\|" ; GNU unified format diff 2-liner
"^--- \\([^\t]+\\)[\t ]+.*\n\\+\\+\\+ \\([^\t]+\\)" "^--- \\([^\t]+\\)[\t ]+.*\n\\+\\+\\+ \\([^\t]+\\)"
"\\)")) "\\)")
"*Regexp matching filename 2-liners at the start of each context diff. "*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 You probably don't want to change that, unless you are using an obscure patch
program." program."