[AC21.5] modeline problem: frame-tty-p not defined

[Stephen J. Turnbull]

APPROVE COMMIT 21.5

2007-06-19  Ron Isaacson  <Ron.Isaacson at morganstanley.com>

	* modeline.el (modeline-update-tty-frame-specifier): Don't use
	non-existent function frame-tty-p.

--- modeline.el.orig	2002-03-13 03:52:07.000000000 -0500
+++ modeline.el	2007-06-19 13:58:09.000000000 -0400
@@ -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]"


Ron Isaacson writes:
 > Ben Wing wrote:
 > > 
 > > Stephen J. Turnbull wrote:
 > > > Ron Isaacson writes:
 > > >
 > > >  > In modeline.el, modeline-update-tty-frame-specifier tries to use
 > > >  > frame-tty-p. If that function is not defined, modeline-tty-frame-id
 > > >  > will always be blank, and it doesn't seem to be defined anywhere.
 > > >
 > > > Why not just use (eq (frame-type f) 'tty)?  AFAICT this isn't used
 > > > anywhere else, nor do corresponding type-specific predicates exist for
 > > > other kinds of frames.
 > > >
 > > >
 > > hmm, i thought that frame-tty-p is supposed to be defined always,
 > > whether or not TTY support is compiled in, but i see i was wrong.
 > 
 > No worries... simple patch attached.
 > 
 > --
 > Ron Isaacson
 > Morgan Stanley
 > ron.isaacson at morganstanley.com / (212) 762-1950
 >