Merge from emacs--rel--22

[bpt/emacs.git] / lisp / diff-mode.el

diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 3c8ad2c..be4c7e7 100644 (file)
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -724,7 +724,7 @@ PREFIX is only used internally: don't use it."
 (defun diff-unified->context (start end)
   "Convert unified diffs to context diffs.
 START and END are either taken from the region (if a prefix arg is given) or
-else cover the whole bufer."
+else cover the whole buffer."
   (interactive (if (or current-prefix-arg (and transient-mark-mode mark-active))
                   (list (region-beginning) (region-end))
                 (list (point-min) (point-max))))
@@ -907,7 +907,7 @@ With a prefix argument, convert unified format to context format."
 (defun diff-reverse-direction (start end)
   "Reverse the direction of the diffs.
 START and END are either taken from the region (if a prefix arg is given) or
-else cover the whole bufer."
+else cover the whole buffer."
   (interactive (if (or current-prefix-arg (and transient-mark-mode mark-active))
                   (list (region-beginning) (region-end))
                 (list (point-min) (point-max))))
@@ -969,7 +969,7 @@ else cover the whole bufer."
 (defun diff-fixup-modifs (start end)
   "Fixup the hunk headers (in case the buffer was modified).
 START and END are either taken from the region (if a prefix arg is given) or
-else cover the whole bufer."
+else cover the whole buffer."
   (interactive (if (or current-prefix-arg (and transient-mark-mode mark-active))
                   (list (region-beginning) (region-end))
                 (list (point-min) (point-max))))