Replace still more end-of-line etc with line-end-position, etc.

[gnu-emacs] / lisp / vc / emerge.el

diff --git a/lisp/vc/emerge.el b/lisp/vc/emerge.el
index b32eed01c816ff48ebc46895ff8188fa8eb5126b..ee34944e448632a9375653b8c701ae7c24cd7237 100644 (file)
--- a/lisp/vc/emerge.el
+++ b/lisp/vc/emerge.el
@@ -2474,10 +2474,8 @@ merge buffers."
 (defvar emerge-line-diff)
 
 (defun emerge-line-number-in-buf (begin-marker end-marker)
-  (let (temp)
-    (setq temp (save-excursion
-                (beginning-of-line)
-                (1+ (count-lines 1 (point)))))
+  ;; FIXME point-min rather than 1? widen?
+  (let ((temp (1+ (count-lines 1 (line-beginning-position)))))
     (if valid-diff
        (progn
          (if (> (point) (aref emerge-line-diff begin-marker))