Merge 9a0a547 into 0399f73

Cask

@@ -4,6 +4,7 @@
 (development
  (depends-on "undercover")
  (depends-on "buttercup")
- (depends-on "smooth-scrolling"))
+ (depends-on "smooth-scrolling")
+ (depends-on "linum"))
 
 (package-file "topspace.el")

test/test-helper.el

@@ -15,6 +15,7 @@
               ))
 
 (require 'smooth-scrolling)
+(require 'linum)
 (require 'topspace)
 
 ;;; test-helper.el ends here

test/topspace-test.el

@@ -83,11 +83,18 @@
  (describe
   "topspace--after-scroll"
   (it "is needed when first scrolling above the top line"
+      (linum-mode 1)
       (goto-char 1)
       (topspace-set-height 0)
       (scroll-up-line)
       (scroll-down 2)
-      (expect (round (topspace-height)) :to-equal 1)))
+      (linum-mode -1)
+      (goto-char 1)
+      (topspace-set-height 0)
+      (scroll-up-line)
+      (scroll-down 2)
+      (expect (round (topspace-height)) :to-equal 1)
+      ))
 
  (describe
   "topspace--window-configuration-change"

topspace.el

@@ -420,7 +420,9 @@ command is run in the described case above."
                                      1 topspace--window-start-before-scroll)))
         (setq total-lines (abs total-lines))
         (set-window-start (selected-window) 1)
-        (topspace-set-height (- total-lines lines-already-scrolled)))))))
+        (topspace-set-height (- total-lines lines-already-scrolled)))
+      (when (and (bound-and-true-p linum-mode) (fboundp 'linum-update-window))
+        (linum-update-window (selected-window)))))))
 
 (defun topspace--after-recenter (&optional line-offset redisplay)
   "Recenter near the top of buffers by adding top space appropriately.