[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master dc0f1ed 4/4: Add indent declaration to emerge-defvar-local
From: |
Stefan Kangas |
Subject: |
master dc0f1ed 4/4: Add indent declaration to emerge-defvar-local |
Date: |
Sat, 18 Sep 2021 03:41:24 -0400 (EDT) |
branch: master
commit dc0f1eddd4ea940e41d493e6ba5ed8b17dd9671f
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
Add indent declaration to emerge-defvar-local
* lisp/vc/emerge.el (emerge-defvar-local): Add indent declaration
for docstring. Fix wrongly indented callers.
---
lisp/vc/emerge.el | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lisp/vc/emerge.el b/lisp/vc/emerge.el
index 1c3ab8b..b2fdb07 100644
--- a/lisp/vc/emerge.el
+++ b/lisp/vc/emerge.el
@@ -34,6 +34,7 @@ and its docstring to DOC.
Then set the `permanent-local' property, so that
`kill-all-local-variables' (called by major-mode setting
commands) won't destroy Emerge control variables."
+ (declare (indent defun) (doc-string 3))
`(progn
(defvar-local ,symbol ,value ,doc)
(put ',symbol 'permanent-local t)))
@@ -481,10 +482,10 @@ replaced by emerge-fast-keymap.")
(emerge-defvar-local emerge-old-keymap nil
"The original local keymap for the merge buffer.")
(emerge-defvar-local emerge-auto-advance nil
- "If non-nil, emerge-select-A and emerge-select-B
automatically advance to
+ "If non-nil, emerge-select-A and emerge-select-B automatically advance to
the next difference.")
(emerge-defvar-local emerge-skip-prefers nil
- "If non-nil, differences for which there is a preference
are automatically
+ "If non-nil, differences for which there is a preference are automatically
skipped.")
(emerge-defvar-local emerge-quit-hook nil
"Hooks to run in the merge buffer after the merge has been finished.