Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[gnu-emacs] / lisp / emacs-lisp / helper.el

diff --git a/lisp/emacs-lisp/helper.el b/lisp/emacs-lisp/helper.el
index 09ee1a68f689cc7f17e927afac5e188becbe80a3..a35dc09e467ca7d971748d28242b240fa6f8dd4d 100644 (file)
--- a/lisp/emacs-lisp/helper.el
+++ b/lisp/emacs-lisp/helper.el
@@ -1,11 +1,11 @@
 ;;; helper.el --- utility help package supporting help in electric modes
 
-;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2001-2016 Free Software Foundation, Inc.
 
 ;; Author: K. Shane Hartman
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help
+;; Package: emacs
 
 ;; This file is part of GNU Emacs.
 
@@ -59,7 +59,7 @@
                        Helper-return-blurb)
                   "return")))
     (save-window-excursion
-      (goto-char (window-start (selected-window)))
+      (goto-char (window-start))
       (if (get-buffer-window "*Help*")
          (pop-to-buffer "*Help*")
        (switch-to-buffer "*Help*"))
@@ -155,5 +155,4 @@
 
 (provide 'helper)
 
-;; arch-tag: a0984577-d3e9-4124-ae0d-c46fe740f6a9
 ;;; helper.el ends here