diff --git a/Cask b/Cask index b1125d7d4..4f108e1ad 100644 --- a/Cask +++ b/Cask @@ -27,7 +27,6 @@ ;; UI --- core/core-ui.el (depends-on "visual-fill-column") -(depends-on "yascroll") (depends-on "rainbow-delimiters") (depends-on "rainbow-mode") (depends-on "volatile-highlights") diff --git a/core/core-eval.el b/core/core-eval.el index f84f5d35b..0abafbf38 100644 --- a/core/core-eval.el +++ b/core/core-eval.el @@ -22,7 +22,6 @@ (make-variable-buffer-local 'repl-p) (add-hook! repl-toggle-mode - (yascroll-bar-mode +1) (evil-initialize-state 'emacs) (setq mode-line-format nil repl-p t)) diff --git a/core/core-popup.el b/core/core-popup.el index d6eb20a59..27ca45a2b 100644 --- a/core/core-popup.el +++ b/core/core-popup.el @@ -142,20 +142,16 @@ (advice-add 'quickrun :before 'narf*quickrun-close-popup) (advice-add 'quickrun-region :before 'narf*quickrun-close-popup) - ;; Turns on `yascroll-bar-mode' and `nlinum-mode', and ensures window is scrolled to - ;; EOF and that the scrollbar is showing. + ;; Turns on `nlinum-mode', and ensures window is scrolled to EOF (defun narf|quickrun-after-run () (let ((window (get-buffer-window quickrun/buffer-name))) (with-selected-window window - (yascroll-bar-mode +1) (narf|nlinum-enable) (setq mode-line-format nil) (let* ((lines (count-lines (point-min) (point-max))) (act-lines (max 5 (min 30 lines)))) (set-window-start window (evil-line-position (+ 2 (- lines act-lines)))) - (evil-resize-window act-lines) - (yascroll:safe-show-scroll-bar) ; scroll-bar starts hidden, but not anymore! - )))) + (evil-resize-window act-lines))))) (add-hook 'quickrun-after-run-hook 'narf|quickrun-after-run) ;; I let `narf|quickrun-after-run' handle scrolling, so quickrun shouldn't have to! diff --git a/core/core-ui.el b/core/core-ui.el index e714ae6c7..6e9f7edd8 100644 --- a/core/core-ui.el +++ b/core/core-ui.el @@ -122,13 +122,6 @@ (use-package visual-fill-column :defer t) -(use-package yascroll - :commands (yascroll-bar-mode) - :config - (add-to-list 'yascroll:enabled-window-systems 'mac) - (setq yascroll:scroll-bar 'left-fringe - yascroll:delay-to-hide nil)) - (use-package rainbow-delimiters :commands rainbow-delimiters-mode :init (add-hook! (emacs-lisp-mode lisp-mode js2-mode scss-mode) 'rainbow-delimiters-mode) diff --git a/private/themes/narf-dark-theme.el b/private/themes/narf-dark-theme.el index 98366a216..dff2d7d7e 100644 --- a/private/themes/narf-dark-theme.el +++ b/private/themes/narf-dark-theme.el @@ -190,8 +190,6 @@ ;; plugin-specific ;; ***************************************************************************************** - `(yascroll:thumb-fringe ((,c (:background ,grey-1 :foreground ,grey-1)))) - `(reb-match-0 ((,c (:foreground ,orange :inverse-video t)))) `(reb-match-1 ((,c (:foreground ,magenta :inverse-video t)))) `(reb-match-2 ((,c (:foreground ,green :inverse-video t)))) diff --git a/private/themes/narf-light-theme.el b/private/themes/narf-light-theme.el index a4e2bd62b..0a5f2f852 100644 --- a/private/themes/narf-light-theme.el +++ b/private/themes/narf-light-theme.el @@ -176,8 +176,6 @@ ;; plugin-specific ;; ***************************************************************************************** - `(yascroll:thumb-fringe ((,c (:background ,grey-1 :foreground ,grey-1)))) - `(reb-match-0 ((,c (:foreground ,orange :inverse-video t)))) `(reb-match-1 ((,c (:foreground ,magenta :inverse-video t)))) `(reb-match-2 ((,c (:foreground ,green :inverse-video t))))