emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] master 05a5003 022/110: avy.el: Fix linum-related compile warning


From: Oleh Krehel
Subject: [elpa] master 05a5003 022/110: avy.el: Fix linum-related compile warnings
Date: Sat, 11 May 2019 10:15:36 -0400 (EDT)

branch: master
commit 05a5003c2bd8e113bcf96034ee543750d69b616a
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>

    avy.el: Fix linum-related compile warnings
---
 avy.el | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/avy.el b/avy.el
index 6b38909..3f0bef0 100644
--- a/avy.el
+++ b/avy.el
@@ -1204,6 +1204,22 @@ Which one depends on variable `subword-mode'."
          (push str line-list))))
     (nreverse line-list)))
 
+(defvar linum-available)
+(defvar linum-overlays)
+(defvar linum-format)
+(declare-function linum--face-width "linum")
+
+(define-minor-mode avy-linum-mode
+  "Minor mode that uses avy hints for `linum-mode'."
+  :group 'avy
+  (if avy-linum-mode
+      (progn
+        (require 'linum)
+        (advice-add 'linum-update-window :around 'avy--linum-update-window)
+        (linum-mode 1))
+    (advice-remove 'linum-update-window 'avy--linum-update-window)
+    (linum-mode -1)))
+
 (defun avy--linum-update-window (_ win)
   "Update line numbers for the portion visible in window WIN."
   (goto-char (window-start win))
@@ -1256,17 +1272,6 @@ Which one depends on variable `subword-mode'."
                       (frame-char-width)))))
     (set-window-margins win width (cdr (window-margins win)))))
 
-(define-minor-mode avy-linum-mode
-  "Minor mode that uses avy hints for `linum-mode'."
-  :group 'avy
-  (if avy-linum-mode
-      (progn
-        (require 'linum)
-        (advice-add 'linum-update-window :around 'avy--linum-update-window)
-        (linum-mode 1))
-    (advice-remove 'linum-update-window 'avy--linum-update-window)
-    (linum-mode -1)))
-
 (defun avy--line (&optional arg beg end)
   "Select a line.
 The window scope is determined by `avy-all-windows' (ARG negates it).



reply via email to

[Prev in Thread] Current Thread [Next in Thread]