[elpa] externals/phps-mode bc9dc88336 2/5: Move cache setting to cache file

[Christian Johansson]

branch: externals/phps-mode
commit bc9dc883362b24f25aa5052d360b7f58b754edbe
Author: Christian Johansson <christian@cvj.se>
Commit: Christian Johansson <christian@cvj.se>

    Move cache setting to cache file
---
 phps-mode-cache.el        |  5 +++++
 phps-mode-lex-analyzer.el | 12 +++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/phps-mode-cache.el b/phps-mode-cache.el
index 21b7a3b688..01ba098b85 100644
--- a/phps-mode-cache.el
+++ b/phps-mode-cache.el
@@ -9,6 +9,11 @@
 ;;; Code:
 
 
+(defvar
+  phps-mode-cache--use-p
+  nil
+  "Whether to use cache or not.")
+
 (defvar
   phps-mode-cache--base-filename
   "~/.phps-mode-cache/"
diff --git a/phps-mode-lex-analyzer.el b/phps-mode-lex-analyzer.el
index c999cd1b81..36dbba8963 100644
--- a/phps-mode-lex-analyzer.el
+++ b/phps-mode-lex-analyzer.el
@@ -91,9 +91,6 @@
 (defvar-local phps-mode-lex-analyzer--lexer-max-index nil
   "Max-index of lex-analyzer.")
 
-(defvar phps-mode-lex-analyzer--use-cache-p nil
-  "Whether to use cache or not.")
-
 
 ;; FUNCTIONS
 
@@ -121,7 +118,7 @@
      (buffer-name))
     (when (and
            buffer-file-name
-           phps-mode-lex-analyzer--use-cache-p)
+           phps-mode-cache--use-p)
       (phps-mode-cache-delete buffer-file-name))))
 
 (defun phps-mode-lex-analyzer--set-region-syntax-color (start end properties)
@@ -1101,8 +1098,9 @@
 
     ;; Load cache if possible
     (when (and
+           phps-mode-cache--use-p
            filename
-           phps-mode-lex-analyzer--use-cache-p)
+           (not end))
       (setq
        cache-key
        filename)
@@ -1233,8 +1231,8 @@
 
           ;; Save cache if possible
           (when (and
-                 cache-key
-                 phps-mode-lex-analyzer--use-cache-p)
+                 phps-mode-cache--use-p
+                 cache-key)
             (phps-mode-cache-save
              data
              cache-key))