(server-ensure-safe-dir): UIDs may be floats.

[gnu-emacs] / lisp / tmm.el

diff --git a/lisp/tmm.el b/lisp/tmm.el
index 73eb404b14c508fa4d3da2a794aca90c0deffe2b..a2da0005b5a633c8e212f0496e37b471e818af18 100644 (file)
--- a/lisp/tmm.el
+++ b/lisp/tmm.el
@@ -1,7 +1,7 @@
 ;;; tmm.el --- text mode access to menu-bar
 
-;; Copyright (C) 1994, 1995, 1996, 2000, 2001, 2002
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996, 2000, 2001, 2002, 2003,
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Ilya Zakharevich <ilya@math.mps.ohio-state.edu>
 ;; Maintainer: FSF
@@ -21,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -133,7 +133,7 @@ specify nil for this variable."
   :type '(choice integer (const nil))
   :group 'tmm)
 
-(defface tmm-inactive-face
+(defface tmm-inactive
   '((t :inherit shadow))
   "Face used for inactive menu items."
   :group 'tmm)
@@ -305,7 +305,7 @@ Stores a list of all the shortcuts in the free variable `tmm-short-cuts'."
       (if char (setq tmm-short-cuts (cons char tmm-short-cuts)))
       (cons (concat (if char (concat (char-to-string char) tmm-mid-prompt)
                       ;; keep them lined up in columns
-                      (make-string (1+ (length tmm-mid-prompt)) ?\ ))
+                      (make-string (1+ (length tmm-mid-prompt)) ?\s))
                     str)
             (cdr elt))))))
 
@@ -349,7 +349,7 @@ Stores a list of all the shortcuts in the free variable `tmm-short-cuts'."
         (setq next (next-single-char-property-change (point) 'mouse-face))
         (when (looking-at inactive-string)
           (remove-text-properties (point) next '(mouse-face))
-          (add-text-properties (point) next '(face tmm-inactive-face)))
+          (add-text-properties (point) next '(face tmm-inactive)))
         (goto-char next)))
     (set-buffer-modified-p nil)))