Prevent server-mode from issuing a prompt in kill-emacs-hook.

[gnu-emacs] / lisp / informat.el

diff --git a/lisp/informat.el b/lisp/informat.el
index 0324e1a831162caf8cadd66ad4d8ab48c9316bd4..7c8ea3b3379d54d5f986005858b9aa2a29533bcc 100644 (file)
--- a/lisp/informat.el
+++ b/lisp/informat.el
@@ -1,7 +1,7 @@
 ;;; informat.el --- info support functions package for Emacs
 
 ;; Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: help
@@ -497,8 +497,7 @@ For example, invoke \"emacs -batch -f batch-info-validate $info/ ~/*.info\""
                      nil ;(message "Checking validity of info file %s... OK" file)
                    (message "----------------------------------------------------------------------")
                    (message ">> PROBLEMS IN INFO FILE %s" file)
-                   (save-excursion
-                     (set-buffer loss-name)
+                   (with-current-buffer loss-name
                      (princ (buffer-substring-no-properties
                              (point-min) (point-max))))
                    (message "----------------------------------------------------------------------")