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
2025-06-22 17:08:08 +02:00
parent 54e5633369
commit 16a0a6db93
558 changed files with 68349 additions and 26568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lisp/web-mode/web-mode.el
View File

@@ -2,7 +2,8 @@
;; Copyright 2011-2024 François-Xavier Bois
;; Version: 17.3.21
;; Package-Version: 20250619.1334
;; Package-Revision: 994cb350bcee
;; Author: François-Xavier Bois
;; Maintainer: François-Xavier Bois <fxbois@gmail.com>
;; Package-Requires: ((emacs "23.1"))
@@ -5478,7 +5479,8 @@ Also return non-nil if it is the command `self-insert-command' is remapped to."
;;(message "%S: %S (%S %S)" (point) (match-string-no-properties 0) reg-beg reg-end)
(setq flags 0
tname (downcase (match-string-no-properties 1))
tnameraw (match-string-no-properties 1)
tname (downcase tnameraw)
char (aref tname 0)
tbeg (match-beginning 0)
tend nil
@@ -5507,7 +5509,9 @@ Also return non-nil if it is the command `self-insert-command' is remapped to."
((not (member char '(?\! ?\?)))
(cond
((string-match-p "-" tname)
((or (string-match-p "-" tname)
(let ((case-fold-search nil))
(string-match-p "^/?[[:upper:]][[:lower:]]" tnameraw)))
(setq flags (logior flags 2)))
;;((string-match-p ":" tname)
;; (setq flags (logior flags 32)))
@@ -8682,7 +8686,7 @@ Also return non-nil if it is the command `self-insert-command' is remapped to."
(cond
((string= web-mode-engine "blade")
(save-excursion
(when (web-mode-rsf "{[{!]+[ ]*")
(when (web-mode-rsf "{[{!]+[ ]*\\|@props[ ]*[(]") ;; #1318
(setq reg-col (current-column))))
(setq reg-beg (+ reg-beg 2))
)
@@ -9647,7 +9651,10 @@ Also return non-nil if it is the command `self-insert-command' is remapped to."
reg-beg))))
(t
(when debug (message "I430(%S) bracket-indentation" pos))
(when debug
(message "I430(%S) bracket-indentation" pos)
;;(message "reg-col=%S curr-ind=%S lang=%S reg-beg=%S" reg-col curr-indentation language reg-beg)
)
(setq offset (car (web-mode-bracket-indentation pos
reg-col
curr-indentation