       (setq mode-name "RDEBUG Breakpoints")
       (goto-char (point-min))
       (while (not (eobp))
-        (let ((b (point-at-bol)) (e (point-at-eol)))
+        (let ((b (line-beginning-position)) (e (line-end-position)))
           (when (string-match rdebug--breakpoint-regexp
                               (buffer-substring b e))
             (add-text-properties b e

  (interactive "d")
  (save-excursion
    (goto-char pt)
    (let ((s (buffer-substring (point-at-bol) (point-at-eol))))
      (when (string-match rdebug--breakpoint-regexp s)
        (let ((bpnum (substring s (match-beginning 1) (match-end 1))))
          (gud-call (format "delete %s" bpnum)))))))

  (interactive "d")
  (save-excursion
    (goto-char pt)
    (let ((s (buffer-substring (line-beginning-position) (line-end-position)))
	  (gud-comint-buffer (current-buffer)))
      (when (string-match rdebug-traceback-line-re s)
        (rdebug-display-line
