From 2428c57bd12b0e975c57b20d40d693c4e1b307db Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 29 Aug 2008 09:02:00 +0000 Subject: [PATCH] (mode-line-frame-identification): Fix last change. --- lisp/ChangeLog | 4 ++++ lisp/bindings.el | 11 +++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ad294332bb3..03e0e8e1e6d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2008-08-29 Eli Zaretskii + + * bindings.el (mode-line-frame-identification): Fix last change. + 2008-08-29 Kenichi Handa These changes are to adjust the automatic composition for the new 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. -- 2.11.4.GIT