X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/8b064239c0c2b15906045455f7f1367796d411a2..a2f12a94b45d3d04286ed9ad7725ce64bf42b2cd:/dot/emacs?ds=sidebyside

diff --git a/dot/emacs b/dot/emacs
index fca998c..7be9951 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -221,7 +221,8 @@
 (setq scroll-step 5)			;Don't scroll too much at a time
 (setq-default fill-column 77)		;I use rather narrow windows
 (setq-default comment-column 40)	;Set a standard comment column
-(setq-default truncate-partial-width-windows nil)
+(setq-default truncate-partial-width-windows nil
+	      truncate-lines t)
 (setq default-indicate-empty-lines t)
 (setq whitespace-style
       '(trailing space-before-tab space-after-tab empty indentation))
@@ -561,11 +562,11 @@
 	'(c-mode-hook c++-mode-hook objc-mode-hook java-mode-hook
 	  csharp-mode-hook perl-mode-hook cperl-mode-hook
 	  python-mode-hook pyrec-mode-hook icon-mode-hook awk-mode-hook
-	  tcl-mode-hook go-mode-hook js-mode-hook
+	  tcl-mode-hook go-mode-hook js-mode-hook conf-mode-hook
 	  asm-mode-hook TeX-mode-hook LaTeX-mode-hook
 	  TeXinfo-mode-hook tex-mode-hook latex-mode-hook
 	  texinfo-mode-hook emacs-lisp-mode-hook scheme-mode-hook
-	  lisp-mode-hook lisp-interaction-mode-hook
+	  lisp-mode-hook lisp-interaction-mode-hook makefile-mode-hook
 	  inferior-lisp-mode-hook slime-repl-mode-hook
 	  sml-mode-hook haskell-mode-hook erlang-mode-hook
 	  smalltalk-mode-hook rexx-mode-hook