aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/diff-mode.el
diff options
context:
space:
mode:
authorLute Kamstra2008-12-03 05:48:14 +0000
committerLute Kamstra2008-12-03 05:48:14 +0000
commit9201cc281b10650e96296eda8519403e2b508fbd (patch)
treee86a6ba2b3d0044d996036ccf8430908dca34b26 /lisp/diff-mode.el
parent1b17adfd3b07d24b4665ff66fd1b1dcc05f6c823 (diff)
downloademacs-9201cc281b10650e96296eda8519403e2b508fbd.tar.gz
emacs-9201cc281b10650e96296eda8519403e2b508fbd.zip
* 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/diff-mode.el')
-rw-r--r--lisp/diff-mode.el14
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index b711b0635d6..4eb50899847 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -39,7 +39,7 @@
39 39
40;; - Improve `diff-add-change-log-entries-other-window', 40;; - Improve `diff-add-change-log-entries-other-window',
41;; it is very simplistic now. 41;; it is very simplistic now.
42;; 42;;
43;; - Add a `delete-after-apply' so C-c C-a automatically deletes hunks. 43;; - Add a `delete-after-apply' so C-c C-a automatically deletes hunks.
44;; Also allow C-c C-a to delete already-applied hunks. 44;; Also allow C-c C-a to delete already-applied hunks.
45;; 45;;
@@ -77,7 +77,7 @@ Else, it jumps to the new file."
77 :group 'diff-mode) 77 :group 'diff-mode)
78 78
79(defcustom diff-update-on-the-fly t 79(defcustom diff-update-on-the-fly t
80 "*Non-nil means hunk headers are kept up-to-date on-the-fly. 80 "Non-nil means hunk headers are kept up-to-date on-the-fly.
81When editing a diff file, the line numbers in the hunk headers 81When editing a diff file, the line numbers in the hunk headers
82need to be kept consistent with the actual diff. This can 82need to be kept consistent with the actual diff. This can
83either be done on the fly (but this sometimes interacts poorly with the 83either be done on the fly (but this sometimes interacts poorly with the
@@ -87,7 +87,7 @@ when editing big diffs)."
87 :group 'diff-mode) 87 :group 'diff-mode)
88 88
89(defcustom diff-advance-after-apply-hunk t 89(defcustom diff-advance-after-apply-hunk t
90 "*Non-nil means `diff-apply-hunk' will move to the next hunk after applying." 90 "Non-nil means `diff-apply-hunk' will move to the next hunk after applying."
91 :type 'boolean 91 :type 'boolean
92 :group 'diff-mode) 92 :group 'diff-mode)
93 93
@@ -517,7 +517,7 @@ but in the file header instead, in which case move forward to the first hunk."
517 res 517 res
518 (goto-char start) 518 (goto-char start)
519 (error "Can't find the beginning of the file"))))) 519 (error "Can't find the beginning of the file")))))
520 520
521 521
522(defun diff-end-of-file () 522(defun diff-end-of-file ()
523 (re-search-forward "^[-+#!<>0-9@* \\]" nil t) 523 (re-search-forward "^[-+#!<>0-9@* \\]" nil t)
@@ -571,7 +571,7 @@ If the prefix ARG is given, restrict the view to the current file instead."
571 571
572;; "index ", "old mode", "new mode", "new file mode" and 572;; "index ", "old mode", "new mode", "new file mode" and
573;; "deleted file mode" are output by git-diff. 573;; "deleted file mode" are output by git-diff.
574(defconst diff-file-junk-re 574(defconst diff-file-junk-re
575 "diff \\|index \\|\\(?:deleted file\\|new\\(?: file\\)?\\|old\\) mode") 575 "diff \\|index \\|\\(?:deleted file\\|new\\(?: file\\)?\\|old\\) mode")
576 576
577(defun diff-beginning-of-file-and-junk () 577(defun diff-beginning-of-file-and-junk ()
@@ -620,7 +620,7 @@ data such as \"Index: ...\" and such."
620 ;; a file diff but elsewhere. 620 ;; a file diff but elsewhere.
621 (goto-char orig) 621 (goto-char orig)
622 (signal (car err) (cdr err))))) 622 (signal (car err) (cdr err)))))
623 623
624(defun diff-file-kill () 624(defun diff-file-kill ()
625 "Kill current file's hunks." 625 "Kill current file's hunks."
626 (interactive) 626 (interactive)
@@ -1635,7 +1635,7 @@ With a prefix argument, REVERSE the hunk."
1635 ;; for diff-goto-source, and is thus confusing. Also when you don't 1635 ;; for diff-goto-source, and is thus confusing. Also when you don't
1636 ;; know about it it's pretty surprising. 1636 ;; know about it it's pretty surprising.
1637 ;; TODO: make it possible to ask explicitly for this behavior. 1637 ;; TODO: make it possible to ask explicitly for this behavior.
1638 ;; 1638 ;;
1639 ;; This is duplicated in diff-test-hunk. 1639 ;; This is duplicated in diff-test-hunk.
1640 (diff-find-source-location nil reverse) 1640 (diff-find-source-location nil reverse)
1641 (cond 1641 (cond