summaryrefslogtreecommitdiff
path: root/lisp/bindings.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/bindings.el')
-rw-r--r--lisp/bindings.el11
1 files changed, 7 insertions, 4 deletions
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 818467e567f..cab319e1a3c 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -219,14 +219,17 @@ mnemonics of the following coding systems:
(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.