 (global-set-key (kbd "C-c u") 'untabify)
 (global-set-key (kbd "C-c T") 'tabify)
 
-(global-set-key (kbd "C-c v f") 'view-file)
-(global-set-key (kbd "C-c v v") 'view-mode)
-;; Don't let gtags overwrite `C-c v'
-(eval-after-load "gtags" '(define-key gtags-mode-map "\C-cv" nil))
+(global-set-key (kbd "C-c v") 'view-mode)
 
 (setq calendar-week-start-day 1) ; weeks should begin on Monday
 
 ;;; --------------------------------------------------------------------
 ;;; Org Mode
-
-; http://orgmode.org/worg/org-faq.html#keeping-current-with-Org-mode-development
-(let ((d "~/lib/emacs/org-mode/lisp"))
-  (when (file-exists-p d) (push d load-path)))
 
 (with-eval-after-load 'org
   (setq org-startup-indented t)

;;; -*- coding: utf-8-unix -*-

(server-start)

(setq inhibit-startup-message t) ; don't show startup screen


     (shell . t)))

  (global-set-key "\C-cl" 'org-store-link)
  (global-set-key "\C-cb" 'org-switchb)

  (setq org-outline-path-complete-in-steps nil))

(with-eval-after-load 'org-clock
  (setq org-clock-out-remove-zero-time-clocks t
