branch: externals/phps-mode
commit ba5e20dcc6d71d86c207976c2ccf1bd7aa606ab0
Author: Christian Johansson <[email protected]>
Commit: Christian Johansson <[email protected]>
Fixed more byte-compilation notices
---
phps-mode-automation-parser-generator.el | 32 ++++++++++++--------------------
phps-mode-flymake.el | 3 ++-
2 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/phps-mode-automation-parser-generator.el
b/phps-mode-automation-parser-generator.el
index c1de052bfe..cdb27ba4b2 100644
--- a/phps-mode-automation-parser-generator.el
+++ b/phps-mode-automation-parser-generator.el
@@ -230,9 +230,10 @@
(when (boundp 'parser-generator-lex-analyzer--function)
(setq
parser-generator-lex-analyzer--function
- (lambda (index)
+ (lambda (index _state)
(with-current-buffer "*buffer*"
- (let ((token))
+ (let ((token)
+ (move-to-index-flag))
(when
(<
index
@@ -245,10 +246,7 @@
(when
(search-forward-regexp "[^\t\n; ]" nil t)
(forward-char -1)
- (when (boundp
'parser-generator-lex-analyzer--move-to-index-flag)
- (setq-local
- parser-generator-lex-analyzer--move-to-index-flag
- (point)))))
+ (setq move-to-index-flag (point))))
(cond
@@ -260,10 +258,7 @@
(error
"Failed to find end of comment started at %S (1)"
comment-start))
- (when (boundp
'parser-generator-lex-analyzer--move-to-index-flag)
- (setq-local
- parser-generator-lex-analyzer--move-to-index-flag
- comment-end))))
+ (setq move-to-index-flag comment-end)))
((looking-at "\\({\\)")
(let ((nesting-stack 1)
@@ -350,7 +345,7 @@
))
- token)))))
+ (list token move-to-index-flag))))))
(when (boundp 'parser-generator-lex-analyzer--get-function)
(setq
@@ -519,9 +514,10 @@
(when (boundp 'parser-generator-lex-analyzer--function)
(setq
parser-generator-lex-analyzer--function
- (lambda (index)
+ (lambda (index _state)
(with-current-buffer "*buffer*"
- (let ((token))
+ (let ((token)
+ (move-to-index-flag))
(when
(<
index
@@ -531,13 +527,9 @@
;; Skip white-space(s)
(when (looking-at-p "[\t\n ]+")
- (when
- (search-forward-regexp "[^\t\n ]" nil t)
+ (when (search-forward-regexp "[^\t\n ]" nil t)
(forward-char -1)
- (when (boundp
'parser-generator-lex-analyzer--move-to-index-flag)
- (setq-local
- parser-generator-lex-analyzer--move-to-index-flag
- (point)))))
+ (setq move-to-index-flag (point))))
(cond
@@ -570,7 +562,7 @@
))
- token)))))
+ (list token move-to-index-flag))))))
(when (boundp 'parser-generator-lex-analyzer--get-function)
(setq
diff --git a/phps-mode-flymake.el b/phps-mode-flymake.el
index 4195130e81..509945c4c7 100644
--- a/phps-mode-flymake.el
+++ b/phps-mode-flymake.el
@@ -35,7 +35,8 @@ Look at the `php-executable' variable instead of the constant
\"php\" command."
(eval-when-compile
(if (fboundp 'flymake-proc-init-create-temp-buffer-copy)
'flymake-proc-init-create-temp-buffer-copy
- 'flymake-init-create-temp-buffer-copy))
+ (if (fboundp 'flymake-init-create-temp-buffer-copy)
+ 'flymake-init-create-temp-buffer-copy)))
'flymake-create-temp-inplace))
(local-file (file-relative-name
temp-file
