From: Glenn Morris <rgm@gnu.org>
Date: Fri, 9 Feb 2018 19:12:48 +0000 (-0800)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~5712
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=875cb835f00260d58c536b3a3f7c0343fd5f28dc;p=emacs.git

Merge from origin/emacs-26

0276743 (origin/emacs-26) Doc string fix in latin-alt.el
c9269af Minor improvements in package.texi
898a3e4 Minor improvement in Emacs user manual
8f7d718 * doc/lispref/anti.texi (Antinews): Replace 25.2 with 25.3.
989d0af Improve documentation of mini-window resizing
923e415 More changes in the Emacs manual
565adf2 Clarify that text-quoting-style doesn't affect *Info* (Bug#24...
2dd273b Mention that shell quoting of % on w32 may fail (Bug#19350)
19fa6d5 Fix --no-build-details for w32 and macOS
979944c * doc/lispref/anti.texi (Antinews): Add some more antinews.
c2727e3 Fix crashes when run with --no-build-details
dc08490 More changes for the manual
04c5bd5 Doc fixes for process functions (Bug#30349)
e209034 Fix shr and CSS 4 color maps
5fe8192 Yet another round of improvements in the manual

Conflicts:
	doc/emacs/files.texi
	test/lisp/subr-tests.el
---

875cb835f00260d58c536b3a3f7c0343fd5f28dc
diff --cc test/lisp/subr-tests.el
index d0b3127f71b,430d719037f..52b61d9fb97
--- a/test/lisp/subr-tests.el
+++ b/test/lisp/subr-tests.el
@@@ -306,24 -307,22 +306,41 @@@ cf. Bug#25477.
    (should (eq (string-to-char (symbol-name (gensym))) ?g))
    (should (eq (string-to-char (symbol-name (gensym "X"))) ?X)))
  
 +(ert-deftest subr-tests--assq-delete-all ()
 +  "Test `assq-delete-all' behavior."
 +  (cl-flet ((new-list-fn
 +             ()
 +             (list (cons 'a 1) (cons 'b 2) (cons 'c 3) 'd (cons "foo" "bar"))))
 +    (should (equal (cdr (new-list-fn)) (assq-delete-all 'a (new-list-fn))))
 +    (should (equal (new-list-fn) (assq-delete-all 'd (new-list-fn))))
 +    (should (equal (new-list-fn) (assq-delete-all "foo" (new-list-fn))))))
 +
 +(ert-deftest subr-tests--assoc-delete-all ()
 +  "Test `assoc-delete-all' behavior."
 +  (cl-flet ((new-list-fn
 +             ()
 +             (list (cons 'a 1) (cons 'b 2) (cons 'c 3) 'd (cons "foo" "bar"))))
 +    (should (equal (cdr (new-list-fn)) (assoc-delete-all 'a (new-list-fn))))
 +    (should (equal (new-list-fn) (assoc-delete-all 'd (new-list-fn))))
 +    (should (equal (butlast (new-list-fn))
 +                   (assoc-delete-all "foo" (new-list-fn))))))
 +
+ (ert-deftest shell-quote-argument-%-on-w32 ()
+   "Quoting of `%' in w32 shells isn't perfect.
+ See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=19350."
+   :expected-result :failed
+   (skip-unless (and (fboundp 'w32-shell-dos-semantics)
+                     (w32-shell-dos-semantics)))
+   (let ((process-environment (append '("ca^=with-caret"
+                                        "ca=without-caret")
+                                      process-environment)))
+     ;; It actually results in
+     ;;    without-caret with-caret
+     (should (equal (shell-command-to-string
+                     (format "echo %s %s"
+                             "%ca%"
+                             (shell-quote-argument "%ca%")))
+                    "without-caret %ca%"))))
+ 
  (provide 'subr-tests)
  ;;; subr-tests.el ends here