summaryrefslogtreecommitdiff
path: root/lisp/textmodes
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2017-11-02 21:02:12 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2017-11-02 21:02:12 -0700
commitaa7542467238b06ed056054965ba444595b85453 (patch)
tree3071c15ff777ef5727ccd254d9ddbf513a06c0cc /lisp/textmodes
parent5fcfdf433d74e8ecb35f86fdc071ce11ca0b0364 (diff)
parenta87ce5c4b41ca8146c764b1186a6162c069b1933 (diff)
downloademacs-aa7542467238b06ed056054965ba444595b85453.tar.gz
Merge from origin/emacs-26
a87ce5c4b4 * src/lisp.h (GCALIGNED): Clarify comment (Bug#29040). 8a31e9993f ; etc/NEWS: Add cpp-message-min-time-interval. (Bug#28961) ac0bb9a192 Improve the doc of eshell-cmpl-* custom variables (Bug#25069) 36400c7dc9 Fix mouse-scrollbar offset on GNUstep and old macOS (bug#2... 04bc1410c2 Merge from Gnulib 6b08ad5263 Fix alignment portability problems a9f8706fa8 Fix completion of colon after CSS property (Bug#29056) 9031dec527 ; * src/alloc.c (sweep_symbols): Fix last change. fdd3dcfa4e * src/alloc.c (sweep_symbols): Tweak last change 27964af438 In frame parameters documentation mention desktop saving/r... 1bd4e7c243 ; Fix typo in ChangeLog.3 4182a60d31 Don't have frameset save the 'client' parameter (Bug#29067) 9d31a97092 ; Spelling fixes 460a25f212 Handle generic variables in cl-defgeneric Edebug spec dc0a25c2f9 Give a more sensible message if file-attributes fails (Bug... 8453423c7c Avoid wrong value from file-attributes on Linux kernel bef... 70621e2571 Fix customization of debugger-print-function (Bug#29077) # Conflicts: # etc/NEWS
Diffstat (limited to 'lisp/textmodes')
-rw-r--r--lisp/textmodes/css-mode.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index e74efdc7a13..93ca36b08aa 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -1375,6 +1375,7 @@ tags, classes and IDs."
:exit-function
,(lambda (string status)
(and (eq status 'finished)
+ (eolp)
prop-table
(test-completion string prop-table)
(not (and sel-table