[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 17:56:33

Index: bindings.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/bindings.el,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -b -r1.212 -r1.213
--- bindings.el 29 Aug 2008 09:01:13 -0000      1.212
+++ bindings.el 29 Aug 2008 17:56:33 -0000      1.213
@@ -219,16 +219,15 @@
 (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 initial-window-system)
-         (eq initial-window-system 'pc))
+  (if (or (null window-system)
+         (eq window-system 'pc))
       "-%F  "
     "  "))
 
-(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)))
+(defvar mode-line-frame-identification '(:eval (mode-line-frame-control))
+  "Mode-line control to describe the current frame.")
 (put 'mode-line-frame-identification 'risky-local-variable t)
 
 (defvar mode-line-process nil "\