2 files changed, 18 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2dea7f36f95..eb66d56e6e7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * bindings.el (mode-line-frame-control): New function, caters to
+        `pc' ``window system''.
+        (mode-line-frame-identification): Use it instead of accessing
+        window-system directly.
+
 2008-08-25  Juri Linkov  <juri@jurta.org>
 
         * textmodes/text-mode.el (text-mode-map): Unbind "\es" from
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 559c3a35751..818467e567f 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -215,7 +215,17 @@ mnemonics of the following coding systems:
 
 (make-variable-buffer-local 'mode-line-mule-info)
 
-(defvar mode-line-frame-identification '(window-system "  " "-%F  ")
+;; MSDOS frames have window-system, but want the Fn identification.
+(defun mode-line-frame-control ()
+  "Compute mode-line control for frame identification.
+Value is used for `mode-line-frame-identification', which see."
+  (if (or (null (window-system))
+          (eq (window-system) 'pc))
+      "-%F  "
+    "  "))
+
+(defvar mode-line-frame-identification
+  (list (mode-line-frame-control))
   "Mode-line control to describe the current frame.")
 
 (defvar mode-line-process nil "\