[Emacs-diffs] /srv/bzr/emacs/trunk r110265: * lisp/vc/ediff-util.el (ediff-diff-at-point): Don't assume point-min==1.

[Stefan Monnier]

------------------------------------------------------------
revno: 110265
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sat 2012-09-29 23:28:38 -0400
message:
  * lisp/vc/ediff-util.el (ediff-diff-at-point): Don't assume point-min==1.
modified:
  lisp/ChangeLog
  lisp/vc/ediff-util.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-30 03:21:50 +0000
+++ b/lisp/ChangeLog    2012-09-30 03:28:38 +0000
@@ -1,5 +1,7 @@
 2012-09-30  Stefan Monnier  <address@hidden>
 
+       * 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

=== modified file 'lisp/vc/ediff-util.el'
--- a/lisp/vc/ediff-util.el     2012-02-28 08:17:21 +0000
+++ b/lisp/vc/ediff-util.el     2012-09-30 03:28:38 +0000
@@ -1907,8 +1907,8 @@
 
       (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