Merge pull request #34 from thierryvolpiatto/master

Ensure linum-relative is not enabled in helm with linum-relative-global-mode (#29).
coldnew · May 10, 2016 · b8a99dc · b8a99dc
2 parents ed3fccc + 89bdee2
commit b8a99dc
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/linum-relative.el b/linum-relative.el
@@ -125,8 +125,6 @@ linum-releative will show the real line number at current line."
     (make-local-variable 'linum-relative-last-pos))
   (linum-update helm-buffer))
 
-(add-hook 'helm-move-selection-after-hook 'linum-relative-for-helm)
-
 ;;;; Advices
 (defadvice linum-update (before relative-linum-update activate)
   "This advice get the last position of linum."
@@ -194,7 +192,8 @@ linum-releative will show the real line number at current line."
 
 ;;;###autoload
 (define-global-minor-mode linum-relative-global-mode
-    linum-relative-mode (lambda () (linum-relative-mode 1)))
+    linum-relative-mode (lambda () (unless (linum-relative-in-helm-p)
+                                     (linum-relative-mode 1))))
 
 ;;;; Interaction of helm with linum-relative