diff options
| author | Daniel Colascione | 2015-10-01 22:10:53 -0700 |
|---|---|---|
| committer | Daniel Colascione | 2015-10-01 22:27:41 -0700 |
| commit | 87fb1e38dc284a4e654a7592796d8e66e597f86e (patch) | |
| tree | 8f38d084cdb62779fb8aff02e0de11056396f593 | |
| parent | dd6346e00c0910b16f1bd195e5e94f6ac1d696ee (diff) | |
| download | emacs-87fb1e38dc284a4e654a7592796d8e66e597f86e.tar.gz emacs-87fb1e38dc284a4e654a7592796d8e66e597f86e.zip | |
Fix winner in cl-lib not loaded case
* lisp/winner.el (winner-change-fun): Don't use cl-lib functions
without requiring CL
| -rw-r--r-- | lisp/textmodes/reftex.el | 2 | ||||
| -rw-r--r-- | lisp/winner.el | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el index 0ff1d72451e..fb96c6c551b 100644 --- a/lisp/textmodes/reftex.el +++ b/lisp/textmodes/reftex.el | |||
| @@ -2446,7 +2446,7 @@ of ENTRY-LIST is a list of cons cells (\"MACRONAME\" . LEVEL). See | |||
| 2446 | 2446 | ||
| 2447 | ;;;*** | 2447 | ;;;*** |
| 2448 | 2448 | ||
| 2449 | ;;;### (autoloads nil "reftex-cite" "reftex-cite.el" "43a3f05c024aee5b7708420f74266933") | 2449 | ;;;### (autoloads nil "reftex-cite" "reftex-cite.el" "751df6ee674ea533b755e8cda4ad1cf8") |
| 2450 | ;;; Generated autoloads from reftex-cite.el | 2450 | ;;; Generated autoloads from reftex-cite.el |
| 2451 | 2451 | ||
| 2452 | (autoload 'reftex-default-bibliography "reftex-cite" "\ | 2452 | (autoload 'reftex-default-bibliography "reftex-cite" "\ |
diff --git a/lisp/winner.el b/lisp/winner.el index a05f4ba867e..3767b9f1f69 100644 --- a/lisp/winner.el +++ b/lisp/winner.el | |||
| @@ -180,7 +180,8 @@ You may want to include buffer names such as *Help*, *Apropos*, | |||
| 180 | 180 | ||
| 181 | ;; Cull dead frames. | 181 | ;; Cull dead frames. |
| 182 | (setq winner-modified-list | 182 | (setq winner-modified-list |
| 183 | (cl-remove-if-not 'frame-live-p winner-modified-list)) | 183 | (cl-loop for frame in winner-modified-list |
| 184 | if (frame-live-p frame) collect frame)) | ||
| 184 | 185 | ||
| 185 | (unless (or (memq (selected-frame) winner-modified-list) | 186 | (unless (or (memq (selected-frame) winner-modified-list) |
| 186 | (/= 0 (minibuffer-depth))) | 187 | (/= 0 (minibuffer-depth))) |