# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1265153116 0
# Node ID 19af79cef24d722723b0d1f2f2ce3175a263a2d6
# Parent  90dfa01009dd7227543e7ee3e581e911721b2f38# Parent  e4a4161df48584ae02462341df9f80070da51825
Merge from mainline.

diff -r 90dfa01009dd -r 19af79cef24d lisp/ChangeLog
--- 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"
diff -r 90dfa01009dd -r 19af79cef24d lisp/ediff-util.el
--- 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)))
diff -r 90dfa01009dd -r 19af79cef24d lisp/textmodes/ispell.el
--- 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