Mercurial > emacs
changeset 107269:19af79cef24d
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Tue, 02 Feb 2010 23:25:16 +0000 |
| parents | 90dfa01009dd (current diff) e4a4161df485 (diff) |
| children | 444ecbd20d25 |
| files | |
| diffstat | 3 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Feb 02 21:53:34 2010 +0000 +++ b/lisp/ChangeLog Tue Feb 02 23:25:16 2010 +0000 @@ -1,3 +1,13 @@ +2010-02-02 Juri Linkov <juri@jurta.org> + + * textmodes/ispell.el (ispell-message-text-end): Remove final newline + from unidiff to allow function-line after @@. + +2010-02-02 Juri Linkov <juri@jurta.org> + + * ediff-util.el (ediff-file-checked-in-p): Replace '(nil CVS) by + '(RCS SCCS) with inverted condition. + 2010-02-02 Michael Albinus <michael.albinus@gmx.de> * net/ange-ftp.el (ange-ftp-skip-msgs): Ignore all ""^500 .*AUTH"
--- a/lisp/ediff-util.el Tue Feb 02 21:53:34 2010 +0000 +++ b/lisp/ediff-util.el Tue Feb 02 23:25:16 2010 +0000 @@ -1126,8 +1126,8 @@ (defun ediff-file-checked-in-p (file) (and (featurep 'vc-hooks) - ;; CVS files are considered not checked in - (not (memq (vc-backend file) '(nil CVS))) + ;; Only RCS and SCCS files are considered checked in + (memq (vc-backend file) '(RCS SCCS)) (if (fboundp 'vc-state) (and (not (memq (vc-state file) '(edited needs-merge)))
--- a/lisp/textmodes/ispell.el Tue Feb 02 21:53:34 2010 +0000 +++ b/lisp/textmodes/ispell.el Tue Feb 02 23:25:16 2010 +0000 @@ -3459,7 +3459,7 @@ ;; Matches context difference listing "\\(\\(^cd .*\n\\)?diff -c .*\\)?\n\\*\\*\\* .*\n--- .*\n\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*" ;; Matches unidiff difference listing - "\\(diff -u .*\\)?\n--- .*\n\\+\\+\\+ .*\n@@ [-+][0-9]+,[0-9]+ [-+][0-9]+,[0-9]+ @@\n" + "\\(diff -u .*\\)?\n--- .*\n\\+\\+\\+ .*\n@@ [-+][0-9]+,[0-9]+ [-+][0-9]+,[0-9]+ @@" ;; Matches reporter.el bug report "^current state:\n==============\n" ;; Matches commonly used "cut" boundaries