From 991f8ff925f51fd5598db72885f8cca1a1a79bed Mon Sep 17 00:00:00 2001
From: Simeon Simeonov
Date: Thu, 16 Jun 2016 09:07:53 +0200
Subject: Upgrade all modes, include snippets/html-mode, snippets/nxml-mode and
 snippets/prog-mode

---
 .emacs.d/lisp/php-mode.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to '.emacs.d/lisp/php-mode.el')

diff --git a/.emacs.d/lisp/php-mode.el b/.emacs.d/lisp/php-mode.el
index a7c1985..9aae782 100644
--- a/.emacs.d/lisp/php-mode.el
+++ b/.emacs.d/lisp/php-mode.el
@@ -1061,7 +1061,8 @@ PHP heredoc."
        php-beginning-of-defun-regexp)
 
   (when (>= emacs-major-version 25)
-    (php-syntax-propertize-function (point-min) (point-max))))
+    (with-silent-modifications
+      (php-syntax-propertize-function (point-min) (point-max)))))
 
 
 ;; Define function name completion function
@@ -1328,7 +1329,7 @@ a completion list."
      ("->\\(\\sw+\\)\\s-*(" 1 'default)
 
      ;; Highlight special variables
-     ("\\$\\(this\\|that\\)" 1 font-lock-constant-face)
+     ("\\$\\(this\\|that\\)\\_>" 1 font-lock-constant-face)
      ("\\(\\$\\|->\\)\\([a-zA-Z0-9_]+\\)" 2 font-lock-variable-name-face)
 
      ;; Highlight function/method names
-- 
cgit v1.3