Remove yascroll
This commit is contained in:
parent
c64efcf4aa
commit
b2346c7e4c
6 changed files with 2 additions and 19 deletions
1
Cask
1
Cask
|
@ -27,7 +27,6 @@
|
||||||
|
|
||||||
;; UI --- core/core-ui.el
|
;; UI --- core/core-ui.el
|
||||||
(depends-on "visual-fill-column")
|
(depends-on "visual-fill-column")
|
||||||
(depends-on "yascroll")
|
|
||||||
(depends-on "rainbow-delimiters")
|
(depends-on "rainbow-delimiters")
|
||||||
(depends-on "rainbow-mode")
|
(depends-on "rainbow-mode")
|
||||||
(depends-on "volatile-highlights")
|
(depends-on "volatile-highlights")
|
||||||
|
|
|
@ -22,7 +22,6 @@
|
||||||
(make-variable-buffer-local 'repl-p)
|
(make-variable-buffer-local 'repl-p)
|
||||||
|
|
||||||
(add-hook! repl-toggle-mode
|
(add-hook! repl-toggle-mode
|
||||||
(yascroll-bar-mode +1)
|
|
||||||
(evil-initialize-state 'emacs)
|
(evil-initialize-state 'emacs)
|
||||||
(setq mode-line-format nil
|
(setq mode-line-format nil
|
||||||
repl-p t))
|
repl-p t))
|
||||||
|
|
|
@ -142,20 +142,16 @@
|
||||||
(advice-add 'quickrun :before 'narf*quickrun-close-popup)
|
(advice-add 'quickrun :before 'narf*quickrun-close-popup)
|
||||||
(advice-add 'quickrun-region :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
|
;; Turns on `nlinum-mode', and ensures window is scrolled to EOF
|
||||||
;; EOF and that the scrollbar is showing.
|
|
||||||
(defun narf|quickrun-after-run ()
|
(defun narf|quickrun-after-run ()
|
||||||
(let ((window (get-buffer-window quickrun/buffer-name)))
|
(let ((window (get-buffer-window quickrun/buffer-name)))
|
||||||
(with-selected-window window
|
(with-selected-window window
|
||||||
(yascroll-bar-mode +1)
|
|
||||||
(narf|nlinum-enable)
|
(narf|nlinum-enable)
|
||||||
(setq mode-line-format nil)
|
(setq mode-line-format nil)
|
||||||
(let* ((lines (count-lines (point-min) (point-max)))
|
(let* ((lines (count-lines (point-min) (point-max)))
|
||||||
(act-lines (max 5 (min 30 lines))))
|
(act-lines (max 5 (min 30 lines))))
|
||||||
(set-window-start window (evil-line-position (+ 2 (- lines act-lines))))
|
(set-window-start window (evil-line-position (+ 2 (- lines act-lines))))
|
||||||
(evil-resize-window act-lines)
|
(evil-resize-window act-lines)))))
|
||||||
(yascroll:safe-show-scroll-bar) ; scroll-bar starts hidden, but not anymore!
|
|
||||||
))))
|
|
||||||
(add-hook 'quickrun-after-run-hook 'narf|quickrun-after-run)
|
(add-hook 'quickrun-after-run-hook 'narf|quickrun-after-run)
|
||||||
|
|
||||||
;; I let `narf|quickrun-after-run' handle scrolling, so quickrun shouldn't have to!
|
;; I let `narf|quickrun-after-run' handle scrolling, so quickrun shouldn't have to!
|
||||||
|
|
|
@ -122,13 +122,6 @@
|
||||||
|
|
||||||
(use-package visual-fill-column :defer t)
|
(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
|
(use-package rainbow-delimiters
|
||||||
:commands rainbow-delimiters-mode
|
:commands rainbow-delimiters-mode
|
||||||
:init (add-hook! (emacs-lisp-mode lisp-mode js2-mode scss-mode) 'rainbow-delimiters-mode)
|
:init (add-hook! (emacs-lisp-mode lisp-mode js2-mode scss-mode) 'rainbow-delimiters-mode)
|
||||||
|
|
|
@ -190,8 +190,6 @@
|
||||||
;; plugin-specific
|
;; plugin-specific
|
||||||
;; *****************************************************************************************
|
;; *****************************************************************************************
|
||||||
|
|
||||||
`(yascroll:thumb-fringe ((,c (:background ,grey-1 :foreground ,grey-1))))
|
|
||||||
|
|
||||||
`(reb-match-0 ((,c (:foreground ,orange :inverse-video t))))
|
`(reb-match-0 ((,c (:foreground ,orange :inverse-video t))))
|
||||||
`(reb-match-1 ((,c (:foreground ,magenta :inverse-video t))))
|
`(reb-match-1 ((,c (:foreground ,magenta :inverse-video t))))
|
||||||
`(reb-match-2 ((,c (:foreground ,green :inverse-video t))))
|
`(reb-match-2 ((,c (:foreground ,green :inverse-video t))))
|
||||||
|
|
|
@ -176,8 +176,6 @@
|
||||||
;; plugin-specific
|
;; plugin-specific
|
||||||
;; *****************************************************************************************
|
;; *****************************************************************************************
|
||||||
|
|
||||||
`(yascroll:thumb-fringe ((,c (:background ,grey-1 :foreground ,grey-1))))
|
|
||||||
|
|
||||||
`(reb-match-0 ((,c (:foreground ,orange :inverse-video t))))
|
`(reb-match-0 ((,c (:foreground ,orange :inverse-video t))))
|
||||||
`(reb-match-1 ((,c (:foreground ,magenta :inverse-video t))))
|
`(reb-match-1 ((,c (:foreground ,magenta :inverse-video t))))
|
||||||
`(reb-match-2 ((,c (:foreground ,green :inverse-video t))))
|
`(reb-match-2 ((,c (:foreground ,green :inverse-video t))))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue