diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2019-09-14 15:23:57 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2019-10-01 20:25:11 +0200 |
| commit | b6a8014fbee33336e17d88b37b5ad46d9358cc2f (patch) | |
| tree | 1328b9c9d1fa84758f710e08243cd9d67dbce7dc /lisp/winner.el | |
| parent | b03b3549207fab66464e3223367f45dbe7ecf0ac (diff) | |
| download | emacs-b6a8014fbee33336e17d88b37b5ad46d9358cc2f.tar.gz | |
Remove XEmacs compat code from winner.el (Bug#37524)
* lisp/winner.el (winner-active-region, winner-edges)
(winner-window-list, winner-sorted-window-list, winner-win-data)
(winner-make-point-alist): Remove XEmacs compat code.
Diffstat (limited to 'lisp/winner.el')
| -rw-r--r-- | lisp/winner.el | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/lisp/winner.el b/lisp/winner.el index ec3b296489c..dc8bde5331f 100644 --- a/lisp/winner.el +++ b/lisp/winner.el @@ -36,19 +36,9 @@ (defun winner-active-region () (declare (gv-setter (lambda (store) - (if (featurep 'xemacs) - `(if ,store (zmacs-activate-region) - (zmacs-deactivate-region)) - `(if ,store (activate-mark) (deactivate-mark)))))) + `(if ,store (activate-mark) (deactivate-mark))))) (region-active-p)) -(defalias 'winner-edges - (if (featurep 'xemacs) 'window-pixel-edges 'window-edges)) -(defalias 'winner-window-list - (if (featurep 'xemacs) - (lambda () (delq (minibuffer-window) (window-list nil 0))) - (lambda () (window-list nil 0)))) - (require 'ring) (defgroup winner nil @@ -82,17 +72,17 @@ You may want to include buffer names such as *Help*, *Apropos*, ;; List the windows according to their edges. (defun winner-sorted-window-list () - (sort (winner-window-list) + (sort (window-list nil 0) (lambda (x y) - (cl-loop for a in (winner-edges x) - for b in (winner-edges y) + (cl-loop for a in (window-edges x) + for b in (window-edges y) while (= a b) finally return (< a b))))) (defun winner-win-data () ;; Essential properties of the windows in the selected frame. (cl-loop for win in (winner-sorted-window-list) - collect (cons (winner-edges win) (window-buffer win)))) + collect (cons (window-edges win) (window-buffer win)))) ;; This variable is updated with the current window configuration ;; every time it changes. @@ -242,7 +232,7 @@ You may want to include buffer names such as *Help*, *Apropos*, (defun winner-make-point-alist () (save-current-buffer (cl-loop with alist - for win in (winner-window-list) + for win in (window-list nil 0) for entry = (or (assq (window-buffer win) alist) (car (push (list (set-buffer (window-buffer win)) |