Merge from emacs-24; up to 2012-05-04T19:17:01Z!monnier@iro.umontreal.ca

[bpt/emacs.git] / lisp / vc / ediff-ptch.el

diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el
index 1203747..def4503 100644 (file)
--- a/lisp/vc/ediff-ptch.el
+++ b/lisp/vc/ediff-ptch.el
@@ -1,9 +1,9 @@
 ;;; ediff-ptch.el --- Ediff's  patch support
 
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2012  Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
+;; Package: ediff
 
 ;; This file is part of GNU Emacs.
 
@@ -61,7 +61,7 @@ case the default value for this variable should be changed."
 
 ;; the default backup extension
 (defconst ediff-default-backup-extension
-  (if (memq system-type '(emx ms-dos))
+  (if (eq system-type 'ms-dos)
       "_orig" ".orig"))
 
 
@@ -373,7 +373,7 @@ other files, enter /dev/null
                         (concat actual-dir (cdr proposed-file-names)))))
              ))
          ediff-patch-map)
-    ;; Check for the existing files in each pair and discard the nonexisting
+    ;; Check for the existing files in each pair and discard the nonexistent
     ;; ones. If both exist, ask the user.
     (mapcar (lambda (session-info)
              (let* ((file1 (car (ediff-get-session-objA-name session-info)))
@@ -417,7 +417,7 @@ Ediff has inferred that
 are two possible targets for applying the patch.
 Both files seem to be plausible alternatives.
 
-Please advice:
+Please advise:
     Type `y' to use %s as the target;
     Type `n' to use %s as the target.
 "
@@ -635,7 +635,7 @@ optional argument, then use it."
 ;; Traditional patch has weird return codes.
 ;; GNU and Posix return 1 if some hanks failed and 2 in case of trouble.
 ;; 0 is a good code in all cases.
-;; We'll do the concervative thing.
+;; We'll do the conservative thing.
 (defun ediff-patch-return-code-ok (code)
   (eq code 0))
 ;;;  (if (eq (ediff-test-patch-utility) 'traditional)
@@ -840,5 +840,4 @@ you can still examine the changes via M-x ediff-files"
 ;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
 ;; End:
 
-;; arch-tag: 2fe2161e-e116-469b-90fa-5cbb44c1bd1b
 ;;; ediff-ptch.el ends here