ryuslash/legacy-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix some compiler warnings about fci-mode

Browse source
This commit is contained in:
Tom Willemse 2016-06-10 14:46:54 +02:00
parent 390d8b2cc8
commit 27c2242c52
2 changed files with 50 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
emacs/.emacs.d/init.el
View file

@ -646,22 +646,9 @@ MODE1 is enabled and vice-versa."
;; when it finishes or is cancelled. This is to work around a ;; when it finishes or is cancelled. This is to work around a
;; long-standing incompatibility between company (as well as ;; long-standing incompatibility between company (as well as
;; auto-complete) and fill-column-indicator. ;; auto-complete) and fill-column-indicator.
(defvar-local oni:company-fci-enabled-p nil) (add-hook 'company-completion-started-hook 'oni:company-disable-fci-mode)
(add-hook 'company-completion-started-hook (add-hook 'company-completion-cancelled-hook 'oni:company-enable-fci-mode)
(lambda (&rest _) (add-hook 'company-completion-finished-hook 'oni:company-enable-fci-mode)
(when fci-mode
(setq-local oni:company-fci-enabled-p t)
(fci-mode -1))))
(add-hook 'company-completion-cancelled-hook
(lambda (&rest _)
(when oni:company-fci-enabled-p
(fci-mode 1)
(setq-local oni:company-fci-enabled-p nil))))
(add-hook 'company-completion-finished-hook
(lambda (&rest _)
(when oni:company-fci-enabled-p
(fci-mode 1)
(setq-local oni:company-fci-enabled-p nil))))
;; Load my theme ;; Load my theme
(if (daemonp) (if (daemonp)

47
emacs/.emacs.d/site-lisp/oni-company.el Normal file
View file

@ -0,0 +1,47 @@
;;; oni-company.el --- Extra commands and functions for Company -*- lexical-binding: t; -*-
;; Copyright (C) 2016 Tom Willemse
;; Author: Tom Willemse <tom@ryuslash.org>
;; Keywords:
;; 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 <http://www.gnu.org/licenses/>.
;;; Commentary:
;;
;;; Code:
(require 'fill-column-indicator)
(defvar-local oni:company-fci-enabled-p nil
"Whether or not `fci-mode' was enabled.")
;;;###autoload
(defun oni:company-disable-fci-mode ()
"Disable `fci-mode' if it is enabled."
(when fci-mode
(setq-local oni:company-fci-enabled-p t)
(fci-mode -1)))
;;;###autoload
(defun oni:company-enable-fci-mode ()
"Enable `fci-mode' if it was disabled before."
(when oni:company-fci-enabled-p
(fci-mode 1)
(setq-local oni:company-fci-enabled-p nil)))
(provide 'oni-company)
;;; oni-company.el ends here