     (save-excursion
       (goto-char (point-min))
       (when (evil-collection-buff-menu-tabulated-list-header-overlay-p)
-	(forward-line))
+        (forward-line))
       (while (not (eobp))
-	(let ((xmarks (list (aref (tabulated-list-get-entry) 0)
-			    (aref (tabulated-list-get-entry) 2))))
-	  (when (or (char-equal mark ?\r)
-		    (member (char-to-string mark) xmarks))
-	    (Buffer-menu--unmark)))
-	(forward-line)))))
+        (let ((xmarks (list (aref (tabulated-list-get-entry) 0)
+                            (aref (tabulated-list-get-entry) 2))))
+          (when (or (char-equal mark ?\r)
+                    (member (char-to-string mark) xmarks))
+            (Buffer-menu--unmark)))
+        (forward-line)))))
 
 (defun evil-collection-buff-menu-setup ()
   "Set up `evil' bindings for `buff-menu'.."

    "go" 'Buffer-menu-this-window
    "gO" 'Buffer-menu-other-window
    "d"  'Buffer-menu-delete
    "u"  'Buffer-menu-unmark 
    "U"  'evil-collection-buff-menu-Buffer-menu-unmark-all
    "m"  'Buffer-menu-mark
    "s" 'Buffer-menu-save

;;; Code:

;; Code taken from emacs-26 repository.
(when (< emacs-major-version 26)
  (require 'tabulated-list) ;; required for evil-collection-Buffer-menu-unmark-all-buffers

  (defsubst evil-collection-buff-menu-tabulated-list-header-overlay-p (&optional pos)
