summaryrefslogtreecommitdiff
path: root/lisp/ediff-help.el
diff options
context:
space:
mode:
authorLute Kamstra <lute@gnu.org>2008-12-03 05:48:14 +0000
committerLute Kamstra <lute@gnu.org>2008-12-03 05:48:14 +0000
commit9201cc281b10650e96296eda8519403e2b508fbd (patch)
treee86a6ba2b3d0044d996036ccf8430908dca34b26 /lisp/ediff-help.el
parent1b17adfd3b07d24b4665ff66fd1b1dcc05f6c823 (diff)
downloademacs-9201cc281b10650e96296eda8519403e2b508fbd.tar.gz
* 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.
Diffstat (limited to 'lisp/ediff-help.el')
-rw-r--r--lisp/ediff-help.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ediff-help.el b/lisp/ediff-help.el
index b503f271743..0346a2070d5 100644
--- a/lisp/ediff-help.el
+++ b/lisp/ediff-help.el
@@ -81,7 +81,7 @@ p,DEL -previous diff | | -vert/horiz split |a/b -copy A/B's region to B/A
n,SPC -next diff | h -hilighting | rx -restore buf X's old diff
j -jump to diff | @ -auto-refinement | * -refine current region
gx -goto X's point| ## -ignore whitespace | ! -update diff regions
- C-l -recenter | #c -ignore case | % -narrow/widen buffs
+ C-l -recenter | #c -ignore case | % -narrow/widen buffs
v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X
</> -scroll lt/rt | X -read-only in buf X | wd -save diff output
~ -swap variants | m -wide display |
@@ -139,7 +139,7 @@ produce the brief help message. This function must return a string.")
See `ediff-brief-help-message-function' for more.")
(defcustom ediff-use-long-help-message nil
- "*If t, Ediff displays a long help message. Short help message otherwise."
+ "If t, Ediff displays a long help message. Short help message otherwise."
:type 'boolean
:group 'ediff-window)