[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/dockerfile-mode b01f2ecdb6 094/104: Merge branch 'ncaq-add
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/dockerfile-mode b01f2ecdb6 094/104: Merge branch 'ncaq-add-dockerfile-indent-offset' |
Date: |
Sat, 29 Jan 2022 07:58:39 -0500 (EST) |
branch: elpa/dockerfile-mode
commit b01f2ecdb6ce981e07e5caa4ec712904071ea26a
Merge: 27a9f4d2f3 33bd07b9b2
Author: Drew Csillag <drew@thecsillags.com>
Commit: Drew Csillag <drew@thecsillags.com>
Merge branch 'ncaq-add-dockerfile-indent-offset'
---
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'."
- [nongnu] elpa/dockerfile-mode cd102cffa1 069/104: Merge pull request #34 from wynro/master, (continued)
- [nongnu] elpa/dockerfile-mode cd102cffa1 069/104: Merge pull request #34 from wynro/master, ELPA Syncer, 2022/01/29
- [nongnu] elpa/dockerfile-mode 1f4e9261e0 067/104: Add adequate casing to documented argument, ELPA Syncer, 2022/01/29
- [nongnu] elpa/dockerfile-mode 05f8d76e2e 072/104: Recognize Dockerfile files with extension, ELPA Syncer, 2022/01/29
- [nongnu] elpa/dockerfile-mode d607a90673 070/104: mention it is available via MELPA, ELPA Syncer, 2022/01/29
- [nongnu] elpa/dockerfile-mode 902e4c2a5a 075/104: Add faces for image name and alias, ELPA Syncer, 2022/01/29
- [nongnu] elpa/dockerfile-mode 64733f64ea 077/104: Merge pull request #41 from Fuco1/feature/image-name-font-lock, ELPA Syncer, 2022/01/29
- [nongnu] elpa/dockerfile-mode 6e1bf5dea4 074/104: README.md addition for safe-local-variable, ELPA Syncer, 2022/01/29
- [nongnu] elpa/dockerfile-mode 9f4381178a 079/104: Adds a very simple indent-line-function for Dockerfiles., ELPA Syncer, 2022/01/29
- [nongnu] elpa/dockerfile-mode 24a5a6cee6 083/104: Allow builds without tag/image name, ELPA Syncer, 2022/01/29
- [nongnu] elpa/dockerfile-mode a4f8aad581 091/104: FIX: make emacs lisp variable name consistent in README.md, ELPA Syncer, 2022/01/29
- [nongnu] elpa/dockerfile-mode b01f2ecdb6 094/104: Merge branch 'ncaq-add-dockerfile-indent-offset',
ELPA Syncer <=
- [nongnu] elpa/dockerfile-mode 652c2e0ba0 084/104: Remove logic for checking if there is an image-name provided, ELPA Syncer, 2022/01/29
- [nongnu] elpa/dockerfile-mode 533d5d4983 096/104: Tighten auto-mode-alist pattern some more, ELPA Syncer, 2022/01/29
- [nongnu] elpa/dockerfile-mode fd8057e438 098/104: Fix elisp byte-compiler warning, ELPA Syncer, 2022/01/29
- [nongnu] elpa/dockerfile-mode 3b1374563f 100/104: Add support for TRAMP file names, ELPA Syncer, 2022/01/29
- [nongnu] elpa/dockerfile-mode 37ef4643fc 001/104: Added essentials, ELPA Syncer, 2022/01/29
- [nongnu] elpa/dockerfile-mode 3f460b6de0 003/104: Error check docker-image-name and give helpful error message, ELPA Syncer, 2022/01/29
- [nongnu] elpa/dockerfile-mode 2e2f7231fc 008/104: Various fixes and improvements, ELPA Syncer, 2022/01/29
- [nongnu] elpa/dockerfile-mode 472c405828 018/104: Merge pull request #8 from mgalgs/prompt-space, ELPA Syncer, 2022/01/29
- [nongnu] elpa/dockerfile-mode 4e6a0f62c0 021/104: Use format instead of concat, ELPA Syncer, 2022/01/29
- [nongnu] elpa/dockerfile-mode fadac401c8 019/104: added note about emacs compatibility, ELPA Syncer, 2022/01/29