Merge changes from emacs-23 branch

[gnu-emacs] / lisp / vc / ediff-ptch.el

diff --git a/lisp/ediff-ptch.el b/lisp/vc/ediff-ptch.el
similarity index 99%
rename from lisp/ediff-ptch.el
rename to lisp/vc/ediff-ptch.el
index 26de8ca5828c5372307b5475baad3184455d40a9..d930a1bec699fcf9d5019a3c31c1667842db4ce2 100644 (file)
--- a/lisp/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, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2011  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"))
 
 
@@ -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