[Emacs-diffs] Changes to emacs/lisp/bindings.el,v

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    08/08/29 09:01:13

Index: bindings.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/bindings.el,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -b -r1.211 -r1.212
--- bindings.el 25 Aug 2008 21:50:55 -0000      1.211
+++ bindings.el 29 Aug 2008 09:01:13 -0000      1.212
@@ -219,14 +219,17 @@
 (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))
+  (if (or (null initial-window-system)
+         (eq initial-window-system 'pc))
       "-%F  "
     "  "))
 
-(defvar mode-line-frame-identification
-  (list (mode-line-frame-control))
+(defvar mode-line-frame-identification "  "
   "Mode-line control to describe the current frame.")
+;; We need to defer the call to mode-line-frame-control to the time
+;; the mode line is actually displayed.
+(setq mode-line-frame-identification '(:eval (mode-line-frame-control)))
+(put 'mode-line-frame-identification 'risky-local-variable t)
 
 (defvar mode-line-process nil "\
 Mode-line control for displaying info on process status.