From 8f17be9ed57f565ce12904909490de2a81760657 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Tue, 22 Jan 2019 15:47:43 +0100 Subject: [PATCH] Remove focus-mode. Never used. Signed-off-by: Andreas Gerler --- bba.org | 8 - elpa/focus-20171204.503/focus-autoloads.el | 32 --- elpa/focus-20171204.503/focus-pkg.el | 2 - elpa/focus-20171204.503/focus.el | 308 --------------------- elpa/focus-readme.txt | 4 - 5 files changed, 354 deletions(-) delete mode 100644 elpa/focus-20171204.503/focus-autoloads.el delete mode 100644 elpa/focus-20171204.503/focus-pkg.el delete mode 100644 elpa/focus-20171204.503/focus.el delete mode 100644 elpa/focus-readme.txt diff --git a/bba.org b/bba.org index 7246a28e..a4ff0db3 100644 --- a/bba.org +++ b/bba.org @@ -306,11 +306,9 @@ Display open TODO items in magit-status. (magit-todos-mode) #+END_SRC -* [[https://github.com/larstvei/Focus][focus]] do a stash, pull, pop. in the end use magit-stash. -focus on the important stuff. #+BEGIN_SRC emacs-lisp :tangle yes (defun bba-pull () "Do git stash, pull, pop" @@ -320,12 +318,6 @@ focus on the important stuff. #+END_SRC #+BEGIN_SRC emacs-lisp :tangle yes - (if (>= emacs-major-version 24) - (progn - (add-to-list 'load-path "~/.emacs.d/elpa/focus-20171204.503") - (require 'focus) - (setq focus-dimness -1) - )) #+END_SRC * fullframe diff --git a/elpa/focus-20171204.503/focus-autoloads.el b/elpa/focus-20171204.503/focus-autoloads.el deleted file mode 100644 index f782de71..00000000 --- a/elpa/focus-20171204.503/focus-autoloads.el +++ /dev/null @@ -1,32 +0,0 @@ -;;; focus-autoloads.el --- automatically extracted autoloads -;; -;;; Code: - -(add-to-list 'load-path (directory-file-name - (or (file-name-directory #$) (car load-path)))) - - -;;;### (autoloads nil "focus" "focus.el" (0 0 0 0)) -;;; Generated autoloads from focus.el - -(autoload 'focus-mode "focus" "\ -Dim the font color of text in surrounding sections. - -\(fn &optional ARG)" t nil) - -(autoload 'focus-read-only-mode "focus" "\ -A read-only mode optimized for `focus-mode'. - -\(fn &optional ARG)" t nil) - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "focus" '("turn-off-focus-read-only-mode" "focus-"))) - -;;;*** - -;; Local Variables: -;; version-control: never -;; no-byte-compile: t -;; no-update-autoloads: t -;; coding: utf-8 -;; End: -;;; focus-autoloads.el ends here diff --git a/elpa/focus-20171204.503/focus-pkg.el b/elpa/focus-20171204.503/focus-pkg.el deleted file mode 100644 index 443f8b82..00000000 --- a/elpa/focus-20171204.503/focus-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; -*- no-byte-compile: t -*- -(define-package "focus" "20171204.503" "Dim the font color of text in surrounding sections" '((emacs "24") (cl-lib "0.5")) :commit "045ee6175e9340f873db03445c74ff9eefa35a27" :authors '(("Lars Tveito" . "larstvei@ifi.uio.no")) :maintainer '("Lars Tveito" . "larstvei@ifi.uio.no") :url "http://github.com/larstvei/Focus") diff --git a/elpa/focus-20171204.503/focus.el b/elpa/focus-20171204.503/focus.el deleted file mode 100644 index 710030e0..00000000 --- a/elpa/focus-20171204.503/focus.el +++ /dev/null @@ -1,308 +0,0 @@ -;;; focus.el --- Dim the font color of text in surrounding sections -*- lexical-binding: t; -*- - -;; Copyright (C) 2015 Lars Tveito - -;; Author: Lars Tveito -;; URL: http://github.com/larstvei/Focus -;; Package-Version: 20171204.503 -;; Created: 11th May 2015 -;; Version: 0.1.1 -;; Package-Requires: ((emacs "24") (cl-lib "0.5")) - -;; This program is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. - -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see . - -;;; Commentary: - -;; Focus provides `focus-mode` that dims the text of surrounding sections, -;; similar to [iA Writer's](https://ia.net/writer) Focus Mode. -;; -;; Enable the mode with `M-x focus-mode'. - -;;; Code: - -(require 'cl-lib) -(require 'thingatpt) - -(defgroup focus () - "Dim the font color of text in surrounding sections." - :group 'font-lock - :prefix "focus-") - -(defcustom focus-dimness 0 - "Amount of dimness in out of focus sections is determined by this integer. - -A positive value increases the dimness of the sections. -A negative value decreases the dimness. - -The default is 0 which means a 50/50 mixture of the background -and foreground color." - :type '(integer) - :group 'focus) - -(defcustom focus-mode-to-thing '((prog-mode . defun) (text-mode . sentence)) - "An associated list between mode and thing. - -A thing is defined in thingatpt.el; the thing determines the -narrowness of the focused section. - -Note that the order of the list matters. The first mode that the -current mode is derived from is used, so more modes that have -many derivatives should be placed by the end of the list. - -Things that are defined include `symbol', `list', `sexp', -`defun', `filename', `url', `email', `word', `sentence', -`whitespace', `line', and `page'." - :type '(repeat symbol) - :group 'focus) - -(defcustom focus-read-only-blink-seconds 1 - "The duration of a cursor blink in `focus-read-only-mode'." - :type '(float) - :group 'focus) - -(defvar focus-cursor-type cursor-type - "Used to restore the users `cursor-type'") - -(defvar focus-current-thing nil - "Overrides the choice of thing dictated by `focus-mode-to-thing' if set.") - -(defvar focus-buffer nil - "Local reference to the buffer focus functions operate on.") - -(defvar focus-pre-overlay nil - "The overlay that dims the text prior to the current-point.") - -(defvar focus-post-overlay nil - "The overlay that dims the text past the current-point.") - -(defvar focus-read-only-blink-timer nil - "Timer started from `focus-read-only-cursor-blink'. -The timer calls `focus-read-only-hide-cursor' after -`focus-read-only-blink-seconds' seconds.") - -;; Use make-local-variable for backwards compatibility. -(dolist (var '(focus-current-thing - focus-buffer - focus-pre-overlay - focus-post-overlay - focus-read-only-blink-timer)) - (make-local-variable var)) - -(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) - (apply #'derived-mode-p modes)))) - (if mode (cdr (assoc mode focus-mode-to-thing)) 'sentence)))) - -(defun focus-bounds () - "Return the current bounds, based on `focus-get-thing'." - (bounds-of-thing-at-point (focus-get-thing))) - -(defun focus-average-colors (color &rest colors) - "Takes an average of the colors given by argument. -Argument COLOR is a color name, and so are the COLORS; COLOR is -there to ensure that the the function receives at least one -argument." - (let* ((colors (cons color colors)) - (colors (mapcar 'color-name-to-rgb colors)) - (len (length colors)) - (sums (apply 'cl-mapcar '+ colors)) - (avg (mapcar (lambda (v) (/ v len)) sums))) - (apply 'color-rgb-to-hex avg))) - -(defun focus-make-dim-color () - "Return a dimmed color relative to the current theme." - (let ((background (face-attribute 'default :background)) - (foreground (face-attribute 'default :foreground)) - (backgrounds (if (> focus-dimness 0) focus-dimness 1)) - (foregrounds (if (< focus-dimness 0) (- focus-dimness) 1))) - (apply 'focus-average-colors - (append (make-list backgrounds background) - (make-list foregrounds foreground))))) - -(defun focus-move-focus () - "Moves the focused section according to `focus-bounds'. - -If `focus-mode' is enabled, this command fires after each -command." - (with-current-buffer focus-buffer - (let* ((bounds (focus-bounds))) - (when bounds - (focus-move-overlays (car bounds) (cdr bounds)))))) - -(defun focus-move-overlays (low high) - "Move `focus-pre-overlay' and `focus-post-overlay'." - (move-overlay focus-pre-overlay (point-min) low) - (move-overlay focus-post-overlay high (point-max))) - -(defun focus-init () - "This function is run when command `focus-mode' is enabled. - -It sets the `focus-pre-overlay' and `focus-post-overlay' to -overlays; these are invisible until `focus-move-focus' is run. It -adds `focus-move-focus' to `post-command-hook'." - (unless (or focus-pre-overlay focus-post-overlay) - (setq focus-pre-overlay (make-overlay (point-min) (point-min)) - focus-post-overlay (make-overlay (point-max) (point-max)) - focus-buffer (current-buffer)) - (let ((color (focus-make-dim-color))) - (mapc (lambda (o) (overlay-put o 'face (cons 'foreground-color color))) - (list focus-pre-overlay focus-post-overlay))) - (add-hook 'post-command-hook 'focus-move-focus nil t) - (add-hook 'change-major-mode-hook 'focus-terminate nil t))) - -(defun focus-terminate () - "This function is run when command `focus-mode' is disabled. - -The overlays pointed to by `focus-pre-overlay' and `focus-post-overlay' are -deleted, and `focus-move-focus' is removed from `post-command-hook'." - (when (and focus-pre-overlay focus-post-overlay) - (mapc 'delete-overlay (list focus-pre-overlay focus-post-overlay)) - (remove-hook 'post-command-hook 'focus-move-focus t) - (setq focus-pre-overlay nil - focus-post-overlay nil))) - -(defun focus-goto-thing (bounds) - "Move point to the middle of BOUNDS." - (when bounds - (goto-char (/ (+ (car bounds) (cdr bounds)) 2)) - (recenter nil))) - -(defun focus-change-thing () - "Adjust the narrowness of the focused section for the current buffer. - -The variable `focus-mode-to-thing' dictates the default thing -according to major-mode. If `focus-current-thing' is set, this -default is overwritten. This function simply helps set the -`focus-current-thing'." - (interactive) - (let* ((candidates '(symbol list sexp defun - filename url email word - sentence whitespace line page)) - (thing (completing-read "Thing: " candidates))) - (setq focus-current-thing (intern thing)))) - -(defun focus-pin () - "Pin the focused section to its current location or the region, -if active." - (interactive) - (when focus-mode - (when (region-active-p) - (focus-move-overlays (region-beginning) (region-end))) - (remove-hook 'post-command-hook 'focus-move-focus t))) - -(defun focus-unpin () - "Unpin the focused section." - (interactive) - (when focus-mode - (add-hook 'post-command-hook 'focus-move-focus nil t))) - -(defun focus-next-thing (&optional n) - "Moves the point to the middle of the Nth next thing." - (interactive "p") - (let ((current-bounds (focus-bounds)) - (thing (focus-get-thing))) - (forward-thing thing n) - (when (equal current-bounds (focus-bounds)) - (forward-thing thing (cl-signum n))) - (focus-goto-thing (focus-bounds)))) - -(defun focus-prev-thing (&optional n) - "Moves the point to the middle of the Nth previous thing." - (interactive "p") - (focus-next-thing (- n))) - -(defun focus-read-only-hide-cursor () - "Hide the cursor. -This function is triggered by the `focus-read-only-blink-timer', -when `focus-read-only-mode' is activated." - (with-current-buffer focus-buffer - (when (and focus-read-only-mode (not (null focus-read-only-blink-timer))) - (setq focus-read-only-blink-timer nil) - (setq cursor-type nil)))) - -(defun focus-read-only-cursor-blink () - "Make the cursor visible for `focus-read-only-blink-seconds'. -This is added to the `pre-command-hook' when -`focus-read-only-mode' is active." - (with-current-buffer focus-buffer - (when (and focus-read-only-mode - (not (member last-command '(focus-next-thing focus-prev-thing)))) - (when focus-read-only-blink-timer (cancel-timer focus-read-only-blink-timer)) - (setq cursor-type focus-cursor-type) - (setq focus-read-only-blink-timer - (run-at-time focus-read-only-blink-seconds nil - 'focus-read-only-hide-cursor))))) - -(defun focus-read-only-init () - "Run when `focus-read-only-mode' is activated. -Enables `read-only-mode', hides the cursor and adds -`focus-read-only-cursor-blink' to `pre-command-hook'. Also -`focus-read-only-terminate' is added to the `kill-buffer-hook'." - (read-only-mode 1) - (setq cursor-type nil - focus-buffer (current-buffer)) - (add-hook 'pre-command-hook 'focus-read-only-cursor-blink nil t) - (add-hook 'kill-buffer-hook 'focus-read-only-terminate nil t)) - -(defun focus-read-only-terminate () - "Run when `focus-read-only-mode' is deactivated. -Disables `read-only-mode' and shows the cursor again. It cleans -up the `focus-read-only-blink-timer' and hooks." - (read-only-mode -1) - (setq cursor-type focus-cursor-type) - (when focus-read-only-blink-timer - (cancel-timer focus-read-only-blink-timer)) - (setq focus-read-only-blink-timer nil) - (remove-hook 'pre-command-hook 'focus-read-only-cursor-blink t) - (remove-hook 'kill-buffer-hook 'focus-read-only-terminate t)) - -(defun turn-off-focus-read-only-mode () - "Turn off `focus-read-only-mode'." - (interactive) - (focus-read-only-mode -1)) - -;;;###autoload -(define-minor-mode focus-mode - "Dim the font color of text in surrounding sections." - :init-value nil - :keymap (let ((map (make-sparse-keymap))) - (define-key map (kbd "C-c C-q") 'focus-read-only-mode) - map) - (unless (and (color-defined-p (face-attribute 'default :background)) - (color-defined-p (face-attribute 'default :foreground))) - (message "Can't enable focus mode when no theme is loaded.") - (setq focus-mode nil)) - (if focus-mode (focus-init) (focus-terminate))) - -;;;###autoload -(define-minor-mode focus-read-only-mode - "A read-only mode optimized for `focus-mode'." - :init-value nil - :keymap (let ((map (make-sparse-keymap))) - (define-key map (kbd "n") 'focus-next-thing) - (define-key map (kbd "SPC") 'focus-next-thing) - (define-key map (kbd "p") 'focus-prev-thing) - (define-key map (kbd "S-SPC") 'focus-prev-thing) - (define-key map (kbd "i") 'turn-off-focus-read-only-mode) - (define-key map (kbd "q") 'turn-off-focus-read-only-mode) - map) - (when cursor-type - (setq focus-cursor-type cursor-type)) - (if focus-read-only-mode (focus-read-only-init) (focus-read-only-terminate))) - -(provide 'focus) -;;; focus.el ends here diff --git a/elpa/focus-readme.txt b/elpa/focus-readme.txt deleted file mode 100644 index 0fc5ec0a..00000000 --- a/elpa/focus-readme.txt +++ /dev/null @@ -1,4 +0,0 @@ -Focus provides `focus-mode` that dims the text of surrounding sections, -similar to [iA Writer's](https://ia.net/writer) Focus Mode. - -Enable the mode with `M-x focus-mode'. -- 2.47.3