Silence byte compiler

This commit is contained in:
Fredrik Bergroth 2017-11-16 08:58:37 +01:00 committed by James N
parent 61eac2e405
commit 6eb95dacfa
5 changed files with 56 additions and 52 deletions

View File

@ -34,26 +34,26 @@
(defvar company-search-map)
(defun evil-company-setup ()
(define-key company-active-map (kbd "C-n") #'company-select-next-or-abort)
(define-key company-active-map (kbd "C-p") #'company-select-previous-or-abort)
(define-key company-active-map (kbd "C-j") #'company-select-next-or-abort)
(define-key company-active-map (kbd "C-k") #'company-select-previous-or-abort)
(define-key company-active-map (kbd "M-j") #'company-select-next)
(define-key company-active-map (kbd "M-k") #'company-select-previous)
(define-key company-active-map (kbd "C-n") 'company-select-next-or-abort)
(define-key company-active-map (kbd "C-p") 'company-select-previous-or-abort)
(define-key company-active-map (kbd "C-j") 'company-select-next-or-abort)
(define-key company-active-map (kbd "C-k") 'company-select-previous-or-abort)
(define-key company-active-map (kbd "M-j") 'company-select-next)
(define-key company-active-map (kbd "M-k") 'company-select-previous)
(when evil-want-C-u-scroll
(define-key company-active-map (kbd "C-u") #'company-previous-page))
(define-key company-active-map (kbd "C-u") 'company-previous-page))
(when evil-want-C-d-scroll
(define-key company-active-map (kbd "C-d") #'company-next-page))
(define-key company-active-map (kbd "C-d") 'company-next-page))
(define-key company-search-map (kbd "C-j") #'company-select-next-or-abort)
(define-key company-search-map (kbd "C-k") #'company-select-previous-or-abort)
(define-key company-search-map (kbd "M-j") #'company-select-next)
(define-key company-search-map (kbd "M-k") #'company-select-previous)
(define-key company-search-map (kbd "C-j") 'company-select-next-or-abort)
(define-key company-search-map (kbd "C-k") 'company-select-previous-or-abort)
(define-key company-search-map (kbd "M-j") 'company-select-next)
(define-key company-search-map (kbd "M-k") 'company-select-previous)
;; Sets up YCMD like behavior.
(company-tng-configure-default))
(with-no-warnings (company-tng-configure-default)))
(provide 'evil-company)
;;; evil-company.el ends here

View File

@ -30,8 +30,9 @@
(require 'edebug)
(require 'evil-collection-util)
(+evil-set-default-state-for-mode edebug-mode motion)
(defun evil-edebug-setup ()
(+evil-set-default-state-for-mode edebug-mode motion)
(evil-define-key 'motion 'edebug-mode-map
;; control

View File

@ -47,42 +47,43 @@
(defun evil-emms-browser ()
(evil-motion-state))
(defun evil-emms-playlist-mode-insert-newline-above ()
"Insert a newline above point."
(interactive)
(emms-with-inhibit-read-only-t
(evil-insert-newline-above)))
(with-no-warnings
(defun evil-emms-playlist-mode-insert-newline-above ()
"Insert a newline above point."
(interactive)
(emms-with-inhibit-read-only-t
(evil-insert-newline-above)))
(defun evil-emms-playlist-mode-insert-newline-below ()
"Insert a newline below point."
(interactive)
(emms-with-inhibit-read-only-t
(evil-insert-newline-below)))
(defun evil-emms-playlist-mode-insert-newline-below ()
"Insert a newline below point."
(interactive)
(emms-with-inhibit-read-only-t
(evil-insert-newline-below)))
(defun evil-emms-playlist-mode-paste-before ()
"Pastes the latest yanked playlist items before the cursor position.
The return value is the yanked text."
(interactive)
(emms-with-inhibit-read-only-t
(goto-char (point-at-bol))
(yank)
(emms-playlist-mode-correct-previous-yank)
(evil-previous-line)
(evil-beginning-of-line)))
(defun evil-emms-playlist-mode-paste-before ()
"Pastes the latest yanked playlist items before the cursor position.
The return value is the yanked text."
(interactive)
(emms-with-inhibit-read-only-t
(goto-char (point-at-bol))
(yank)
(emms-playlist-mode-correct-previous-yank)
(evil-previous-line)
(evil-beginning-of-line)))
(defun evil-emms-playlist-mode-paste-after ()
"Pastes the latest yanked playlist items behind point.
The return value is the yanked text."
(interactive)
(evil-next-line)
(evil-emms-playlist-mode-paste-before))
(defun evil-emms-playlist-mode-paste-after ()
"Pastes the latest yanked playlist items behind point.
The return value is the yanked text."
(interactive)
(evil-next-line)
(evil-emms-playlist-mode-paste-before)))
(defun evil-emms-setup ()
(advice-add 'emms-browser :after 'evil-emms-browser)
(evil-set-initial-state 'emms-playlist-mode 'motion)
(dolist (map (list emms-browser-mode-map emms-playlist-mode-map))
(evil-define-key 'motion map
(evil-define-key* 'motion map
"+" 'emms-volume-raise
"=" 'emms-volume-raise
"-" 'emms-volume-lower

View File

@ -110,7 +110,8 @@ Needed to bypass keymaps set as text properties."
;; without this set-mark-command activates visual-state which is just
;; annoying ;; and introduces possible bugs
(remove-hook 'activate-mark-hook 'evil-visual-activate-hook t))
(when (bound-and-true-p evil-surround-mode)
(when (and (bound-and-true-p evil-surround-mode)
(fboundp 'evil-surround-mode))
(make-local-variable 'evil-surround-mode)
(evil-surround-mode -1))
(evilified-state--setup-normal-state-keymap)

View File

@ -36,17 +36,18 @@
;; and https://github.com/politza/pdf-tools/issues/324.
;; Changing load order only changes which mode overrides the other.
(defun evil-pdf-view-goto-page (&optional page)
(interactive "P")
(if page
(pdf-view-goto-page page)
(pdf-view-last-page)))
(with-no-warnings
(defun evil-pdf-view-goto-page (&optional page)
(interactive "P")
(if page
(pdf-view-goto-page page)
(pdf-view-last-page)))
(defun evil-pdf-view-goto-first-page (&optional page)
(interactive "P")
(if page
(pdf-view-goto-page page)
(pdf-view-first-page)))
(defun evil-pdf-view-goto-first-page (&optional page)
(interactive "P")
(if page
(pdf-view-goto-page page)
(pdf-view-first-page))))
(defun evil-pdf-setup ()
(evil-set-initial-state 'pdf-view-mode 'motion)