github/doom-modeline
1
0
Fork 0
mirror of https://github.com/correl/doom-modeline.git synced 2024-11-23 11:09:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Eliminate compiler warnings.

Browse source
This commit is contained in:
Vincent Zhang 2019-05-23 16:47:30 +08:00
parent b2b7e60798
commit c5226e4aae
2 changed files with 28 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doom-modeline-core.el
View file

@ -497,7 +497,7 @@ If the actual char height is larger, it respects the actual char height.")
'mode-line
'mode-line-inactive)))
(defsubst doom-modeline--char-height ()
(defsubst doom-modeline--font-height ()
"Calculate the actual char height of the mode-line."
(ceiling (* 1.68 (frame-char-height))))

52
doom-modeline-segments.el
View file

@ -148,9 +148,9 @@
(declare-function jsonrpc-last-error 'jsonrpc)
(declare-function lsp--workspace-print 'lsp-mode)
(declare-function lsp-describe-session 'lsp-mode)
(declare-function lsp-restart-workspace 'lsp-mode)
(declare-function lsp-shutdown-workspace 'lsp-mode)
(declare-function lsp-workspace-folders-open 'lsp-mode)
(declare-function lsp-workspace-restart 'lsp-mode)
(declare-function lsp-workspace-shutdown 'lsp-mode)
(declare-function lsp-workspaces 'lsp-mode)
(declare-function magit-toplevel 'magit-git)
(declare-function mc/num-cursors 'multiple-cursors-core)
@ -1624,34 +1624,36 @@ mouse-3: Describe current input method")
(face (if workspaces 'success 'warning))
(icon (doom-modeline-lsp-icon "LSP" face)))
(propertize icon
'help-echo (if workspaces
(concat "LSP Connected "
(string-join (--map (format "[%s]\n" (lsp--workspace-print it))
workspaces))
"C-mouse-1: Switch to another workspace folder
'help-echo
(if workspaces
(concat "LSP Connected "
(string-join (--map (format "[%s]\n" (lsp--workspace-print it))
workspaces))
"C-mouse-1: Switch to another workspace folder
mouse-1: Describe current session
mouse-2: Quit server
mouse-3: Reconnect to server")
"LSP Disconnected
"LSP Disconnected
mouse-1: Reload to start server")
'mouse-face '(:box 0)
'local-map (let ((map (make-sparse-keymap)))
(if workspaces
(progn
(define-key map [mode-line C-mouse-1]
#'lsp-workspace-folders-open)
(define-key map [mode-line mouse-1]
#'lsp-describe-session)
(define-key map [mode-line mouse-2]
#'lsp-shutdown-workspace)
(define-key map [mode-line mouse-3]
#'lsp-restart-workspace))
(progn
(define-key map [mode-line mouse-1]
(lambda ()
(interactive)
(revert-buffer t t)))))
map)))))
'local-map
(let ((map (make-sparse-keymap)))
(if workspaces
(progn
(define-key map [mode-line C-mouse-1]
#'lsp-workspace-folders-open)
(define-key map [mode-line mouse-1]
#'lsp-describe-session)
(define-key map [mode-line mouse-2]
#'lsp-workspace-shutdown)
(define-key map [mode-line mouse-3]
#'lsp-workspace-restart))
(progn
(define-key map [mode-line mouse-1]
(lambda ()
(interactive)
(revert-buffer t t)))))
map)))))
(add-hook 'lsp-mode-hook #'doom-modeline-update-lsp)
(add-hook 'lsp-after-uninitialized-hook #'doom-modeline-update-lsp)