* erc-ibuffer.el (erc-channel-modes):

* bs.el (bs--sort-by-mode, bs--get-mode-name):
* imenu.el (imenu-add-to-menubar):
* makesum.el (make-command-summary):
* mouse.el (mouse-major-mode-menu, mouse-popup-menubar, mouse-buffer-menu):
* msb.el (msb--mode-menu-cond):
* calc/calc-embed.el (calc-do-embedded):
* emacs-lisp/helper.el (Helper-describe-mode):
* mail/emacsbug.el (report-emacs-bug):
* progmodes/hideshow.el (hs-grok-mode-type):
* textmodes/sgml-mode.el (sgml-mode-facemenu-add-face-function):
* textmodes/table.el (*table--cell-describe-mode):
Pass mode-name through format-mode-line.

2 files changed, 4 insertions, 4 deletions

diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 245ffc47908..0c361463022 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -1,7 +1,7 @@
 ;;; sgml-mode.el --- SGML- and HTML-editing modes -*- coding: iso-2022-7bit -*-
 
 ;; Copyright (C) 1992, 1995, 1996, 1998, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: James Clark <jjc@jclark.com>
 ;; Maintainer: FSF
@@ -397,7 +397,7 @@ a DOCTYPE or an XML declaration."
         (setq face (funcall skeleton-transformation-function face))
         (setq facemenu-end-add-face (concat "</" face ">"))
         (concat "<" face ">"))
-    (error "Face not configured for %s mode" mode-name)))
+    (error "Face not configured for %s mode" (format-mode-line mode-name))))
 
 (defun sgml-fill-nobreak ()
   ;; Don't break between a tag name and its first argument.
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index 5e8b8c7cbc2..2aea24cede5 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -1,7 +1,7 @@
 ;;; table.el --- create and edit WYSIWYG text based embedded tables
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007  Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 ;; Keywords: wp, convenience
 ;; Author: Takaaki Ota <Takaaki.Ota@am.sony.com>
@@ -4061,7 +4061,7 @@ converts a table into plain text without frames.  It is a companion to
       (call-interactively 'describe-mode)
     (with-output-to-temp-buffer "*Help*"
       (princ "Table mode: (in ")
-      (princ mode-name)
+      (princ (format-mode-line mode-name nil nil (current-buffer)))
       (princ " mode)
 
 Table is not a mode technically.  You can regard it as a pseudo mode