diff options
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/fill-paragraph.patch | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 7824eaf697354..1454118da6ec3 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0q5jnix65zn58dhd9xc3sjpamli0lh1bnsz1b9riwwicgwssrk7q"; }; - patches = [ ./docbook2texi.patch ]; + patches = [ ./docbook2texi.patch ./fill-paragraph.patch ]; buildInputs = [curl openssl zlib expat gettext cpio makeWrapper] ++ # documentation tools diff --git a/pkgs/applications/version-management/git-and-tools/git/fill-paragraph.patch b/pkgs/applications/version-management/git-and-tools/git/fill-paragraph.patch new file mode 100644 index 0000000000000..59d6d6b3d332f --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git/fill-paragraph.patch @@ -0,0 +1,11 @@ +diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el +index 3c37d0d..e314c44 100644 +--- a/contrib/emacs/git.el ++++ b/contrib/emacs/git.el +@@ -1331,6 +1331,7 @@ Return the list of files that haven't been handled." + (log-edit-diff-function . git-log-edit-diff)) buffer) + (log-edit 'git-do-commit nil 'git-log-edit-files buffer)) + (setq font-lock-keywords (font-lock-compile-keywords git-log-edit-font-lock-keywords)) ++ (setq paragraph-separate (concat (regexp-quote git-log-msg-separator) "$\\|Author: \\|Date: \\|Merge: \\|Signed-off-by: \\|\f\\|[ ]*$")) + (setq buffer-file-coding-system coding-system) + (re-search-forward (regexp-quote (concat git-log-msg-separator "\n")) nil t)))) |