From b51de13d81920f92ebe067b9c76e9d2195685099 Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Tue, 20 Jul 2021 11:06:01 +0100
Subject: [PATCH] Limit fill-column to 79
The current line-length limit is set to 80, but that allows a
character to appear in the 80th column, and that causes emacs to
display a line-wrap followed by a blank line when the display/window
width is 80 columns. Furthermore, this seems to contradict the
coding-style rules on the wiki which suggest that the line limit
should be 79.
So reduce the line width in both the emacs control file and the
contrib vimrc file to 79 characters.
ChangeLog:
* .dir-locals.el (c-mode): Change fill-column to 79.
contrib/ChangeLog:
* vimrc (textwidth): Change non-gitcommit length to 79.
---
.dir-locals.el | 2 +-
contrib/vimrc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.dir-locals.el b/.dir-locals.el
index 44a0db682417..b07a0dc50d8a 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 356d455b059c..b7a8ab7360c3 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"
--
GitLab