         ("*anything*" (same-frame t))
         ("*BBDB*" (same-frame t))
         ("*Deletions*" (same-frame t))
-        ("*Marked Processes*" (same-frame t))))
+        ("*Marked Processes*" (same-frame t))
+        ("*vc-diff*" (same-frame t))
+        ("*VC-log*" (same-frame t))))
 
 ;; Some Acme-style chords
 (require 'acme-mouse)

;; Lisp setup
(require 'cl)
(add-to-list 'load-path "~/.emacs.d")
(add-to-list 'load-path "~/.emacs.d/company")

;; Keep customizations in a separate file
(setq custom-file "~/.emacs.d/emacs-custom.el")

(global-set-key (kbd "C-!") 'shell-command)
(global-set-key (kbd "C-|") 'shell-command-on-region)
(global-set-key (kbd "C-c C-r") 'sudo-edit-current-file)
;; Hippie expansion
(global-set-key (kbd "C-SPC") (make-hippie-expand-function
                             '(try-complete-file-name-partially
                               try-complete-file-name
                               try-expand-dabbrev) t))
;; Company expansion
;; (autoload 'company-mode "company" nil t)
;; (autoload 'global-company-mode "company" nil t)
;; (global-company-mode)

;; (eval-after-load "company"
;;   '(progn
