Fix merge mistake

[bpt/emacs.git] / lisp / emacs-lisp / helper.el

diff --git a/lisp/emacs-lisp/helper.el b/lisp/emacs-lisp/helper.el
index a7cf792..abcf6e8 100644 (file)
--- a/lisp/emacs-lisp/helper.el
+++ b/lisp/emacs-lisp/helper.el
@@ -1,7 +1,7 @@
 ;;; helper.el --- utility help package supporting help in electric modes
 
 ;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: K. Shane Hartman
 ;; Maintainer: FSF
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -120,10 +120,9 @@
 (defun Helper-describe-mode ()
   "Describe the current mode."
   (interactive)
-  (let ((name mode-name)
+  (let ((name (format-mode-line mode-name))
        (documentation (documentation major-mode)))
-    (save-excursion
-      (set-buffer (get-buffer-create "*Help*"))
+    (with-current-buffer (get-buffer-create "*Help*")
       (setq buffer-read-only nil)
       (erase-buffer)
       (insert name " Mode\n" documentation)
@@ -158,5 +157,5 @@
 
 (provide 'helper)
 
-;;; arch-tag: a0984577-d3e9-4124-ae0d-c46fe740f6a9
+;; arch-tag: a0984577-d3e9-4124-ae0d-c46fe740f6a9
 ;;; helper.el ends here