diff options
Diffstat (limited to 'admin/gitmerge.el')
| -rw-r--r-- | admin/gitmerge.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/admin/gitmerge.el b/admin/gitmerge.el index a214dcbcb74..25bed949ad9 100644 --- a/admin/gitmerge.el +++ b/admin/gitmerge.el @@ -135,7 +135,7 @@ If nil, the function `gitmerge-default-branch' guesses.") (defun gitmerge-get-sha1 () "Get SHA1 from commit at point." (save-excursion - (goto-char (point-at-bol)) + (goto-char (line-beginning-position)) (when (looking-at "^[A-Z ]\\s-*\\([a-f0-9]+\\)") (match-string 1)))) @@ -187,7 +187,7 @@ If nil, the function `gitmerge-default-branch' guesses.") skip) (when commit (save-excursion - (goto-char (point-at-bol)) + (goto-char (line-beginning-position)) (when (looking-at "^\\([A-Z ]\\)\\s-*\\([a-f0-9]+\\)") (setq skip (string= (match-string 1) " ")) (goto-char (match-beginning 2)) @@ -195,7 +195,7 @@ If nil, the function `gitmerge-default-branch' guesses.") (dolist (ct gitmerge--commits) (when (string-match commit (car ct)) (setcdr ct (when skip "M")))) - (goto-char (point-at-bol)) + (goto-char (line-beginning-position)) (setq buffer-read-only nil) (delete-char 1) (insert (if skip "M" " ")) |