diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2022-01-26 18:54:58 +0100 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2022-01-26 18:57:29 +0100 |
| commit | 0a51a85b5de0ca245252a679f2c44f1d9d0363dd (patch) | |
| tree | ced4e501d2dcd39feecf3e53dcc1f0002e3f5b79 | |
| parent | 66b99778b8109c557f22d76fadd1d75a0b5fa7fa (diff) | |
| download | emacs-0a51a85b5de0ca245252a679f2c44f1d9d0363dd.tar.gz emacs-0a51a85b5de0ca245252a679f2c44f1d9d0363dd.tar.bz2 emacs-0a51a85b5de0ca245252a679f2c44f1d9d0363dd.zip | |
Make smerge-refine-ignore-whitespace into defcustom
* lisp/vc/smerge-mode.el (smerge-refine-ignore-whitespace): Make
into defcustom (bug#12585).
| -rw-r--r-- | lisp/vc/smerge-mode.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index 6a4f6542b5e..003b26eca41 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el @@ -925,8 +925,11 @@ Its behavior has mainly two restrictions: to `smerge-refine-regions'. This only matters if `smerge-refine-weight-hack' is nil.") -(defvar smerge-refine-ignore-whitespace t - "If non-nil, `smerge-refine' should try to ignore change in whitespace.") +(defcustom smerge-refine-ignore-whitespace t + "If non-nil, `smerge-refine' should try to ignore change in whitespace." + :type 'boolean + :version "29.1" + :group 'diff) (defvar smerge-refine-weight-hack t "If non-nil, pass to diff as many lines as there are chars in the region. |