Merge from emacs-23; up to 2010-06-29T18:17:31Z!cyd@stupidchicken.com.

[gnu-emacs] / lisp / vc / ediff-wind.el

diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el
index 5a7fa0bf9505a1c0b95ce1670a2c9cee71ab171a..83098fcb0c79e3e7f8a7f838f9658d909286e990 100644 (file)
--- a/lisp/vc/ediff-wind.el
+++ b/lisp/vc/ediff-wind.el
@@ -1,6 +1,6 @@
 ;;; ediff-wind.el --- window manipulation utilities
 
-;; Copyright (C) 1994-1997, 2000-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1994-1997, 2000-2012  Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff
@@ -1127,7 +1127,7 @@ It assumes that it is called from within the control buffer."
 
 ;; Revise the mode line to display which difference we have selected
 ;; Also resets modelines of buffers A/B, since they may be clobbered by
-;; anothe invocations of Ediff.
+;; other invocations of Ediff.
 (defun ediff-refresh-mode-lines ()
   (let (buf-A-state-diff buf-B-state-diff buf-C-state-diff buf-C-state-merge)