Fix typos in docstrings.

[gnu-emacs] / lisp / help-fns.el

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index e30fe28682c0c03a14d5c09238b1cb0ed700bf7c..86e9411b14072b95d320f80cb9c0c907c8bae613 100644 (file)
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -1,7 +1,7 @@
 ;;; help-fns.el --- Complex help functions
 
 ;; Copyright (C) 1985, 1986, 1993, 1994, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006, 2007, 2008, 2009
+;;   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 ;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
@@ -32,8 +32,6 @@
 
 ;;; Code:
 
-(require 'help-mode)
-
 ;; Functions
 
 ;;;###autoload
@@ -457,7 +455,9 @@ suitable file is found, return nil."
              (terpri)))))
       ;; Note that list* etc do not get this property until
       ;; cl-hack-byte-compiler runs, after bytecomp is loaded.
-      (when (eq (get function 'byte-compile) 'cl-byte-compile-compiler-macro)
+      (when (and (symbolp function)
+                 (eq (get function 'byte-compile)
+                     'cl-byte-compile-compiler-macro))
        (princ "This function has a compiler macro")
        (let ((lib (get function 'compiler-macro-file)))
          (when (stringp lib)
@@ -789,8 +789,7 @@ file local variable.\n")
                  (terpri)
                  (princ output))))
 
-           (save-excursion
-             (set-buffer standard-output)
+           (with-current-buffer standard-output
              ;; Return the text we displayed.
              (buffer-string))))))))