branch: externals/poke-mode
commit a5d43413eec2f432c55cb0eaa43af5491ed2e9b2
Author: Stefan Monnier <[email protected]>
Commit: Stefan Monnier <[email protected]>
Minor changes for GNU ELPA
* poke-mode.el: Adjust copyright.
(poke-mode): Rename group from `poke` since that one should be for the
`poke` package.
(poke-smie-rules): Move "struct" rule earlier (and then merge it with
the "fun" rule) so it's not shadowed by the generic "{" rule.
* .gitignore: New file.
---
.gitignore | 3 +++
poke-mode.el | 13 ++++++-------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..85338ee3fd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*.elc
+/poke-mode-autoloads.el
+/poke-mode-pkg.el
diff --git a/poke-mode.el b/poke-mode.el
index 467b5724b5..cb075677a8 100644
--- a/poke-mode.el
+++ b/poke-mode.el
@@ -1,9 +1,10 @@
;;; poke-mode.el --- Major mode for editing Poke programs -*-
lexical-binding: t; -*-
-;; Copyright (C) 2020, 2021 Aurelien Aptel <[email protected]>
+;; Copyright (C) 2020-2022 Free Software Foundation, Inc.
+
;; SMIE grammar and help from Stefan Monnier <[email protected]>
;; Version: 0
-
+;; Author: Aurelien Aptel <[email protected]>
;; Maintainer: Aurelien Aptel <[email protected]>
;; This file is NOT part of GNU Emacs.
@@ -37,8 +38,8 @@
(require 'smie)
-(defgroup poke nil
- "Poke PK (pickle) editiong mode."
+(defgroup poke-mode nil
+ "Poke PK (pickle) editing mode."
:group 'languages)
(defface poke-unit
@@ -306,12 +307,10 @@
(`(:elem . basic) poke-indent-basic)
;; (`(:list-intro . "=") t)
(`(:after . "=") poke-indent-basic)
- ((and `(:before . "{") (guard (smie-rule-parent-p "fun")))
+ ((and `(:before . "{") (guard (smie-rule-parent-p "fun" "struct")))
(smie-rule-parent 0))
(`(:before . ,(or `"(" `"{"))
(if (smie-rule-hanging-p) (smie-rule-parent)))
- ((and `(:before . "{") (guard (smie-rule-parent-p "struct")))
- (smie-rule-parent 0))
(`(:before . "if")
(and (not (smie-rule-bolp)) (smie-rule-prev-p "else")
(smie-rule-parent)))))
