diff options
| author | Simen Heggestøyl | 2016-04-24 19:57:42 +0200 |
|---|---|---|
| committer | Simen Heggestøyl | 2016-04-24 19:58:36 +0200 |
| commit | e6d6a99455183bca5074b7601ad11d424da6442e (patch) | |
| tree | 37d78fa65347b299f1fad95520ae9e5959220529 /lisp | |
| parent | 12846626bfae795a173fdedf2850dfbd24065534 (diff) | |
| download | emacs-e6d6a99455183bca5074b7601ad11d424da6442e.tar.gz emacs-e6d6a99455183bca5074b7601ad11d424da6442e.zip | |
Don't let `css--property-values' return duplicates
* lisp/textmodes/css-mode.el (css--property-values): Don't return
duplicate values.
* test/lisp/textmodes/css-mode-tests.el (css-test-property-values):
Take the above into account.
(css-test-property-values-no-duplicates): Test that duplicates aren't
returned by `css--property-values'.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/textmodes/css-mode.el | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index 8a4daac353a..608462b36a6 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el | |||
| @@ -793,13 +793,14 @@ Completion candidates are looked up in `css-property-alist' by | |||
| 793 | the string PROPERTY." | 793 | the string PROPERTY." |
| 794 | (or (gethash property css--property-value-cache) | 794 | (or (gethash property css--property-value-cache) |
| 795 | (let ((values | 795 | (let ((values |
| 796 | (seq-mapcat | 796 | (seq-uniq |
| 797 | (lambda (value) | 797 | (seq-mapcat |
| 798 | (if (stringp value) | 798 | (lambda (value) |
| 799 | (list value) | 799 | (if (stringp value) |
| 800 | (or (css--value-class-lookup value) | 800 | (list value) |
| 801 | (css--property-values (symbol-name value))))) | 801 | (or (css--value-class-lookup value) |
| 802 | (cdr (assoc property css-property-alist))))) | 802 | (css--property-values (symbol-name value))))) |
| 803 | (cdr (assoc property css-property-alist)))))) | ||
| 803 | (puthash property values css--property-value-cache)))) | 804 | (puthash property values css--property-value-cache)))) |
| 804 | 805 | ||
| 805 | (defun css--complete-property-value () | 806 | (defun css--complete-property-value () |