Mercurial > emacs
comparison lisp/diff.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 | 34f4c0ab1342 |
| children | e60cb7984ff1 |
comparison
equal
deleted
inserted
replaced
| 100170:86455974b971 | 100171:d42aff5ca541 |
|---|---|
| 33 "Comparing files with `diff'." | 33 "Comparing files with `diff'." |
| 34 :group 'tools) | 34 :group 'tools) |
| 35 | 35 |
| 36 ;;;###autoload | 36 ;;;###autoload |
| 37 (defcustom diff-switches "-c" | 37 (defcustom diff-switches "-c" |
| 38 "*A string or list of strings specifying switches to be passed to diff." | 38 "A string or list of strings specifying switches to be passed to diff." |
| 39 :type '(choice string (repeat string)) | 39 :type '(choice string (repeat string)) |
| 40 :group 'diff) | 40 :group 'diff) |
| 41 | 41 |
| 42 ;;;###autoload | 42 ;;;###autoload |
| 43 (defcustom diff-command "diff" | 43 (defcustom diff-command "diff" |
| 44 "*The command to use to run diff." | 44 "The command to use to run diff." |
| 45 :type 'string | 45 :type 'string |
| 46 :group 'diff) | 46 :group 'diff) |
| 47 | 47 |
| 48 (defvar diff-old-temp-file nil | 48 (defvar diff-old-temp-file nil |
| 49 "This is the name of a temp file to be deleted after diff finishes.") | 49 "This is the name of a temp file to be deleted after diff finishes.") |