[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master f55fc92 04/12: Merge from origin/emacs-25
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master f55fc92 04/12: Merge from origin/emacs-25 |
Date: |
Tue, 09 Feb 2016 22:33:05 +0000 |
branch: master
commit f55fc92f6804b821b7df374e973b859c6364996a
Merge: 44f853c 1eaf68f
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Merge from origin/emacs-25
1eaf68f * test/automated/file-notify-tests.el
(file-notify-test06-many-events):
d333716 ; * etc/NEWS: Expand news entry for scss-mode
c32c16f ; Better document changes in ls-lisp default behavior
dc6eed2 Fix doc string of tls-program
---
etc/NEWS | 13 ++++++++++---
lisp/net/tls.el | 3 ++-
test/lisp/filenotify-tests.el | 7 +++++--
3 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/etc/NEWS b/etc/NEWS
index a49bed1..c2c5950 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -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',
diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index 30895d0..f1219fd 100644
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -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.
diff --git a/test/lisp/filenotify-tests.el b/test/lisp/filenotify-tests.el
index de64f50..629d85b 100644
--- a/test/lisp/filenotify-tests.el
+++ b/test/lisp/filenotify-tests.el
@@ -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)
- [Emacs-diffs] master updated (53f3d4a -> 8456ba1), Paul Eggert, 2016/02/09
- [Emacs-diffs] master f414fe6 01/12: ; make change-history-commit, Paul Eggert, 2016/02/09
- [Emacs-diffs] master fdc2da4 02/12: Merge from origin/emacs-25, Paul Eggert, 2016/02/09
- [Emacs-diffs] master 44f853c 03/12: ; Merge from origin/emacs-25, Paul Eggert, 2016/02/09
- [Emacs-diffs] master f55fc92 04/12: Merge from origin/emacs-25,
Paul Eggert <=
- [Emacs-diffs] master c71e7cc 05/12: ; Merge from origin/emacs-25, Paul Eggert, 2016/02/09
- [Emacs-diffs] master b3fc7a3 06/12: Merge from origin/emacs-25, Paul Eggert, 2016/02/09
- [Emacs-diffs] master a9650e9 07/12: ; Merge from origin/emacs-25, Paul Eggert, 2016/02/09
- [Emacs-diffs] master 8986f16 08/12: Merge from origin/emacs-25, Paul Eggert, 2016/02/09
- [Emacs-diffs] master 8fa67e9 09/12: ; Merge from origin/emacs-25, Paul Eggert, 2016/02/09
- [Emacs-diffs] master 05595c2 10/12: -, Paul Eggert, 2016/02/09
- [Emacs-diffs] master 0e7b901 11/12: ; Merge from origin/emacs-25, Paul Eggert, 2016/02/09
- [Emacs-diffs] master 8456ba1 12/12: -, Paul Eggert, 2016/02/09