 ;                      (holiday-fixed 7 14 "National Day")
 ;                      (holiday-fixed 11 11 "World War One Armistice")
 ;                      (holiday-fixed 7 14 "Bastille Day")))
-
-; VC (fichiers gérés avec CVS)
-;; (setq vc-cvs-diff-switches '"-u")
 
 ;; Put autosave files (ie #foo#) in one place, *not* scattered all over the
 ;; file system! (The make-autosave-file-name function is invoked to determine

	     :pin melpa-stable)
;(add-hook 'scala-mode-hook 'ensime-scala-mode-hook)

;; (require 'whitespace)
;; (setq whitespace-line-column 80)
;; (setq whitespace-style '(face-lines-tail))
;; (add-hook 'prog-mode-hook 'whitespace-mode)
;;
;; DEPRECATED but kept for sentimental or documentation reasons
;;

; == C-x 3
(global-set-key [f3] 'split-window-horizontally)
; == C-x o
(global-set-key [(control tab)] 'other-window)
(global-set-key [f4] 'other-window)
; join this and next line
(global-set-key [f8] (lambda() (interactive) (join-line 1)))
