vc-diff tweak

For a while I've noticed that 'vc-diff (C-x v =) would pop up a buffer when there were no differences, and that buffer would just say there weren't any differences. It finally got on my nerves, so I wrote this code which works around that issue.

I don't totally understand the vc code, but parts are set up to run asynchronously, and that is what was tripping up 'vc-diff in my case. The diff would come back as identical, but at the time of the callback, Emacs had already lost the window configuration - so it was forced to pop up a buffer.

(defvar my-vc-diff-pre-diff-window-configuration nil
  "place to store window configuration,
because sometimes (usually) the vc-diff does things asynchronously")

(defadvice vc-diff-internal (around
                             vc-diff-dont-show-diff-buffer-when-no-diff
                             activate)
  "no changes still results in *vc-diff* buffer being shown, try to avoid that"
  (setq my-vc-diff-pre-diff-window-configuration (current-window-configuration))
  (let* ((res ad-do-it))
    (when (or (null res)
              (string-match-p "^No changes between"
                              (with-current-buffer "*vc-diff*"
                                (buffer-substring-no-properties
                                 (point-min) (point-max)))))
      (set-window-configuration my-vc-diff-pre-diff-window-configuration))))

(defadvice vc-diff-finish (after
                           vc-diff-finish-dont-show-diff-buffer-when-no-diff
                           activate)
  "when buffer says no differences, revert window configuration"
  (when (and my-vc-diff-pre-diff-window-configuration
             (string-match-p "^No changes between"
                             (with-current-buffer "*vc-diff*"
                               (buffer-substring-no-properties
                                (point-min) (point-max)))))
    (set-window-configuration my-vc-diff-pre-diff-window-configuration)))