[nongnu] elpa/dockerfile-mode 33bd07b9b2 093/104: resolved conflict

[ELPA Syncer]

branch: elpa/dockerfile-mode
commit 33bd07b9b23f25406e1e16e180ddeede3af7d4b6
Merge: 27a9f4d2f3 11dc6eb095
Author: Drew Csillag <drew@thecsillags.com>
Commit: Drew Csillag <drew@thecsillags.com>

    resolved conflict
---
 dockerfile-mode.el | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/dockerfile-mode.el b/dockerfile-mode.el
index ffa79d5f4b..2e32e0f4cd 100644
--- a/dockerfile-mode.el
+++ b/dockerfile-mode.el
@@ -65,7 +65,12 @@ Each element of the list will be passed as a separate
 This is the new buildsystem for docker, and in time it will replace the old one
 but for now it has to be explicitly enabled to work.
 It is supported from docker 18.09"
-  :type 'boolean
+  :type 'boolean)
+
+(defcustom dockerfile-indent-offset (or standard-indent 2)
+  "Dockerfile number of columns for margin-changing functions to indent."
+  :type 'integer
+  :safe #'integerp
   :group 'dockerfile)
 
 (defface dockerfile-image-name
@@ -131,7 +136,7 @@ It is supported from docker 18.09"
   "Indent lines in a Dockerfile.
 
 Lines beginning with a keyword are ignored, and any others are
-indented by one `tab-width'."
+indented by one `dockerfile-indent-offset'."
   (unless (member (get-text-property (point-at-bol) 'face)
                   '(font-lock-comment-delimiter-face font-lock-keyword-face))
     (save-excursion
@@ -140,7 +145,7 @@ indented by one `tab-width'."
       (unless (equal (point) (point-at-eol)) ; Ignore empty lines.
         ;; Delete existing whitespace.
         (delete-char (- (point-at-bol) (point)))
-        (indent-to tab-width)))))
+        (indent-to dockerfile-indent-offset)))))
 
 (defun dockerfile-build-arg-string ()
   "Create a --build-arg string for each element in `dockerfile-build-args'."