summaryrefslogtreecommitdiff
path: root/.emacs.d/lisp/php-mode.el
diff options
context:
space:
mode:
authorSimeon Simeonov2017-08-01 12:02:49 +0200
committerSimeon Simeonov2017-08-01 12:02:49 +0200
commit05b4f4ce4d6d2d655ed94c9de91cb530372eec0c (patch)
tree1f03656620515fee58ba0320d62f3689eaa41dba /.emacs.d/lisp/php-mode.el
parentd3897e6921d636fca903af39cc1516fe97aa8560 (diff)
Upgrade php-mode.el yaml-mode.el yasnippet.el
Diffstat (limited to '.emacs.d/lisp/php-mode.el')
-rw-r--r--.emacs.d/lisp/php-mode.el22
1 files changed, 11 insertions, 11 deletions
diff --git a/.emacs.d/lisp/php-mode.el b/.emacs.d/lisp/php-mode.el
index b586891..c666cc5 100644
--- a/.emacs.d/lisp/php-mode.el
+++ b/.emacs.d/lisp/php-mode.el
@@ -53,7 +53,7 @@
53 53
54;;; Commentary: 54;;; Commentary:
55 55
56;; PHP mode is a major mode for editing PHP source code. It's an 56;; PHP Mode is a major mode for editing PHP source code. It's an
57;; extension of C mode; thus it inherits all C mode's navigation 57;; extension of C mode; thus it inherits all C mode's navigation
58;; functionality. But it colors according to the PHP grammar and 58;; functionality. But it colors according to the PHP grammar and
59;; indents according to the PEAR coding guidelines. It also includes 59;; indents according to the PEAR coding guidelines. It also includes
@@ -376,9 +376,9 @@ This variable can take one of the following symbol values:
376 (php-enable-psr2-coding-style))))) 376 (php-enable-psr2-coding-style)))))
377 377
378(defun php-mode-version () 378(defun php-mode-version ()
379 "Display string describing the version of PHP mode." 379 "Display string describing the version of PHP Mode."
380 (interactive) 380 (interactive)
381 (message "PHP mode %s of %s" 381 (message "PHP Mode %s of %s"
382 php-mode-version-number php-mode-modified)) 382 php-mode-version-number php-mode-modified))
383 383
384(defvar php-mode-map 384(defvar php-mode-map
@@ -393,7 +393,7 @@ This variable can take one of the following symbol values:
393 ;; (define-key map [menu-bar php search-documentation] 393 ;; (define-key map [menu-bar php search-documentation]
394 ;; '("Search documentation" . php-search-documentation)) 394 ;; '("Search documentation" . php-search-documentation))
395 395
396 ;; By default PHP mode binds C-M-h to c-mark-function, which it 396 ;; By default PHP Mode binds C-M-h to c-mark-function, which it
397 ;; inherits from cc-mode. But there are situations where 397 ;; inherits from cc-mode. But there are situations where
398 ;; c-mark-function fails to properly mark a function. For 398 ;; c-mark-function fails to properly mark a function. For
399 ;; example, if we use c-mark-function within a method definition 399 ;; example, if we use c-mark-function within a method definition
@@ -1039,7 +1039,7 @@ PHP heredoc."
1039 "PHP Mode face used to highlight variable names." 1039 "PHP Mode face used to highlight variable names."
1040 :group 'php-faces) 1040 :group 'php-faces)
1041 1041
1042(defface php-property-name '((t (:inherit php-variable-name-face))) 1042(defface php-property-name '((t (:inherit php-variable-name)))
1043 "PHP Mode face used to highlight property names." 1043 "PHP Mode face used to highlight property names."
1044 :group 'php-faces) 1044 :group 'php-faces)
1045 1045
@@ -1506,10 +1506,10 @@ a completion list."
1506 php-phpdoc-font-lock-doc-comments))))) 1506 php-phpdoc-font-lock-doc-comments)))))
1507 1507
1508(defconst php-font-lock-keywords-1 (c-lang-const c-matchers-1 php) 1508(defconst php-font-lock-keywords-1 (c-lang-const c-matchers-1 php)
1509 "Basic highlighting for PHP mode.") 1509 "Basic highlighting for PHP Mode.")
1510 1510
1511(defconst php-font-lock-keywords-2 (c-lang-const c-matchers-2 php) 1511(defconst php-font-lock-keywords-2 (c-lang-const c-matchers-2 php)
1512 "Medium level highlighting for PHP mode.") 1512 "Medium level highlighting for PHP Mode.")
1513 1513
1514(defconst php-font-lock-keywords-3 1514(defconst php-font-lock-keywords-3
1515 (append 1515 (append
@@ -1600,10 +1600,10 @@ a completion list."
1600 ;; Note that starting a file with <% breaks indentation, a 1600 ;; Note that starting a file with <% breaks indentation, a
1601 ;; limitation we can/should live with. 1601 ;; limitation we can/should live with.
1602 (,(regexp-opt '("?>" "<?" "<%" "%>")) 0 'php-php-tag))) 1602 (,(regexp-opt '("?>" "<?" "<%" "%>")) 0 'php-php-tag)))
1603 "Detailed highlighting for PHP mode.") 1603 "Detailed highlighting for PHP Mode.")
1604 1604
1605(defvar php-font-lock-keywords php-font-lock-keywords-3 1605(defvar php-font-lock-keywords php-font-lock-keywords-3
1606 "Default expressions to highlight in PHP mode.") 1606 "Default expressions to highlight in PHP Mode.")
1607 1607
1608;;; Provide support for Flymake so that users can see warnings and 1608;;; Provide support for Flymake so that users can see warnings and
1609;;; errors in real-time as they write code. 1609;;; errors in real-time as they write code.
@@ -1664,7 +1664,7 @@ The output will appear in the buffer *PHP*."
1664;;; Correct the behavior of `delete-indentation' by modifying the 1664;;; Correct the behavior of `delete-indentation' by modifying the
1665;;; logic of `fixup-whitespace'. 1665;;; logic of `fixup-whitespace'.
1666(defadvice fixup-whitespace (after php-mode-fixup-whitespace) 1666(defadvice fixup-whitespace (after php-mode-fixup-whitespace)
1667 "Remove whitespace before certain characters in PHP mode." 1667 "Remove whitespace before certain characters in PHP Mode."
1668 (let* ((no-behind-space ";\\|,\\|->\\|::") 1668 (let* ((no-behind-space ";\\|,\\|->\\|::")
1669 (no-front-space "->\\|::")) 1669 (no-front-space "->\\|::"))
1670 (when (and (eq major-mode 'php-mode) 1670 (when (and (eq major-mode 'php-mode)
@@ -1723,7 +1723,7 @@ The output will appear in the buffer *PHP*."
1723 1723
1724;;;###autoload 1724;;;###autoload
1725(defun php-current-namespace () 1725(defun php-current-namespace ()
1726 "Insert current namespace if cursor in in namespace context." 1726 "Insert current namespace if cursor in namespace context."
1727 (interactive) 1727 (interactive)
1728 (let ((matched (php-get-current-element php--re-namespace-pattern))) 1728 (let ((matched (php-get-current-element php--re-namespace-pattern)))
1729 (when matched 1729 (when matched