From fc00006777594f969ba8fcff676e6ca1bcb43546 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Fri, 9 Jan 2026 17:44:04 +0000 Subject: [PATCH] runtime(sieve): preserve existing line endings in ftplugin MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Only set fileformat=dos for new files; preserve existing line endings when editing. This satisfies RFC 5228 for new files while avoiding issues with version control and existing workflows. The previous change (3cb4148) unconditionally set fileformat=dos, which converts existing files with LF line endings to CRLF on save. This causes issues with version control (entire file appears changed) and breaks workflows where sieve files are stored with unix line endings. Dovecot Pigeonhole (the main sieve implementation) has explicitly accepted LF line endings since 2008 (commit 97b967b5): /* Loose LF is allowed (non-standard) and converted to CRLF */ This behavior has remained unchanged for almost 18 years. closes: #19144 Co-Authored-By: Claude Opus 4.5 Signed-off-by: André-Patrick Bubel Signed-off-by: Christian Brabandt --- runtime/ftplugin/sieve.vim | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/runtime/ftplugin/sieve.vim b/runtime/ftplugin/sieve.vim index 8161fe99ac..1ea8eaeb9d 100644 --- a/runtime/ftplugin/sieve.vim +++ b/runtime/ftplugin/sieve.vim @@ -3,6 +3,7 @@ " Maintainer: This runtime file is looking for a new maintainer. " Previous Maintainer: Nikolai Weibull " Latest Revision: 2025 Feb 20 +" 2026 Jan 09 by Vim Project: preserve line endings for existing files #19144 if exists("b:did_ftplugin") finish @@ -16,4 +17,7 @@ setlocal formatoptions-=t formatoptions+=croql " https://datatracker.ietf.org/doc/html/rfc5228#section-2.2 says " "newlines (CRLF, never just CR or LF)" -setlocal fileformat=dos +" Use CRLF for new files only; preserve existing line endings +if expand('%:p') !=# '' && !filereadable(expand('%:p')) + setlocal fileformat=dos +endif -- 2.47.3