From 045ee6175e9340f873db03445c74ff9eefa35a27 Mon Sep 17 00:00:00 2001 From: dieggsy Date: Mon, 4 Dec 2017 00:03:32 -0500 Subject: [PATCH] Remove focus-any and simply apply derived-mode-p It already takes multiple modes as arguments, removing the need for focus-any. --- focus.el | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/focus.el b/focus.el index 008da69..9a0dd16 100644 --- a/focus.el +++ b/focus.el @@ -98,18 +98,12 @@ The timer calls `focus-read-only-hide-cursor' after focus-read-only-blink-timer)) (make-local-variable var)) -(defun focus-any (f lst) - "Apply F to each element of LST and return first NON-NIL." - (when lst - (let ((v (funcall f (car lst)))) - (if v v (focus-any f (cdr lst)))))) - (defun focus-get-thing () "Return the current thing, based on `focus-mode-to-thing'." (or focus-current-thing (let* ((modes (mapcar 'car focus-mode-to-thing)) (mode (or (cl-find major-mode modes) - (focus-any 'derived-mode-p modes)))) + (apply #'derived-mode-p modes)))) (if mode (cdr (assoc mode focus-mode-to-thing)) 'sentence)))) (defun focus-bounds ()