;;; ediff-ptch.el --- Ediff's patch support
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;; 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
(require 'ediff-init)
(defcustom ediff-patch-program "patch"
- "*Name of the program that applies patches.
+ "Name of the program that applies patches.
It is recommended to use GNU-compatible versions."
:type 'string
:group 'ediff-ptch)
(defcustom ediff-patch-options "-f"
- "*Options to pass to ediff-patch-program.
+ "Options to pass to ediff-patch-program.
Note: the `-b' option should be specified in `ediff-backup-specs'.
;; the default backup extension
(defconst ediff-default-backup-extension
- (if (memq system-type '(vax-vms axp-vms emx ms-dos))
+ (if (memq system-type '(emx ms-dos))
"_orig" ".orig"))
(t
;; traditional `patch'
(format "-b %s" ediff-backup-extension))))
- "*Backup directives to pass to the patch program.
+ "Backup directives to pass to the patch program.
Ediff requires that the old version of the file \(before applying the patch\)
be saved in a file named `the-patch-file.extension'. Usually `extension' is
`.orig', but this can be changed by the user and may depend on the system.
(defcustom ediff-patch-default-directory nil
- "*Default directory to look for patches."
+ "Default directory to look for patches."
:type '(choice (const nil) string)
:group 'ediff-ptch)
"\\|" ; GNU unified format diff 2-liner
"^--- +\\([^ \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
program."
:type 'regexp
-;;; Local Variables:
-;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
-;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
-;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
-;;; End:
+;; Local Variables:
+;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
+;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
+;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
+;; End:
;; arch-tag: 2fe2161e-e116-469b-90fa-5cbb44c1bd1b
;;; ediff-ptch.el ends here