diff lisp/diff-mode.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 841e92880f11
children fbcc7e272f87
line wrap: on
line diff
--- a/lisp/diff-mode.el	Wed Dec 03 05:48:11 2008 +0000
+++ b/lisp/diff-mode.el	Wed Dec 03 05:48:14 2008 +0000
@@ -39,7 +39,7 @@
 
 ;; - Improve `diff-add-change-log-entries-other-window',
 ;;   it is very simplistic now.
-;;  
+;;
 ;; - Add a `delete-after-apply' so C-c C-a automatically deletes hunks.
 ;;   Also allow C-c C-a to delete already-applied hunks.
 ;;
@@ -77,7 +77,7 @@
   :group 'diff-mode)
 
 (defcustom diff-update-on-the-fly t
-  "*Non-nil means hunk headers are kept up-to-date on-the-fly.
+  "Non-nil means hunk headers are kept up-to-date on-the-fly.
 When editing a diff file, the line numbers in the hunk headers
 need to be kept consistent with the actual diff.  This can
 either be done on the fly (but this sometimes interacts poorly with the
@@ -87,7 +87,7 @@
   :group 'diff-mode)
 
 (defcustom diff-advance-after-apply-hunk t
-  "*Non-nil means `diff-apply-hunk' will move to the next hunk after applying."
+  "Non-nil means `diff-apply-hunk' will move to the next hunk after applying."
   :type 'boolean
   :group 'diff-mode)
 
@@ -517,7 +517,7 @@
           res
         (goto-char start)
         (error "Can't find the beginning of the file")))))
-        
+
 
 (defun diff-end-of-file ()
   (re-search-forward "^[-+#!<>0-9@* \\]" nil t)
@@ -571,7 +571,7 @@
 
 ;; "index ", "old mode", "new mode", "new file mode" and
 ;; "deleted file mode" are output by git-diff.
-(defconst diff-file-junk-re 
+(defconst diff-file-junk-re
   "diff \\|index \\|\\(?:deleted file\\|new\\(?: file\\)?\\|old\\) mode")
 
 (defun diff-beginning-of-file-and-junk ()
@@ -620,7 +620,7 @@
       ;; a file diff but elsewhere.
       (goto-char orig)
       (signal (car err) (cdr err)))))
-          
+
 (defun diff-file-kill ()
   "Kill current file's hunks."
   (interactive)
@@ -1635,7 +1635,7 @@
       ;; for diff-goto-source, and is thus confusing.  Also when you don't
       ;; know about it it's pretty surprising.
       ;; TODO: make it possible to ask explicitly for this behavior.
-      ;; 
+      ;;
       ;; This is duplicated in diff-test-hunk.
       (diff-find-source-location nil reverse)
     (cond