[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/web-mode 325e1c9398 4/4: fix asp commenting
|
From: |
ELPA Syncer |
|
Subject: |
[nongnu] elpa/web-mode 325e1c9398 4/4: fix asp commenting |
|
Date: |
Tue, 5 Sep 2023 13:00:35 -0400 (EDT) |
branch: elpa/web-mode
commit 325e1c9398fe727ace3605a989f8c4088dc477a4
Author: fxbois <fxbois@gmail.com>
Commit: fxbois <fxbois@gmail.com>
fix asp commenting
#1279
---
issues/1279.asp | 20 ++++++++++++++++++++
web-mode.el | 14 +++++++-------
2 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/issues/1279.asp b/issues/1279.asp
new file mode 100644
index 0000000000..0b514b93b7
--- /dev/null
+++ b/issues/1279.asp
@@ -0,0 +1,20 @@
+<%
+set objBrowserCapabilities = Server.CreateObject("MSWC.BrowserType")
+bCookiesSupported = objBrowserCapabilities.cookies
+session("sGotoPage") = ""
+' vsdf
+'if bDebug then
+' response.write bCookiesSupported
+' response.write Session.SessionID
+' response.end
+'end if
+%>
+<% '^^^ End Startup Code %>
+
+<html>
+ <body>
+ <div>
+ Test
+ </div>
+ </body>
+</html>
diff --git a/web-mode.el b/web-mode.el
index 6f18d2d63b..90a990cb71 100644
--- a/web-mode.el
+++ b/web-mode.el
@@ -2,7 +2,7 @@
;; Copyright 2011-2023 François-Xavier Bois
-;; Version: 17.3.11
+;; Version: 17.3.12
;; Author: François-Xavier Bois
;; Maintainer: François-Xavier Bois <fxbois@gmail.com>
;; Package-Requires: ((emacs "23.1"))
@@ -23,7 +23,7 @@
;;---- CONSTS
------------------------------------------------------------------
-(defconst web-mode-version "17.3.11"
+(defconst web-mode-version "17.3.12"
"Web Mode version.")
;;---- GROUPS
------------------------------------------------------------------
@@ -1390,7 +1390,7 @@ For example,
(list
'("antlers" . "\"\\|'")
'("artanis" . "\"\\|#|\\|;")
- '("asp" . "//\\|/\\*\\|\"\\|''")
+ '("asp" . "//\\|/\\*\\|\"\\|'")
'("ejs" . "//\\|/\\*\\|\"\\|'")
'("erb" . "\"\\|'\\|#\\|<<[-]?['\"]?\\([[:alnum:]_]+\\)['\"]?")
'("lsp" . "\"\\|#|\\|;")
@@ -4605,7 +4605,7 @@ Also return non-nil if it is the command
`self-insert-command' is remapped to."
((and (string= web-mode-engine "asp")
(string= sub2 "<%"))
- (setq regexp "//\\|/\\*\\|\"\\|''")
+ (setq regexp "//\\|/\\*\\|\"\\|'")
) ;asp
((string= web-mode-engine "aspx")
@@ -4756,7 +4756,7 @@ Also return non-nil if it is the command
`self-insert-command' is remapped to."
char (aref match 0))
(cond
- ((and (string= web-mode-engine "asp") (string= match "''"))
+ ((and (string= web-mode-engine "asp") (string= match "'"))
(goto-char token-end))
((and (string= web-mode-engine "razor") (eq char ?\'))
@@ -9869,7 +9869,7 @@ Also return non-nil if it is the command
`self-insert-command' is remapped to."
(setq prev-indentation (cdr h))
;;(message "line=%S" line)
(cond
- ((string-match-p "''" line)
+ ((string-match-p "'" line)
(setq out prev-indentation))
;;
----------------------------------------------------------------------
;; unindent
@@ -11432,7 +11432,7 @@ Prompt user if TAG-NAME isn't provided."
(setq content (replace-regexp-in-string "^[ ]*" "#" sel)))
((member language '("asp"))
- (setq content (replace-regexp-in-string "^[ ]*" "''" sel)))
+ (setq content (replace-regexp-in-string "^[ ]*" "'" sel)))
(t
(setq content (concat "/* " sel " */")))