diff options
| author | Stefan Kangas <stefan@marxist.se> | 2021-09-18 09:40:29 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2021-09-18 09:40:29 +0200 |
| commit | dc0f1eddd4ea940e41d493e6ba5ed8b17dd9671f (patch) | |
| tree | 69cd3e29aa7e1b36444dcbe00c712443bfc67b3a /lisp/vc/emerge.el | |
| parent | e0726bca4072d57bba2e8145a48ed36f45d7087c (diff) | |
| download | emacs-dc0f1eddd4ea940e41d493e6ba5ed8b17dd9671f.tar.gz emacs-dc0f1eddd4ea940e41d493e6ba5ed8b17dd9671f.tar.bz2 emacs-dc0f1eddd4ea940e41d493e6ba5ed8b17dd9671f.zip | |
Add indent declaration to emerge-defvar-local
* lisp/vc/emerge.el (emerge-defvar-local): Add indent declaration
for docstring. Fix wrongly indented callers.
Diffstat (limited to 'lisp/vc/emerge.el')
| -rw-r--r-- | lisp/vc/emerge.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/vc/emerge.el b/lisp/vc/emerge.el index 1c3ab8b96cb..b2fdb07d5fb 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. |