diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-09-29 23:28:38 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-09-29 23:28:38 -0400 |
| commit | 43711d4b0111f97442db6f3ccd79574c21ece81a (patch) | |
| tree | a80289d084e2ce34e1a8441bc97b082a47662a6c /lisp | |
| parent | 23855148a2706fe5adeac444abfc2d1e71d911f8 (diff) | |
| download | emacs-43711d4b0111f97442db6f3ccd79574c21ece81a.tar.gz emacs-43711d4b0111f97442db6f3ccd79574c21ece81a.tar.bz2 emacs-43711d4b0111f97442db6f3ccd79574c21ece81a.zip | |
* lisp/vc/ediff-util.el (ediff-diff-at-point): Don't assume point-min==1.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/vc/ediff-util.el | 4 |
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 |