branch: externals/window-commander
commit 0572966a0fabb0a15c109c4a8d33fc1a2adef41c
Author: Daniel Semyonov <[email protected]>
Commit: Daniel Semyonov <[email protected]>
* window-commander.el (wincom-mode): Remove legacy display function support
---
NEWS | 5 ++++-
window-commander.el | 5 -----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/NEWS b/NEWS
index ace2ed474b..d7a06edcb9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Window Commander NEWS -- history of user-visible changes. -*- mode: outline -*-
+Window Commander NEWS -- history of user-visible changes. -*- mode: emacs-news
-*-
See the end of the file for an explanation of the versioning scheme.
* 3.0.3 (wip)
@@ -9,6 +9,9 @@ Android (if they have modifier keys).
** Add minor mode menu for window commands.
** Add command for selecting the most recently used window.
** Fix window selection when less than 'wincom-minimum' windows are tracked.
+** Remove legacy display function support which was left in by accident.
+Setting 'wincom-display-lighter' to a function is now equivalent to
+setting it to any other non-nil value.
* 3.0.2
diff --git a/window-commander.el b/window-commander.el
index 76bc629d4f..c2c0fead07 100644
--- a/window-commander.el
+++ b/window-commander.el
@@ -534,7 +534,6 @@ selection:
\\{wincom-command-map}"
:global t
:lighter (:eval (and wincom-display-lighter
- (not (functionp wincom-display-lighter))
(wincom-format-id (selected-window))))
:keymap (let ((map (make-sparse-keymap)))
(define-key map [remap other-window] #'wincom-select)
@@ -544,15 +543,11 @@ selection:
(if wincom-mode
(progn
(wincom--update)
- (when (functionp wincom-display-lighter)
- (funcall wincom-display-lighter))
(add-hook 'window-configuration-change-hook #'wincom--update)
(add-hook 'window-state-change-hook #'wincom--update-frame)
(add-hook 'minibuffer-setup-hook #'wincom--update)
(add-hook 'minibuffer-exit-hook #'wincom--update)
(add-hook 'after-delete-frame-functions #'wincom--update))
- (when (functionp wincom-display-lighter)
- (funcall wincom-display-lighter))
(remove-hook 'window-configuration-change-hook #'wincom--update)
(remove-hook 'window-state-change-hook #'wincom--update-frame)
(remove-hook 'minibuffer-setup-hook #'wincom--update)
