diff options
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/diff-mode.el | 2 | ||||
| -rw-r--r-- | lisp/vc/ediff-init.el | 2 | ||||
| -rw-r--r-- | lisp/vc/ediff-ptch.el | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 5b48c8d93df..d5ea002fa82 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -1884,7 +1884,7 @@ With a prefix argument, REVERSE the hunk." ;; Advance to the next hunk with skip-hunk-start set to t ;; because we want the behavior of moving to the next logical ;; hunk, not the original behavior where were would sometimes - ;; stay on the curent hunk. This is the behavior we get when + ;; stay on the current hunk. This is the behavior we get when ;; navigating through hunks interactively, and we want it when ;; applying hunks too (see http://debbugs.gnu.org/17544). (when diff-advance-after-apply-hunk diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index b0d5d2fabc4..c96a9684ac8 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el @@ -318,7 +318,7 @@ It needs to be killed when we quit the session.") (defsubst ediff-patch-metajob (&optional metajob) (memq (or metajob ediff-metajob-name) '(ediff-multifile-patch))) -;; metajob involving only one group of files, such as multipatch or directory +;; metajob involving only one group of files, such as multi-patch or directory ;; revision (defsubst ediff-one-filegroup-metajob (&optional metajob) (or (ediff-revision-metajob metajob) diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el index 3effd9b2cf9..9f0e1dcf4f7 100644 --- a/lisp/vc/ediff-ptch.el +++ b/lisp/vc/ediff-ptch.el @@ -431,15 +431,15 @@ Please advise: (f2-exists (setcar session-file-object file2)) (f1-exists (setcar session-file-object file1)) (t - ;; TODO: Often for multipaches the file doesn't exist because the - ;; directory part is wrong; for instance, if the patch need to - ;; be applied into + ;; TODO: Often for multi-patches the file doesn't exist + ;; because the directory part is wrong; for instance, if the + ;; patch needs to be applied into ;; (expand-file-name "lisp/vc/ediff-ptch.el" source-directory) ;; and default-directory is ;; (expand-file-name "lisp" source-directory) ;; then Ediff assumes the wrong file: ;; (expand-file-name "lisp/ediff-ptch.el" source-directory). - ;; We might identify these common failoures and suggest + ;; We might identify these common failures and suggest ;; in the prompt the possible corrected file. --Tino (with-output-to-temp-buffer ediff-msg-buffer (ediff-with-current-buffer standard-output |