branch: scratch/editorconfig-cc
commit 023a221d8702b0f75a3222972f5f646e7a5ceecb
Author: 10sr <8.slas...@gmail.com>
Commit: Stefan Monnier <monn...@iro.umontreal.ca>
Add fixes for package-lint
---
Makefile | 3 +--
editorconfig-conf-mode.el | 1 +
editorconfig-core-handle.el | 1 +
editorconfig-core.el | 1 +
editorconfig-fnmatch.el | 1 +
editorconfig.el | 12 ++++++------
6 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index 30dd25f663..d554209cf2 100644
--- a/Makefile
+++ b/Makefile
@@ -12,8 +12,7 @@ ERT_TESTS = $(wildcard $(PROJECT_ROOT_DIR)/ert-tests/*.el)
BATCHFLAGS = -batch -q --no-site-file -L $(PROJECT_ROOT_DIR)
MAIN_SRC = editorconfig.el
-SRCS = editorconfig.el editorconfig-core.el editorconfig-core-handle.el \
- editorconfig-fnmatch.el
+SRCS = $(wildcard $(PROJECT_ROOT_DIR)/*.el)
OBJS = $(SRCS:.el=.elc)
$(OBJS): %.elc: %.el
diff --git a/editorconfig-conf-mode.el b/editorconfig-conf-mode.el
index 55911fe9df..3bf305a65c 100644
--- a/editorconfig-conf-mode.el
+++ b/editorconfig-conf-mode.el
@@ -4,6 +4,7 @@
;; Author: EditorConfig Team <editorcon...@googlegroups.com>
;; URL: https://github.com/editorconfig/editorconfig-emacs#readme
+;; Version: 0.7.14
;; See
;; https://github.com/editorconfig/editorconfig-emacs/graphs/contributors
diff --git a/editorconfig-core-handle.el b/editorconfig-core-handle.el
index d87a11c8db..06e1169266 100644
--- a/editorconfig-core-handle.el
+++ b/editorconfig-core-handle.el
@@ -4,6 +4,7 @@
;; Author: EditorConfig Team <editorcon...@googlegroups.com>
;; URL: https://github.com/editorconfig/editorconfig-emacs#readme
+;; Version: 0.7.14
;; See
;; https://github.com/editorconfig/editorconfig-emacs/graphs/contributors
diff --git a/editorconfig-core.el b/editorconfig-core.el
index 77f8aff24e..fd2435d319 100644
--- a/editorconfig-core.el
+++ b/editorconfig-core.el
@@ -4,6 +4,7 @@
;; Author: EditorConfig Team <editorcon...@googlegroups.com>
;; URL: https://github.com/editorconfig/editorconfig-emacs#readme
+;; Version: 0.7.14
;; See
;; https://github.com/editorconfig/editorconfig-emacs/graphs/contributors
diff --git a/editorconfig-fnmatch.el b/editorconfig-fnmatch.el
index b8e8903d1f..0299678dfc 100644
--- a/editorconfig-fnmatch.el
+++ b/editorconfig-fnmatch.el
@@ -4,6 +4,7 @@
;; Author: EditorConfig Team <editorcon...@googlegroups.com>
;; URL: https://github.com/editorconfig/editorconfig-emacs#readme
+;; Version: 0.7.14
;; See
;; https://github.com/editorconfig/editorconfig-emacs/graphs/contributors
diff --git a/editorconfig.el b/editorconfig.el
index d4e30c48c2..96c23b995d 100644
--- a/editorconfig.el
+++ b/editorconfig.el
@@ -177,7 +177,7 @@ overwrite \"indent_style\" property when current
`major-mode' is a
(js2-mode js2-basic-offset)
(js3-mode js3-indent-level)
(json-mode js-indent-level)
- (latex-mode . editorconfig-set-indentation/latex-mode)
+ (latex-mode . editorconfig-set-indentation-latex-mode)
(lisp-mode lisp-indent-offset)
(livescript-mode livescript-tab-width)
(matlab-mode matlab-indent-level)
@@ -194,7 +194,7 @@ overwrite \"indent_style\" property when current
`major-mode' is a
(pike-mode c-basic-offset)
(ps-mode ps-mode-tab)
(puppet-mode puppet-indent-level)
- (python-mode . editorconfig-set-indentation/python-mode)
+ (python-mode . editorconfig-set-indentation-python-mode)
(ruby-mode ruby-indent-level)
(scala-mode scala-indent:step)
(scss-mode css-indent-offset)
@@ -299,11 +299,11 @@ number - `lisp-indent-offset' is not set only if
indent_size is
(and (stringp string)
(string-match-p "\\`[0-9]+\\'" string)))
-(defun editorconfig-set-indentation/python-mode (size)
+(defun editorconfig-set-indentation-python-mode (size)
"Set `python-mode' indent size to SIZE."
)
-(defun editorconfig-set-indentation/latex-mode (size)
+(defun editorconfig-set-indentation-latex-mode (size)
"Set `latex-mode' indent size to SIZE."
)
@@ -380,7 +380,7 @@ FILETYPE should be s string like `\"ini\"`, if not nil or
empty string."
"-mode")))))
(when mode
(if (fboundp mode)
- (editorconig-apply-major-mode-safely mode)
+ (editorconfig-apply-major-mode-safely mode)
(display-warning :error (format "Major-mode `%S' not found"
mode))
nil))))
@@ -392,7 +392,7 @@ FILETYPE should be s string like `\"ini\"`, if not nil or
empty string."
'permanent-local
t)
-(defun editorconig-apply-major-mode-safely (mode)
+(defun editorconfig-apply-major-mode-safely (mode)
"Set `major-mode' to MODE.
Normally `editorconfig-apply' will be hooked so that it runs when changing
`major-mode', so there is a possibility that MODE is called infinitely if
