Commit f55fc92f authored by Paul Eggert's avatar Paul Eggert
Browse files

Merge from origin/emacs-25

1eaf68f3 * test/automated/file-notify-tests.el (file-notify-test06-many-events):
d3337167 ; * etc/NEWS: Expand news entry for scss-mode
c32c16f8 ; Better document changes in ls-lisp default behavior
dc6eed25 Fix doc string of tls-program
parents 44f853c4 1eaf68f3
......@@ -1352,7 +1352,8 @@ The main entry points are `cl-defgeneric' and `cl-defmethod'. See the
node "Generic Functions" in the Emacs Lisp manual for more details.
---
** scss-mode (a minor variant of css-mode)
** scss-mode (a minor variant of css-mode) is a major mode for editing
SCSS (Sassy CSS) files.
---
** let-alist is a new macro (and a package) that allows one to easily
......@@ -1663,8 +1664,14 @@ counterparts `string-lessp' and `string-equal'.
---
*** The ls-lisp package uses `string-collate-lessp' to sort file names.
If you want the old, locale-independent sorting, customize the new
option `ls-lisp-use-string-collate' to a nil value.
The effect is that, on systems that use ls-lisp for Dired, the default
sort order of the files in Dired is now different from what it was in
previous versions of Emacs. In particular, the file names are sorted
disregarding punctuation, accents, and diacritics, and letter case is
ignored. For example, files whose name begin with a period will no
longer appear near the beginning of the directory listing. If you
want the old, locale-independent sorting, customize the new option
`ls-lisp-use-string-collate' to the nil value.
+++
*** The MS-Windows specific variable `w32-collate-ignore-punctuation',
......
......@@ -82,7 +82,8 @@ and `gnutls-cli' (version 2.0.1) output."
"openssl s_client -connect %h:%p -no_ssl2 -ign_eof")
"List of strings containing commands to start TLS stream to a host.
Each entry in the list is tried until a connection is successful.
%h is replaced with server hostname, %p with port to connect to.
%h is replaced with the server hostname, %p with the port to
connect to, and %t with a file name containing trusted certificates.
The program should read input on stdin and write output to stdout.
See `tls-checktrust' on how to check trusted root certs.
......
......@@ -596,7 +596,7 @@ longer than timeout seconds for the events to be delivered."
(should (string-match "another text" (buffer-string)))
;; Stop file notification. Autorevert shall still work via polling.
;; It doesn't work for `w32notify'.
;; It doesn't work for w32notify.
(unless (string-equal (file-notify--test-library) "w32notify")
(file-notify-rm-watch auto-revert-notify-watch-descriptor)
(file-notify--wait-for-events
......@@ -797,7 +797,10 @@ longer than timeout seconds for the events to be delivered."
file-notify--test-tmpfile
'(change) 'file-notify--test-event-handler)))
(unwind-protect
(let ((n 1000)
;; In case of w32notify, the upper limit of events to handle
;; seems to be 260. Reason unknown.
(let ((n (if (string-equal (file-notify--test-library) "w32notify")
250 1000))
source-file-list target-file-list
(default-directory file-notify--test-tmpfile))
(dotimes (i n)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment