Skip to content

Commit 3c5e31b

Browse files
committed
Address package-lint warnings and errors
See #4
1 parent dfe2cd9 commit 3c5e31b

10 files changed

+17
-35
lines changed

Diff for: gdscript-completion.el

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
;; Author: Nathan Lovato <[email protected]>, Fabián E. Gallina <[email protected]>
66
;; URL: https://github.com/GDQuest/emacs-gdscript-mode/
77
;; Version: 0.1.0
8-
;; Package-Requires: ((emacs "26.0"))
8+
;; Package-Requires: ((emacs "26.3"))
99
;; Maintainer: [email protected]
1010
;; Created: Feb 2020
1111
;; Keywords: languages

Diff for: gdscript-customization.el

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
;; Author: Nathan Lovato <[email protected]>
66
;; URL: https://github.com/GDQuest/emacs-gdscript-mode/
77
;; Version: 0.1.0
8-
;; Package-Requires: ((emacs "26.0"))
8+
;; Package-Requires: ((emacs "26.3"))
99
;; Maintainer: [email protected]
1010
;; Created: Jan 2020
1111
;; Keywords: languages

Diff for: gdscript-fill-paragraph.el

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
;; Author: Nathan Lovato <[email protected]>
66
;; URL: https://github.com/GDQuest/emacs-gdscript-mode/
77
;; Version: 0.1.0
8-
;; Package-Requires: ((emacs "26.0"))
8+
;; Package-Requires: ((emacs "26.3"))
99
;; Maintainer: [email protected]
1010
;; Created: Jan 2020
1111
;; Keywords: languages

Diff for: gdscript-format.el

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
;; Author: Pawel Lampe <[email protected]>, Nathan Lovato <[email protected]>
66
;; URL: https://github.com/GDQuest/emacs-gdscript-mode/
77
;; Version: 1.0.0
8-
;; Package-Requires: ((emacs "26.0"))
8+
;; Package-Requires: ((emacs "26.3"))
99
;; Maintainer: [email protected]
1010
;; Created: Feb 2020
1111
;; Keywords: languages

Diff for: gdscript-imenu.el

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
;; Author: Nathan Lovato <[email protected]>, Fabián E. Gallina <[email protected]>
66
;; URL: https://github.com/GDQuest/emacs-gdscript-mode/
77
;; Version: 1.0.0
8-
;; Package-Requires: ((emacs "26.0"))
8+
;; Package-Requires: ((emacs "26.3"))
99
;; Maintainer: [email protected]
1010
;; Created: Feb 2020
1111
;; Keywords: languages

Diff for: gdscript-indent-and-nav.el

+8-26
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
;;; gdscript-syntax.el --- Syntax highlighting for GDScript -*- lexical-binding: t; -*-
1+
;;; gdscript-indent-and-nav.el --- Syntax highlighting for GDScript -*- lexical-binding: t; -*-
22

33
;; Copyright (C) 2020 GDQuest, Free Software Foundation, Inc.
44

55
;; Author: Nathan Lovato <[email protected]>, Fabián E. Gallina <[email protected]>
66
;; URL: https://github.com/GDQuest/emacs-gdscript-mode/
77
;; Version: 1.0.0
8-
;; Package-Requires: ((emacs "26.0"))
8+
;; Package-Requires: ((emacs "26.3"))
99
;; Maintainer: [email protected]
1010
;; Created: Feb 2020
1111
;; Keywords: languages
@@ -26,12 +26,17 @@
2626

2727
;;; Commentary:
2828

29-
;; Sets up the syntax table and font-faces for GDScript.
29+
;; Functions copies from Emacs 27's built-in python.el to handle indents,
30+
;; querying info about the language's symbols or the context at point, and for
31+
;; navigation.
32+
;; There are dependencies between the *indent*, *info*, and *nav* functions that prevent us from splitting them into separate .el files at the moment.
3033

3134
;;; Code:
3235

3336
(require 'gdscript-utils)
3437
(require 'gdscript-rx)
38+
(require 'gdscript-syntax)
39+
(require 'cl-lib)
3540

3641

3742
;;; Indentation
@@ -1448,29 +1453,6 @@ This command assumes point is not in a string or comment."
14481453
(or arg (setq arg 1))
14491454
(gdscript-nav-up-list (- arg)))
14501455

1451-
(defun gdscript-nav-if-name-main ()
1452-
"Move point at the beginning the __main__ block.
1453-
When \"if __name__ == \\='__main__\\=':\" is found returns its
1454-
position, else returns nil."
1455-
(interactive)
1456-
(let ((point (point))
1457-
(found (catch 'found
1458-
(goto-char (point-min))
1459-
(while (re-search-forward
1460-
(gdscript-rx line-start
1461-
"if" (+ space)
1462-
"__name__" (+ space)
1463-
"==" (+ space)
1464-
(group-n 1 (or ?\" ?\'))
1465-
"__main__" (backref 1) (* space) ":")
1466-
nil t)
1467-
(when (not (gdscript-syntax-context-type))
1468-
(beginning-of-line)
1469-
(throw 'found t))))))
1470-
(if found
1471-
(point)
1472-
(ignore (goto-char point)))))
1473-
14741456
(provide 'gdscript-indent-and-nav)
14751457

14761458
;;; gdscript-indent-and-nav.el ends here

Diff for: gdscript-mode.el

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
;; Author: Nathan Lovato <[email protected]>, Fabián E. Gallina <[email protected]>
66
;; URL: https://github.com/GDQuest/emacs-gdscript-mode/
77
;; Version: 0.1.0
8-
;; Package-Requires: ((emacs "26.0"))
8+
;; Package-Requires: ((emacs "26.3"))
99
;; Maintainer: [email protected]
1010
;; Created: Jan 2020
1111
;; Keywords: languages

Diff for: gdscript-rx.el

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
;; Author: Nathan Lovato <[email protected]>, Fabián E. Gallina <[email protected]>
66
;; URL: https://github.com/GDQuest/emacs-gdscript-mode/
77
;; Version: 1.0.0
8-
;; Package-Requires: ((emacs "26.0"))
8+
;; Package-Requires: ((emacs "26.3"))
99
;; Maintainer: [email protected]
1010
;; Created: Feb 2020
1111
;; Keywords: languages

Diff for: gdscript-syntax.el

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
;; Author: Nathan Lovato <[email protected]>, Fabián E. Gallina <[email protected]>
66
;; URL: https://github.com/GDQuest/emacs-gdscript-mode/
77
;; Version: 1.0.0
8-
;; Package-Requires: ((emacs "26.0"))
8+
;; Package-Requires: ((emacs "26.3"))
99
;; Maintainer: [email protected]
1010
;; Created: Feb 2020
1111
;; Keywords: languages

Diff for: gdscript-utils.el

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
;; Author: Nathan Lovato <[email protected]>, Fabián E. Gallina <[email protected]>
66
;; URL: https://github.com/GDQuest/emacs-gdscript-mode/
77
;; Version: 0.1.0
8-
;; Package-Requires: ((emacs "26.0"))
8+
;; Package-Requires: ((emacs "26.3"))
99
;; Maintainer: [email protected]
1010
;; Created: Jan 2020
1111
;; Keywords: languages

0 commit comments

Comments
 (0)