daniel/emacs
1
2
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

update packages

Browse Source
This commit is contained in:
Daniel Weschke
2022-01-04 21:35:17 +01:00
parent 1d5275c946
commit 8de00e5202
700 changed files with 42441 additions and 85378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lisp/web-mode.el
View File

@@ -4,8 +4,8 @@
;; Copyright 2011-2021 François-Xavier Bois
;; Version: 17.0.4
;; Package-Version: 20201227.1048
;; Package-Commit: a3ce21f795e03c7a5489a24b2b3c4fce2d7a2f59
;; Package-Version: 20220104.1504
;; Package-Commit: 4f1c96381a96000358b6621782d79c79b05ca5da
;; Author: François-Xavier Bois <fxbois AT Google Mail Service>
;; Maintainer: François-Xavier Bois
;; Package-Requires: ((emacs "23.1"))
@@ -13,7 +13,7 @@
;; Repository: http://github.com/fxbois/web-mode
;; Created: July 2011
;; Keywords: languages
;; License: GNU General Public License >= 2
;; License: GNU General Public License >= 3
;; Distribution: This file is not part of Emacs
;;; Commentary:
@@ -972,7 +972,7 @@ Must be used in conjunction with web-mode-enable-block-face."
("ctemplate" . "\\.\\(chtml\\|mustache\\)\\'")
("django" . "\\.\\(djhtml\\|tmpl\\|dtl\\|liquid\\|j2\\|njk\\)\\'")
("dust" . "\\.dust\\'")
("elixir" . "\\.l?eex\\'")
("elixir" . "\\.[hl]?eex\\'")
("ejs" . "\\.ejs\\'")
("erb" . "\\.\\(erb\\|rhtml\\|erb\\.html\\)\\'")
("expressionengine" . "\\.ee\\'")
@@ -1423,7 +1423,7 @@ shouldn't be moved back.)")
(regexp-opt
(append
(cdr (assoc "elixir" web-mode-extra-keywords))
'("do" "end" "case" "bc" "lc" "for" "if" "cond" "with" "unless" "try" "receive" "fn" "defmodule" "defprotocol" "defimpl" "defrecord" "defrecordp" "defstruct" "defdelegate" "defcallback" "defexception" "defoverridable" "defguard" "defgaurdp" "exit" "after" "rescue" "catch" "else" "raise" "throw" "quote" "unquote" "super" "when" "and" "or" "not" "in"))))
'("after" "and" "bc" "case" "catch" "cond" "defcallback" "defdelegate" "defexception" "defgaurdp" "defguard" "defimpl" "defmodule" "defoverridable" "defprotocol" "defrecord" "defrecordp" "defstruct" "do" "else" "end" "exit" "fn" "for" "form_for" "if" "in" "lc" "not" "or" "quote" "raise" "receive" "rescue" "super" "throw" "try" "unless" "unquote" "when" "with"))))
(defvar web-mode-elixir-constants
@@ -2352,7 +2352,7 @@ shouldn't be moved back.)")
(defvar web-mode-php-font-lock-keywords
(list
(cons (concat "\\_<\\(" web-mode-php-keywords "\\)\\_>") '(0 'web-mode-keyword-face))
(cons (concat "(\\_<\\(" web-mode-php-types "\\)\\_>") '(1 'web-mode-type-face))
(cons (concat "\\_<\\(" web-mode-php-types "\\)\\_>") '(1 'web-mode-type-face))
(cons (concat "\\_<\\(" web-mode-php-constants "\\)\\_>") '(0 'web-mode-constant-face))
'("function[ ]+\\([[:alnum:]_]+\\)" 1 'web-mode-function-name-face)
'("\\_<\\([[:alnum:]_]+\\)[ ]?(" 1 'web-mode-function-call-face)
@@ -5518,7 +5518,7 @@ Also return non-nil if it is the command `self-insert-command' is remapped to."
val-beg nil)
)
((and (= state 6) (member char '(?\s ?\n ?\/)))
((and (= state 6) (member char '(?\s ?\n))) ;#1150
(setq attrs (+ attrs (web-mode-attr-scan state char name-beg name-end val-beg attr-flags equal-offset)))
(setq state 1
attr-flags 0
@@ -5635,9 +5635,17 @@ Also return non-nil if it is the command `self-insert-command' is remapped to."
(if (null val-beg)
(setq val-end name-end)
(setq val-end (point))
(when (or (null char) (member char '(?\s ?\n ?\> ?\/)))
(setq val-end (1- val-end))
(cond
((null char)
(setq val-end (1- val-end)))
((member char '(?\s ?\n ?\/))
(setq val-end (1- val-end)))
((eq char ?\>)
(if (logior flags 8)
(setq val-end (- val-end 2))
(setq val-end (- val-end 1)))
)
)
) ;if
(put-text-property name-beg (1+ name-beg) 'tag-attr-beg flags)
(put-text-property name-beg (1+ val-end) 'tag-attr t)
@@ -8752,6 +8760,8 @@ Also return non-nil if it is the command `self-insert-command' is remapped to."
(string-match-p "^[&|?:+-]" curr-line))
(not (and (string= language "php")
(string-match-p "^->" curr-line)))
(not (and (string= language "php")
(string-match-p "^?[a-zA-z]*" curr-line)))
(not (and (string= language "php")
(string-match-p "\\(else[ ]?:\\|if[ ]?([^)]*)[ ]?:\\)" prev-line)))
(not (string-match-p "^\\(++\\|--\\)" curr-line))