Mercurial > emacs
diff lisp/ediff-ptch.el @ 100171:d42aff5ca541
* align.el:
* allout.el:
* apropos.el:
* arc-mode.el:
* autoinsert.el:
* avoid.el:
* battery.el:
* bookmark.el:
* buff-menu.el:
* calculator.el:
* chistory.el:
* cmuscheme.el:
* comint.el:
* compare-w.el:
* dabbrev.el:
* delim-col.el:
* desktop.el:
* diff-mode.el:
* diff.el:
* dired-aux.el:
* dired-x.el:
* dired.el:
* dos-vars.el:
* ediff-diff.el:
* ediff-help.el:
* ediff-init.el:
* ediff-merg.el:
* ediff-mult.el:
* ediff-ptch.el:
* ediff-vers.el:
* ediff-wind.el:
* ediff.el:
* emerge.el:
* facemenu.el:
* faces.el:
* ffap.el:
* filecache.el:
* find-dired.el:
* font-core.el:
* font-lock.el:
* forms.el:
* fringe.el:
* help-at-pt.el:
* hippie-exp.el:
* ido.el:
* image-file.el:
* imenu.el:
* indent.el:
* info.el:
* isearchb.el:
* iswitchb.el:
* jit-lock.el:
* jka-compr.el:
* log-edit.el:
* lpr.el:
* ls-lisp.el:
* man.el:
* menu-bar.el:
* midnight.el:
* mouse-sel.el:
* mouse.el:
* msb.el:
* outline.el:
* paren.el:
* pcmpl-cvs.el:
* pcmpl-gnu.el:
* pcomplete.el:
* pcvs-info.el:
* pcvs-parse.el:
* printing.el:
* ps-mule.el:
* ps-print.el:
* replace.el:
* ruler-mode.el:
* saveplace.el:
* sb-image.el:
* scroll-bar.el:
* sha1.el:
* shadowfile.el:
* shell.el:
* sort.el:
* speedbar.el:
* strokes.el:
* tempo.el:
* term.el:
* terminal.el:
* time-stamp.el:
* time.el:
* tree-widget.el:
* type-break.el:
* vc-cvs.el:
* vc-hg.el:
* vc-mcvs.el:
* vc-rcs.el:
* vc-sccs.el:
* vc.el:
* view.el:
* w32-vars.el:
* whitespace.el:
* wid-edit.el: Remove leading * from docstrings of defcustoms,
deffaces, defconsts and defuns.
author | Lute Kamstra <lute@gnu.org> |
---|---|
date | Wed, 03 Dec 2008 05:48:14 +0000 |
parents | c3512b2085a0 |
children | a9dc0e7c3f2b |
line wrap: on
line diff
--- a/lisp/ediff-ptch.el Wed Dec 03 05:48:11 2008 +0000 +++ b/lisp/ediff-ptch.el Wed Dec 03 05:48:14 2008 +0000 @@ -41,12 +41,12 @@ (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'. @@ -93,7 +93,7 @@ (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. @@ -117,7 +117,7 @@ (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) @@ -129,7 +129,7 @@ "\\|" ; 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