; 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)

diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index f2dc584bba9392d836db430b80c6587d8e63a90d..d959007c106b009e13ea9f0fa3d30ff3650a33ac 100644 (file)
--- 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