* lisp/vc/ediff-util.el (ediff-diff-at-point): Don't assume point-min==1.

2 files changed, 4 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a0697cdc546..13daa83ac3d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2012-09-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * vc/ediff-util.el (ediff-diff-at-point): Don't assume point-min==1.
+
         * tutorial.el (help-with-tutorial): Use minibuffer-with-setup-hook.
 
         * textmodes/text-mode.el (paragraph-indent-minor-mode): Make it
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 78a2163f653..86293ade580 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -1907,8 +1907,8 @@ in the specified buffer."
 
       (cond ((eq which-diff 'after) (1+ diff-no))
             ((eq which-diff 'before) diff-no)
-            ((< (abs (count-lines pos (max 1 prev-end)))
-                (abs (count-lines pos (max 1 beg))))
+            ((< (abs (count-lines pos (max (point-min) prev-end)))
+                (abs (count-lines pos (max (point-min) beg))))
              diff-no)       ; choose prev difference
             (t
              (1+ diff-no))) ; choose next difference