diff -c -b /home/tehom/.emacs.d/ediff/ediff-util.fix.el /home/tehom/.emacs.d/ediff/ediff-util.fix2.el *** /home/tehom/.emacs.d/ediff/ediff-util.fix.el Wed Nov 17 13:47:53 2010 --- /home/tehom/.emacs.d/ediff/ediff-util.fix2.el Wed Nov 17 14:06:44 2010 *************** *** 3573,3580 **** (beginning-of-line) (setq begA (point)) (goto-char endA) ! (end-of-line) ! (or (eobp) (forward-char)) ; include the newline char (setq endA (point))) (setq bufB (if use-current-diff-p --- 3573,3579 ---- (beginning-of-line) (setq begA (point)) (goto-char endA) ! (unless (bolp) (forward-line 1)) (setq endA (point))) (setq bufB (if use-current-diff-p *************** *** 3588,3595 **** (beginning-of-line) (setq begB (point)) (goto-char endB) ! (end-of-line) ! (or (eobp) (forward-char)) ; include the newline char (setq endB (point))) --- 3587,3593 ---- (beginning-of-line) (setq begB (point)) (goto-char endB) ! (unless (bolp) (forward-line 1)) (setq endB (point))) Diff finished. Wed Nov 17 14:15:19 2010