               (start-line start-column end-line end-column num count)
               (mapcar #'string-to-number rest)
 
-            (when (and (string= (file-name-nondirectory file) file-name))
+            (when (string= (file-name-nondirectory file) file-name)
               (if (> count max-count)
                   (setq max-count count))
               (push (make-go--covered :start-line start-line

  "Syntax table for Go mode.")

(defun go--build-font-lock-keywords ()
  ;; we cannot use 'symbols in regexp-opt because emacs <24 doesn't
  ;; understand that
  (append
   `((,(go--regexp-enclose-in-symbol (regexp-opt go-mode-keywords t)) . font-lock-keyword-face)
     (,(go--regexp-enclose-in-symbol (regexp-opt go-builtins t)) . font-lock-builtin-face)

          (goto-char (- (point-max) pos))))))

(defun go-beginning-of-defun (&optional count)
  (setq count (or count 1))
  (let ((first t)
        failure)
    (dotimes (i (abs count))
      (while (and (not failure)
                  (or first (go-in-string-or-comment-p)))
