aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/textmodes
diff options
context:
space:
mode:
authorJohn Wiegley2016-01-18 22:56:33 -0800
committerJohn Wiegley2016-01-18 22:56:33 -0800
commit6acd2aa02c6f0eb9d3fadce0bb48183837beafd8 (patch)
treed236a14dc554951c3e7c5a5b38a3bd98edc1315a /lisp/textmodes
parent564c84f4b12482aefe86539d2471607565c3ee7c (diff)
parent549a765efeca2748e68a5c6ce6c9238784e82535 (diff)
downloademacs-6acd2aa02c6f0eb9d3fadce0bb48183837beafd8.tar.gz
emacs-6acd2aa02c6f0eb9d3fadce0bb48183837beafd8.zip
-
Diffstat (limited to 'lisp/textmodes')
-rw-r--r--lisp/textmodes/css-mode.el10
-rw-r--r--lisp/textmodes/tildify.el2
2 files changed, 6 insertions, 6 deletions
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 48c24844a68..d402fb19955 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -257,13 +257,13 @@
257 (if (not sassy) 257 (if (not sassy)
258 ;; We don't allow / as first char, so as not to 258 ;; We don't allow / as first char, so as not to
259 ;; take a comment as the beginning of a selector. 259 ;; take a comment as the beginning of a selector.
260 "[^@/:{} \t\n][^:{}]+" 260 "[^@/:{}() \t\n][^:{}()]+"
261 ;; Same as for non-sassy except we do want to allow { and } 261 ;; Same as for non-sassy except we do want to allow { and }
262 ;; chars in selectors in the case of #{$foo} 262 ;; chars in selectors in the case of #{$foo}
263 ;; variable interpolation! 263 ;; variable interpolation!
264 (concat "\\(?:" scss--hash-re 264 (concat "\\(?:" scss--hash-re
265 "\\|[^@/:{} \t\n#]\\)" 265 "\\|[^@/:{}() \t\n#]\\)"
266 "[^:{}#]*\\(?:" scss--hash-re "[^:{}#]*\\)*")) 266 "[^:{}()#]*\\(?:" scss--hash-re "[^:{}()#]*\\)*"))
267 ;; Even though pseudo-elements should be prefixed by ::, a 267 ;; Even though pseudo-elements should be prefixed by ::, a
268 ;; single colon is accepted for backward compatibility. 268 ;; single colon is accepted for backward compatibility.
269 "\\(?:\\(:" (regexp-opt (append css-pseudo-class-ids 269 "\\(?:\\(:" (regexp-opt (append css-pseudo-class-ids
@@ -271,8 +271,8 @@
271 "\\|\\::" (regexp-opt css-pseudo-element-ids t) "\\)" 271 "\\|\\::" (regexp-opt css-pseudo-element-ids t) "\\)"
272 "\\(?:([^)]+)\\)?" 272 "\\(?:([^)]+)\\)?"
273 (if (not sassy) 273 (if (not sassy)
274 "[^:{}\n]*" 274 "[^:{}()\n]*"
275 (concat "[^:{}\n#]*\\(?:" scss--hash-re "[^:{}\n#]*\\)*")) 275 (concat "[^:{}()\n#]*\\(?:" scss--hash-re "[^:{}()\n#]*\\)*"))
276 "\\)*" 276 "\\)*"
277 "\\)\\(?:\n[ \t]*\\)*{") 277 "\\)\\(?:\n[ \t]*\\)*{")
278 (1 'css-selector keep)) 278 (1 'css-selector keep))
diff --git a/lisp/textmodes/tildify.el b/lisp/textmodes/tildify.el
index eb799c09510..598060e9ec8 100644
--- a/lisp/textmodes/tildify.el
+++ b/lisp/textmodes/tildify.el
@@ -417,7 +417,7 @@ current `case-fold-search' setting."
417 "A list of predicate functions for `tildify-space' function." 417 "A list of predicate functions for `tildify-space' function."
418 :version "25.1" 418 :version "25.1"
419 :group 'tildify 419 :group 'tildify
420 :type '(repeat 'function)) 420 :type '(repeat function))
421 421
422(defcustom tildify-double-space-undos t 422(defcustom tildify-double-space-undos t
423 "Weather `tildify-space' should undo hard space when space is typed again." 423 "Weather `tildify-space' should undo hard space when space is typed again."