From 70c413e40375e325ef5c39e19bde15fe31a102bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Lindqvist?= Date: Sun, 26 Jun 2016 13:36:03 +0200 Subject: [PATCH] FUEL: simplifying --- misc/fuel/factor-mode.el | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/misc/fuel/factor-mode.el b/misc/fuel/factor-mode.el index 0fb399a858..7b0f2939a7 100644 --- a/misc/fuel/factor-mode.el +++ b/misc/fuel/factor-mode.el @@ -355,9 +355,6 @@ these lines in your .emacs: (defconst factor-no-indent-def-starts '("ARTICLE" "HELP" "SPECIALIZED-ARRAYS")) -(defconst factor-indent-def-start-regex - (format "^\\(%s:\\)\\( \\|\n\\)" (regexp-opt factor-indent-def-starts))) - (defconst factor-definition-start-regex (format "^\\(%s:\\) " (regexp-opt (append factor-no-indent-def-starts factor-indent-def-starts)))) @@ -390,12 +387,9 @@ these lines in your .emacs: (format "\\(^\\| +\\);\\( *%s\\)*\\($\\| +\\)" factor-declaration-words-regex)) -(defconst factor-end-of-def-line-regex - (format "^.*%s" factor-definition-end-regex)) - (defconst factor-end-of-def-regex - (format "\\(%s\\)\\|\\(^%s .*\\)" - factor-end-of-def-line-regex + (format "^.*%s\\|^%s .*" + factor-definition-end-regex factor-single-liner-regex)) (defconst factor-word-signature-regex @@ -585,9 +579,6 @@ these lines in your .emacs: (defsubst factor-at-begin-of-def () (looking-at factor-begin-of-def-regex)) -(defsubst factor-at-begin-of-indent-def () - (looking-at factor-indent-def-start-regex)) - (defsubst factor-at-end-of-def () (looking-at factor-end-of-def-regex)) @@ -775,6 +766,12 @@ these lines in your .emacs: (factor-previous-non-empty) (current-indentation))))) +(defconst factor-indent-def-start-regex + (format "^\\(%s:\\)\\( \\|\n\\)" (regexp-opt factor-indent-def-starts))) + +(defsubst factor-at-begin-of-indent-def () + (looking-at factor-indent-def-start-regex)) + (defun factor-indent-continuation () (save-excursion (factor-previous-non-empty)