From: Glenn Morris Date: Mon, 30 Mar 2020 14:50:37 +0000 (-0700) Subject: Merge from origin/emacs-27 X-Git-Tag: emacs-28.0.90~7688 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fa4eec5cfa8121837e5d5b89e623ba478f0759ad;p=emacs.git Merge from origin/emacs-27 c6e0981b96 (origin/emacs-27) * lisp/image/image-converter.el: Fix cus... 461bd9cc20 Fix url-cookie.el for lexical binding f3ccfb1926 ; * src/decompress.c: Fix comment style. 1af03e7e92 ; * src/xfaces.c (syms_of_xfaces): Fix wording and typo. 93945fcd19 ; * test/lisp/calc/calc-tests.el: Fix mistake in last commit ee47e00f4e Don't suggest setting face-remapping-alist to a literal (B... c2b8ce4439 Calc: don't treat nil as an integer (bug#40155) e1f0e08922 * lisp/files.el (directory-files-recursively): Doc fix. (... 02b3820315 Document how to disable Tramp file archives --- fa4eec5cfa8121837e5d5b89e623ba478f0759ad