emacs, branch comment-cache Emacs is the extensible, customizable, self-documenting real-time display editor. Merge branch 'master' into comment-cache 2017-02-12T10:59:03+00:00 Alan Mackenzie 2017-02-12T10:59:03+00:00 f4d5b687150810129b7a1d5b006e31ccf82b691b 






Merge branch 'master' into comment-cache
2017-02-05T16:28:53+00:00

Alan Mackenzie

2017-02-05T16:28:53+00:00

d5514332d4a6092673ce1f78fadcae0c57f7be64












typo fix
2017-02-04T20:22:39+00:00

Tom Tromey

2017-02-04T20:22:39+00:00

148100d98319499f0ac6f57b8be08cbd14884a5c

(css--colon-inside-selector-p): Fix typo in docstring.





(css--colon-inside-selector-p): Fix typo in docstring.







Set comment-multi-line in js-mode
2017-02-04T20:00:59+00:00

Tom Tromey

2017-01-18T04:50:14+00:00

394fc3fd030b8fa2f9b97c2ef3fa3b16e6f29474

Bug#6806:
* lisp/progmodes/js.el (js-mode): Set comment-multi-line to t.
* test/lisp/progmodes/js-tests.el (js-mode-auto-fill): New test.





Bug#6806:
* lisp/progmodes/js.el (js-mode): Set comment-multi-line to t.
* test/lisp/progmodes/js-tests.el (js-mode-auto-fill): New test.







* test/manual/indent/scss-mode.scss: Fix indentation
2017-02-04T19:40:13+00:00

Simen Heggestøyl

2017-02-04T19:33:58+00:00

caf31fb5f53aef47bea1cd2e741f5d9c254c1a81












Fix indentation of multiline CSS property values
2017-02-04T19:19:54+00:00

Simen Heggestøyl

2017-02-02T19:05:32+00:00

f6ff7bb1fcd062fe4ebf6c89890524110501583e

* lisp/textmodes/css-mode.el (css-smie-grammar): Give colons belonging
to properties higher precedence.
(css--colon-inside-selector-p, css--colon-inside-funcall): New
functions for helping SMIE during tokenization.
(css-smie--forward-token, css-smie--backward-token): Distinguish
colons belonging to properties from other colons.

* test/manual/indent/css-mode.css: Add tests for the changes above.

* test/manual/indent/scss-mode.scss: Ditto.





* lisp/textmodes/css-mode.el (css-smie-grammar): Give colons belonging
to properties higher precedence.
(css--colon-inside-selector-p, css--colon-inside-funcall): New
functions for helping SMIE during tokenization.
(css-smie--forward-token, css-smie--backward-token): Distinguish
colons belonging to properties from other colons.

* test/manual/indent/css-mode.css: Add tests for the changes above.

* test/manual/indent/scss-mode.scss: Ditto.







Add tests for lisp/kmacro.el
2017-02-04T11:55:47+00:00

Gemini Lasswell

2017-02-04T11:55:47+00:00

ff4dd0d39c3f5dfb8f4988f840c2c05621db32db

* test/lisp/kmacro-tests.el: New file.  (Bug#24939)





* test/lisp/kmacro-tests.el: New file.  (Bug#24939)







Fix autorevert-tests on MS-Windows
2017-02-04T11:49:55+00:00

Eli Zaretskii

2017-02-04T11:49:55+00:00

c8f91b168b0955e1e21acbf291171af1f70725ec

* test/lisp/autorevert-tests.el
(auto-revert-test02-auto-revert-deleted-file): Don't check that
auto-revert-use-notify was reset to nil on w32.





* test/lisp/autorevert-tests.el
(auto-revert-test02-auto-revert-deleted-file): Don't check that
auto-revert-use-notify was reset to nil on w32.







New macro 'ert-with-message-capture'
2017-02-04T11:36:43+00:00

Gemini Lasswell

2017-02-04T11:36:43+00:00

ef3d8d6f7226e570209e913d2754e828d0cb121c

* lisp/emacs-lisp/ert-x.el (ert-with-message-capture): New macro.
(Bug#25158)

* test/lisp/autorevert-tests.el (auto-revert--wait-for-revert)
(auto-revert-test00-auto-revert-mode)
(auto-revert-test01-auto-revert-several-files)
(auto-revert-test02-auto-revert-deleted-file)
(auto-revert-test03-auto-revert-tail-mode)
(auto-revert-test04-auto-revert-mode-dired):
* test/lisp/filenotify-tests.el (file-notify-test03-autorevert): Use
ert-with-message-capture.





* lisp/emacs-lisp/ert-x.el (ert-with-message-capture): New macro.
(Bug#25158)

* test/lisp/autorevert-tests.el (auto-revert--wait-for-revert)
(auto-revert-test00-auto-revert-mode)
(auto-revert-test01-auto-revert-several-files)
(auto-revert-test02-auto-revert-deleted-file)
(auto-revert-test03-auto-revert-tail-mode)
(auto-revert-test04-auto-revert-mode-dired):
* test/lisp/filenotify-tests.el (file-notify-test03-autorevert): Use
ert-with-message-capture.







Avoid invalid read syntax errors due to 'ert-with-test-buffer'
2017-02-04T11:18:29+00:00

Gemini Lasswell

2017-02-04T11:18:29+00:00

8ba27b7ce2f4a98e3c14fe752042c60fd7576fef

* lisp/emacs-lisp/ert-x.el (ert-with-test-buffer): Fix the
'declare' form.  (Bug#24722)





* lisp/emacs-lisp/ert-x.el (ert-with-test-buffer): Fix the
'declare' form.  (Bug#24722)