# HG changeset patch
# User stephent
# Date 1183105066 0
# Node ID b325de44db277d770534b56f7048286025a28e1e
# Parent  f9be867eb83ec4946a20e8e44cffa6d023ee8855
[xemacs-hg @ 2007-06-29 08:17:44 by stephent]
Don't use nonexistent function frame-tty-p. <87tzsr17ye.fsf@uwakimon.sk.tsukuba.ac.jp>

diff -r f9be867eb83e -r b325de44db27 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Jun 29 08:01:08 2007 +0000
+++ b/lisp/ChangeLog	Fri Jun 29 08:17:46 2007 +0000
@@ -1,3 +1,8 @@
+2007-06-19  Ron Isaacson  <Ron.Isaacson@morganstanley.com>
+
+	* modeline.el (modeline-update-tty-frame-specifier): Don't use
+	non-existent function frame-tty-p.
+
 2007-06-23  Adrian Aichner  <adrian@xemacs.org>
 
 	* package-get.el (package-get-download-sites): Add and announce
diff -r f9be867eb83e -r b325de44db27 lisp/modeline.el
--- a/lisp/modeline.el	Fri Jun 29 08:01:08 2007 +0000
+++ b/lisp/modeline.el	Fri Jun 29 08:17:46 2007 +0000
@@ -827,10 +827,9 @@
 (defconst modeline-tty-frame-specifier (make-specifier 'boolean))
 (add-hook 'create-frame-hook 'modeline-update-tty-frame-specifier)
 (defun modeline-update-tty-frame-specifier (f)
-  (if-fboundp 'frame-tty-p
-      (if (and (frame-tty-p f)
-	       (> (frame-property f 'frame-number) 1))
-	  (set-specifier modeline-tty-frame-specifier t f))))
+  (if (and (eq (frame-type f) 'tty)
+	   (> (frame-property f 'frame-number) 1))
+      (set-specifier modeline-tty-frame-specifier t f)))
 
 (define-modeline-control tty-frame-id (list modeline-tty-frame-specifier
 					    " [%S]"