[elpa] scratch/javaimp-gradle 7a0f56a: Fixes
branch: scratch/javaimp-gradle commit 7a0f56a2ba5508a41613bb881c3e8cf903395d82 Author: Filipp Gunbin Commit: Filipp Gunbin Fixes --- packages/javaimp/javaimp-gradle.el | 2 +- packages/javaimp/javaimp-util.el | 27 +++ packages/javaimp/javaimp.el| 28 +--- 3 files changed, 29 insertions(+), 28 deletions(-) diff --git a/packages/javaimp/javaimp-gradle.el b/packages/javaimp/javaimp-gradle.el index 285794e..2596465 100644 --- a/packages/javaimp/javaimp-gradle.el +++ b/packages/javaimp/javaimp-gradle.el @@ -30,7 +30,7 @@ gradlew program, it is used in preference." (defconst javaimp--gradle-task-body (with-temp-buffer -(insert-file-contents "gradleTaskBody.inc.kts") +(insert-file-contents (expand-file-name "gradleTaskBody.inc.kts" javaimp--basedir)) (buffer-string)) "Task body, uses syntax which can be used both in Groovy and Kotlin") diff --git a/packages/javaimp/javaimp-util.el b/packages/javaimp/javaimp-util.el index cd5d58e..c60e9e3 100644 --- a/packages/javaimp/javaimp-util.el +++ b/packages/javaimp/javaimp-util.el @@ -23,6 +23,8 @@ ;;; Code: (require 'xml) +(require 'cl-lib) +(require 'seq) (defcustom javaimp-cygpath-program (if (eq system-type 'cygwin) "cygpath") @@ -31,6 +33,31 @@ the program is not on `exec-path'." :group 'javaimp :type 'string) +(defconst javaimp-debug-buf-name "*javaimp-debug*") + +(defconst javaimp--basedir (file-name-directory load-file-name)) + +;; Structs + +(cl-defstruct javaimp-node + parent children contents) + +(cl-defstruct javaimp-module + id parent-id + file + file-orig + final-name + source-dirs build-dir + dep-jars + load-ts + dep-jars-path-fetcher) + +(cl-defstruct javaimp-id + group artifact version) + +(cl-defstruct javaimp-cached-jar + file read-ts classes) + (defun javaimp--xml-children (xml-tree child-name) "Returns list of children of XML-TREE filtered by CHILD-NAME" diff --git a/packages/javaimp/javaimp.el b/packages/javaimp/javaimp.el index c900321..b24b243 100644 --- a/packages/javaimp/javaimp.el +++ b/packages/javaimp/javaimp.el @@ -69,9 +69,6 @@ ;;; Code: -(require 'cl-lib) -(require 'seq) -(require 'javaimp-util) (require 'javaimp-maven) (require 'javaimp-gradle) @@ -144,7 +141,7 @@ to the completion alternatives list." :type 'boolean) -;; Variables and constants +;; Variables (defvar javaimp-project-forest nil "Visited projects") @@ -153,29 +150,6 @@ to the completion alternatives list." "Alist of cached jars. Each element is of the form (FILE . CACHED-JAR).") -(defconst javaimp-debug-buf-name "*javaimp-debug*") - -;; Structs - -(cl-defstruct javaimp-node - parent children contents) - -(cl-defstruct javaimp-module - id parent-id - file - file-orig - final-name - source-dirs build-dir - dep-jars - load-ts - dep-jars-path-fetcher) - -(cl-defstruct javaimp-id - group artifact version) - -(cl-defstruct javaimp-cached-jar - file read-ts classes) - ;;;###autoload
[elpa] externals/phps-mode ec12a4c: Resolved issue with incremental changes when switching buffer
branch: externals/phps-mode commit ec12a4c89967d2561d8ea86530a4f04c43f57d30 Author: Christian Johansson Commit: Christian Johansson Resolved issue with incremental changes when switching buffer --- phps-mode-analyzer.el | 8 +++- phps-mode.el | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/phps-mode-analyzer.el b/phps-mode-analyzer.el index 0892fb4..c0531e9 100644 --- a/phps-mode-analyzer.el +++ b/phps-mode-analyzer.el @@ -2942,7 +2942,13 @@ "Start idle timer." (phps-mode-debug-message (message "Enqueued idle timer")) (when (boundp 'phps-mode-idle-interval) -(setq-local phps-mode-functions-idle-timer (run-with-idle-timer phps-mode-idle-interval nil #'phps-mode-analyzer-process-changes +(let ((buffer (current-buffer))) + (setq-local + phps-mode-functions-idle-timer + (run-with-idle-timer +phps-mode-idle-interval +nil +`(lambda() (phps-mode-analyzer-process-changes ,buffer))) (defun phps-mode-analyzer--reset-imenu () "Reset imenu index." diff --git a/phps-mode.el b/phps-mode.el index 3f70b74..aa0df17 100644 --- a/phps-mode.el +++ b/phps-mode.el @@ -6,7 +6,7 @@ ;; Maintainer: Christian Johansson ;; Created: 3 Mar 2018 ;; Modified: 6 Nov 2019 -;; Version: 0.3.8 +;; Version: 0.3.9 ;; Keywords: tools, convenience ;; URL: https://github.com/cjohansson/emacs-phps-mode
[elpa] externals/phps-mode f72e66e: * phps-mode-analyzer.el: Don't quote lambdas
branch: externals/phps-mode commit f72e66ed359d4eda936b13c9d4248c202a9d4f93 Author: Stefan Monnier Commit: Stefan Monnier * phps-mode-analyzer.el: Don't quote lambdas (phps-mode-functions--start-idle-timer): We could use a closure, but here I just used the ARGS of run-with-idle-timer instead. --- phps-mode-analyzer.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phps-mode-analyzer.el b/phps-mode-analyzer.el index c0531e9..380c8bb 100644 --- a/phps-mode-analyzer.el +++ b/phps-mode-analyzer.el @@ -503,7 +503,7 @@ (phps-mode-lexer-re2c-rule (and ST_IN_SCRIPTING (looking-at "try")) (lambda() - (phps-mode-lexer-RETURN_TOKEN 'T_TRY (match-beginning 0) (match-end 00 + (phps-mode-lexer-RETURN_TOKEN 'T_TRY (match-beginning 0) (match-end 00 ;FIXME: What is this `0'? (phps-mode-lexer-re2c-rule (and ST_IN_SCRIPTING (looking-at "catch")) @@ -2948,7 +2948,7 @@ (run-with-idle-timer phps-mode-idle-interval nil -`(lambda() (phps-mode-analyzer-process-changes ,buffer))) +#'phps-mode-analyzer-process-changes buffer) (defun phps-mode-analyzer--reset-imenu () "Reset imenu index."
[elpa] externals/phps-mode b45f811: Removed trailing zero
branch: externals/phps-mode commit b45f811a7de57c935f9e2aae4b7ff1b4e8bcdd79 Author: Christian Johansson Commit: Christian Johansson Removed trailing zero --- phps-mode-analyzer.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phps-mode-analyzer.el b/phps-mode-analyzer.el index 380c8bb..7675368 100644 --- a/phps-mode-analyzer.el +++ b/phps-mode-analyzer.el @@ -503,7 +503,7 @@ (phps-mode-lexer-re2c-rule (and ST_IN_SCRIPTING (looking-at "try")) (lambda() - (phps-mode-lexer-RETURN_TOKEN 'T_TRY (match-beginning 0) (match-end 00 ;FIXME: What is this `0'? + (phps-mode-lexer-RETURN_TOKEN 'T_TRY (match-beginning 0) (match-end 0 (phps-mode-lexer-re2c-rule (and ST_IN_SCRIPTING (looking-at "catch"))
