Update copyright year to 2015

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

diff --git a/lisp/vc/ediff-help.el b/lisp/vc/ediff-help.el
index 833e84b6cea8b4f832bb3baf179ad4ed359d7cf8..c981d89f50a465dfcb19a86cdd84b9d524490779 100644 (file)
--- a/lisp/vc/ediff-help.el
+++ b/lisp/vc/ediff-help.el
@@ -1,6 +1,6 @@
 ;;; ediff-help.el --- Code related to the contents of Ediff help buffers
 
-;; Copyright (C) 1996-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2015 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff
@@ -253,7 +253,7 @@ the value of this variable and the variables `ediff-help-message-*' in
 
 
 (defun ediff-indent-help-message ()
-  (let* ((shift (/ (max 0 (- (window-width (selected-window))
+  (let* ((shift (/ (max 0 (- (window-width)
                             (ediff-help-message-line-length)))
                   2))
         (str (make-string shift ?\ )))