Re: diff-mode

[Mario Lassnig <mario@lassnig.net>]

On 12/14/10 3:40 PM, Andrea Crotti wrote:
> Eli Zaretskii<eliz@gnu.org>  writes:
>>
>> "Tools->Apply patch" from the menu bar.  Is this what you want?
>
> Yes but well, something where I can read and analyze the diff before
> patching one by one is better.
> Diff-mode is perfectly fine, it would be perfect with a bit more
> font-locking but that's already good like this...
>
>>
>> When you press `q', Emacs asks a question.  You must answer `y' (yes)
>> to get the control frame close automatically.  Did you do that?
>
> Yes sure I did, and in fact it quits, but the small window remain there
> until I close it manually.
> But now I tried with "Emacs -Q" and this works fine, so it's something
> related to my configuration...
>
>


How about this? Side-by-side comparison, no external control frame,
and once you quit, it goes back to your previous visual configuration...




(setq ediff-window-setup-function 'ediff-setup-windows-plain)
(setq ediff-split-window-function 'split-window-horizontally)

(add-hook 'ediff-load-hook
           (lambda ()
             (add-hook 'ediff-before-setup-hook
                       (lambda ()
                         (setq ediff-saved-window-configuration 
(current-window-configuration))))
             (let ((restore-window-configuration
                    (lambda ()
                      (set-window-configuration 
ediff-saved-window-configuration))))
               (add-hook 'ediff-quit-hook restore-window-configuration 
'append)
               (add-hook 'ediff-suspend-hook 
restore-window-configuration 'append))))

(add-hook 'ediff-cleanup-hook
           (lambda ()
             (kill-buffer ediff-buffer-A)))