Merge branch 'master' of pichove.org:emacs-config

1 files changed, 41 insertions, 6 deletions

diff --git a/.emacs.d/lisp/php-face.el b/.emacs.d/lisp/php-face.el
index 4230bae..5f40257 100644
--- a/.emacs.d/lisp/php-face.el
+++ b/.emacs.d/lisp/php-face.el
@@ -4,7 +4,7 @@
 
 ;; Author: USAMI Kenta <tadsan@zonu.me>
 ;; Created: 5 May 2019
-;; Version: 1.21.4
+;; Version: 1.22.1
 ;; Keywords: faces, php
 ;; Homepage: https://github.com/emacs-php/php-mode
 ;; Package-Requires: ((emacs "24.3"))
@@ -56,7 +56,7 @@
   :group 'php-faces
   :tag "PHP Function Name")
 
-(defface php-function-call '((t (:inherit default)))
+(defface php-function-call '((t ()))
   "PHP Mode face used to highlight function names in calles."
   :group 'php-faces
   :tag "PHP Function Call")
@@ -81,17 +81,52 @@
   :group 'php-faces
   :tag "PHP Property Name")
 
-(defface php-variable-sigil '((t (:inherit default)))
+(defface php-variable-sigil '((t ()))
   "PHP Mode face used to highlight variable sigils ($)."
   :group 'php-faces
   :tag "PHP Variable Sigil")
 
-(defface php-object-op '((t (:inherit default)))
+(defface php-operator '((t ()))
+  "PHP Mode face used to operators."
+  :group 'php-faces
+  :tag "PHP Operator")
+
+(defface php-assignment-op '((t (:inherit php-operator)))
+  "PHP Mode face used to assignment operators (=, +=, ...)."
+  :group 'php-faces
+  :tag "PHP Object Op")
+
+(defface php-comparison-op '((t (:inherit php-operator)))
+  "PHP Mode face used to comparison operators (==, !=, ===, ...)."
+  :group 'php-faces
+  :tag "PHP Comparison Op")
+
+(defface php-logical-op '((t (:inherit php-operator)))
+  "PHP Mode face used to logical operators (&&, ||, ?:)."
+  :group 'php-faces
+  :tag "PHP Logical Op")
+
+(defface php-arithmetic-op '((t (:inherit php-operator)))
+  "PHP Mode face used to arithmetic operators (+, -, %, ...)."
+  :group 'php-faces
+  :tag "PHP Arithmetic Op")
+
+(defface php-inc-dec-op '((t (:inherit php-operator)))
+  "PHP Mode face used to increment and decremt operators (--, ++)."
+  :group 'php-faces
+  :tag "PHP Increment/Decrement Op")
+
+(defface php-string-op '((t (:inherit php-operator)))
+  "PHP Mode face used to logical operators (.)."
+  :group 'php-faces
+  :tag "PHP String Op")
+
+(defface php-object-op '((t (:inherit php-operator)))
   "PHP Mode face used to object operators (->)."
   :group 'php-faces
   :tag "PHP Object Op")
 
-(defface php-paamayim-nekudotayim '((t (:inherit default)))
+(defface php-paamayim-nekudotayim '((t ()))
   "PHP Mode face used to highlight \"Paamayim Nekudotayim\" scope resolution operators (::)."
   :group 'php-faces
   :tag "PHP Paamayim Nekudotayim")
@@ -131,7 +166,7 @@
   :group 'php-faces
   :tag "PHP $this Sigil")
 
-(defface php-errorcontrol-op '((t (:inherit  font-lock-type-face)))
+(defface php-errorcontrol-op '((t (:inherit font-lock-type-face)))
   "PHP Mode face used to highlight errorcontrol operators (@).."
   :group 'php-faces
   :tag "PHP ErrorControl Op")