       (goto-char (point-min))
       (while (not (eobp))
         (setq consider-this-line nil)
-        (dolist (ov (overlays-in (line-beginning-position) (line-end-position)))
+        (dolist (ov (overlays-in (svn-point-at-bol) (line-end-position)))
           (when (overlay-get ov 'svn-blame-line-info)
             (when (string= reference-value (funcall compare-func ov))
               (setq consider-this-line t))))
         (when consider-this-line
-          (dolist (ov (overlays-in (line-beginning-position) (line-end-position)))
+          (dolist (ov (overlays-in (svn-point-at-bol) (line-end-position)))
             (when (and (overlay-get ov 'svn-blame-highlighted) is-highlighted)
               (delete-overlay ov))
             (unless is-highlighted
-              (setq hl-ov (make-overlay (line-beginning-position) (line-end-position)))
+              (setq hl-ov (make-overlay (svn-point-at-bol) (line-end-position)))
               (overlay-put hl-ov 'svn-blame-highlighted t)
               (overlay-put hl-ov 'face 'svn-status-blame-highlight-face))))
         (forward-line)))))

When called with a prefix argument, allow the user to edit the revision."
  (interactive "P")
  (let ((rev))
    (dolist (ov (overlays-in (line-beginning-position) (line-end-position)))
      (when (overlay-get ov 'svn-blame-line-info)
        (setq rev (car (overlay-get ov 'rev-info)))))
    (svn-status-diff-show-changeset rev arg)))

      (while (and (not (eobp)) (< (point) limit))
        (setq ov (make-overlay (point) (point)))
        (overlay-put ov 'svn-blame-line-info t)
        (setq s (buffer-substring-no-properties (svn-point-at-bol) (+ (svn-point-at-bol) info-end-col)))
        (overlay-put ov 'before-string (propertize s 'face 'svn-status-blame-rev-number-face))
        (overlay-put ov 'rev-info (delete "" (split-string s " ")))
        (delete-region (svn-point-at-bol) (+ (svn-point-at-bol) info-end-col))
        (forward-line)
        (setq line (1+ line)))))
  (let* ((buf-name (format "*svn-blame: %s*" (file-relative-name svn-status-blame-file-name)))
