mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-22 05:51:11 -07:00
Code Issues Projects Releases Wiki Activity

Add indent declaration to emerge-defvar-local

Browse source 
* lisp/vc/emerge.el (emerge-defvar-local): Add indent declaration
for docstring.  Fix wrongly indented callers.
This commit is contained in:
Stefan Kangas 2021-09-18 09:40:29 +02:00
parent e0726bca40
commit dc0f1eddd4
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/vc/emerge.el
View file

@ -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.