From c68a192eaf2172212653256e3d2b1e8a68bb9160 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 26 Oct 2024 11:15:25 +0800 Subject: [PATCH] ; Reformat a couple of recently added long strings * lisp/vc/vc-git.el (vc-git--assert-allowed-rewrite) (vc-git-modify-change-comment): Reformat long strings by prefixing an escaped newline. (cherry picked from commit 4b9daca842419f94226d40adc9f7844d18dfffa9) --- lisp/vc/vc-git.el | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index f2dc584bba9..d959007c106 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1981,9 +1981,11 @@ This requires git 1.8.4 or later, for the \"-L\" option of \"git log\"." (unless (or (cl-member rev outgoing :test #'string-prefix-p) (and (eq vc-allow-rewriting-published-history 'ask) (yes-or-no-p - (format "Commit %s appears published; allow rewriting history?" + (format "\ +Commit %s appears published; allow rewriting history?" rev)))) - (user-error "Will not rewrite likely-public history; see option `vc-allow-rewriting-published-history'"))))) + (user-error "\ +Will not rewrite likely-public history; see option `vc-allow-rewriting-published-history'"))))) (defun vc-git-modify-change-comment (files rev comment) (vc-git--assert-allowed-rewrite rev) @@ -2024,8 +2026,8 @@ This requires git 1.8.4 or later, for the \"-L\" option of \"git log\"." "log" "--oneline" "-E" "--grep" "^(squash|fixup|amend)! " (format "%s~1.." rev)))) - (not (yes-or-no-p -"Rebase may --autosquash your other squash!/fixup!/amend!; proceed?"))) + (not (yes-or-no-p "\ +Rebase may --autosquash your other squash!/fixup!/amend!; proceed?"))) (user-error "Aborted")) (when msg-file -- 2.39.5