From: Philip K Date: Sun, 6 Sep 2020 22:17:15 +0000 (+0200) Subject: Allow CSS completion with multiple rules on one line X-Git-Tag: emacs-28.0.90~6209 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ca9c02af1944975679a46b3f2c35fec20a9479a8;p=emacs.git Allow CSS completion with multiple rules on one line * css-mode.el (css--complete-property-value): Check for semi-colon when completing property values (bug#43242). --- diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index 8c824461d22..03edd4703ea 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el @@ -1356,21 +1356,17 @@ the string PROPERTY." (defun css--complete-property-value () "Complete property value at point." - (let ((property - (save-excursion - (re-search-backward ":[^/]" (line-beginning-position) t) - (when (eq (char-after) ?:) - (let ((property-end (point))) - (skip-chars-backward "-[:alnum:]") - (let ((prop (buffer-substring (point) property-end))) - (car (member prop css-property-ids)))))))) + (let ((property (and (looking-back "\\([[:alnum:]-]+\\):[^/][^;]*" + (line-beginning-position) t) + (member (match-string-no-properties 1) + css-property-ids)))) (when property (let ((end (point))) (save-excursion (skip-chars-backward "[:graph:]") (list (point) end (append '("inherit" "initial" "unset") - (css--property-values property)))))))) + (css--property-values (car property))))))))) (defvar css--html-tags (mapcar #'car html-tag-alist) "List of HTML tags.