aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2007-08-06 20:08:55 +0000
committerStefan Monnier2007-08-06 20:08:55 +0000
commitdfbd373dfb9de125e016bb7d11b46d05fdf992c4 (patch)
tree2c3cd6ae64c1e0828c96b9f7e4aa0e8864479600
parentbc04f6bf4f2d77093b5a42f6f007b3474d86fb2d (diff)
downloademacs-dfbd373dfb9de125e016bb7d11b46d05fdf992c4.tar.gz
emacs-dfbd373dfb9de125e016bb7d11b46d05fdf992c4.zip
(diff-unified->context, diff-reverse-direction, diff-fixup-modifs):
Typo in docstring.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/diff-mode.el6
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f5319ac3ce9..790bb74d2d9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12007-08-06 Tom Tromey <tromey@redhat.com>
2
3 * diff-mode.el (diff-unified->context, diff-reverse-direction)
4 (diff-fixup-modifs): Typo in docstring.
5
12007-08-06 Stefan Monnier <monnier@iro.umontreal.ca> 62007-08-06 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * emulation/tpu-edt.el (tpu-current-line): Use posn-at-point and 8 * emulation/tpu-edt.el (tpu-current-line): Use posn-at-point and
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index f2800f1c337..e0aee67a62b 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -685,7 +685,7 @@ PREFIX is only used internally: don't use it."
685(defun diff-unified->context (start end) 685(defun diff-unified->context (start end)
686 "Convert unified diffs to context diffs. 686 "Convert unified diffs to context diffs.
687START and END are either taken from the region (if a prefix arg is given) or 687START and END are either taken from the region (if a prefix arg is given) or
688else cover the whole bufer." 688else cover the whole buffer."
689 (interactive (if (or current-prefix-arg (and transient-mark-mode mark-active)) 689 (interactive (if (or current-prefix-arg (and transient-mark-mode mark-active))
690 (list (region-beginning) (region-end)) 690 (list (region-beginning) (region-end))
691 (list (point-min) (point-max)))) 691 (list (point-min) (point-max))))
@@ -847,7 +847,7 @@ With a prefix argument, convert unified format to context format."
847(defun diff-reverse-direction (start end) 847(defun diff-reverse-direction (start end)
848 "Reverse the direction of the diffs. 848 "Reverse the direction of the diffs.
849START and END are either taken from the region (if a prefix arg is given) or 849START and END are either taken from the region (if a prefix arg is given) or
850else cover the whole bufer." 850else cover the whole buffer."
851 (interactive (if (or current-prefix-arg (and transient-mark-mode mark-active)) 851 (interactive (if (or current-prefix-arg (and transient-mark-mode mark-active))
852 (list (region-beginning) (region-end)) 852 (list (region-beginning) (region-end))
853 (list (point-min) (point-max)))) 853 (list (point-min) (point-max))))
@@ -909,7 +909,7 @@ else cover the whole bufer."
909(defun diff-fixup-modifs (start end) 909(defun diff-fixup-modifs (start end)
910 "Fixup the hunk headers (in case the buffer was modified). 910 "Fixup the hunk headers (in case the buffer was modified).
911START and END are either taken from the region (if a prefix arg is given) or 911START and END are either taken from the region (if a prefix arg is given) or
912else cover the whole bufer." 912else cover the whole buffer."
913 (interactive (if (or current-prefix-arg (and transient-mark-mode mark-active)) 913 (interactive (if (or current-prefix-arg (and transient-mark-mode mark-active))
914 (list (region-beginning) (region-end)) 914 (list (region-beginning) (region-end))
915 (list (point-min) (point-max)))) 915 (list (point-min) (point-max))))