branch: elpa/lua-mode
commit 2f6b8d7a6317e42c953c5119b0119ddb337e0a5f
Merge: d074e4134b eb067bce0e
Author: immerrr again <imme...@gmail.com>
Commit: GitHub <nore...@github.com>
Merge pull request #217 from tarsiiformes/eighty
Reduce width of docstrings below limit of 80 characters
---
lua-mode.el | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/lua-mode.el b/lua-mode.el
index 6c524f57d9..be5611158b 100644
--- a/lua-mode.el
+++ b/lua-mode.el
@@ -376,8 +376,8 @@ If the latter is nil, the keymap translates into
`lua-mode-map' verbatim.")
"Keymap used in lua-mode buffers.")
(defvar lua-electric-flag t
- "If t, electric actions (like automatic reindentation) will happen when an
electric
- key like `{' is pressed")
+ "If t, electric actions will happen when an electric key like `{' is pressed.
+Automatic reindentation is an example of an electric action.")
(make-variable-buffer-local 'lua-electric-flag)
(defcustom lua-prompt-regexp "[^\n]*\\(>[\t ]+\\)+$"
@@ -1054,9 +1054,15 @@ found, returns point position, nil otherwise."
Each token information entry is of the form:
KEYWORD FORWARD-MATCH-REGEXP BACKWARDS-MATCH-REGEXP TOKEN-TYPE
KEYWORD is the token.
-FORWARD-MATCH-REGEXP is a regexp that matches all possible tokens when going
forward.
-BACKWARDS-MATCH-REGEXP is a regexp that matches all possible tokens when going
backwards.
-TOKEN-TYPE determines where the token occurs on a statement. open indicates
that the token appears at start, close indicates that it appears at end, middle
indicates that it is a middle type token, and middle-or-open indicates that it
can appear both as a middle or an open type.")
+FORWARD-MATCH-REGEXP is a regexp that matches all possible tokens
+ when going forward.
+BACKWARDS-MATCH-REGEXP is a regexp that matches all possible tokens
+ when going backwards.
+TOKEN-TYPE determines where the token occurs on a statement. `open'
+ indicates that the token appears at start, close indicates that it
+ appears at end, `middle' indicates that it is a middle type token,
+ and `middle-or-open' indicates that it can appear both as a middle
+ or an open type.")
(defconst lua-indentation-modifier-regexp
;; The absence of else is deliberate, since it does not modify the
@@ -1442,14 +1448,12 @@ The criteria for a continuing statement are:
(defun lua-is-continuing-statement-p (&optional parse-start)
- "Returns non-nil if the line at PARSE-START should be indented as
continuation line.
+ "Return non-nil if line at PARSE-START is a continuation line.
-This true is when the line :
-
-* is continuing a statement itself
-
-* starts with a 1+ block-closer tokens, an top-most block opener is on a
continuation line
-"
+This affects how it should be indented. A line is a continuation line if
+- it is continuing a statement itself, or
+- it starts with a 1+ block-closer tokens, an top-most block opener is on
+ a continuation line."
(save-excursion
(if parse-start (goto-char parse-start))
