diff --git a/.dir-locals.el b/.dir-locals.el
index 44a0db682417a040e18131abc3d7e1d4bcd5f709..b07a0dc50d8a440d5b51ef00953a44de42bfe328 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -20,4 +20,4 @@
  (nil . ((bug-reference-url-format . "http://gcc.gnu.org/PR%s")))
  (c-mode . ((c-file-style . "GNU")
 	    (indent-tabs-mode . t)
-	    (fill-column . 80))))
+	    (fill-column . 79))))
diff --git a/contrib/vimrc b/contrib/vimrc
index 356d455b059cd5737eebeda8a7ab0e0a119898bf..b7a8ab7360c377e380948d22a3b313be51b5a083 100644
--- a/contrib/vimrc
+++ b/contrib/vimrc
@@ -42,7 +42,7 @@ function! SetStyle()
   if &filetype == "gitcommit"
     setlocal textwidth=72
   else
-    setlocal textwidth=80
+    setlocal textwidth=79
   endif
   setlocal formatoptions-=ro formatoptions+=cqlt
   if index(l:c_exts, l:ext) != -1 || &filetype == "c" || &filetype == "cpp"