commit bd0a8783a353d11467bf3f5272efd8a6de07b9e0 (HEAD, refs/remotes/origin/master) Author: Simen Heggestøyl Date: Sat Apr 25 09:10:56 2020 +0200 Use lexical-binding in po.el and add tests * lisp/textmodes/po.el: Use lexical-binding. * test/lisp/textmodes/po-tests.el: New file with tests for po.el. diff --git a/lisp/textmodes/po.el b/lisp/textmodes/po.el index d5645e8630..29c6d3f460 100644 --- a/lisp/textmodes/po.el +++ b/lisp/textmodes/po.el @@ -1,4 +1,4 @@ -;;; po.el --- basic support of PO translation files +;;; po.el --- basic support of PO translation files -*- lexical-binding:t -*- ;; Copyright (C) 1995-1998, 2000-2020 Free Software Foundation, Inc. diff --git a/test/lisp/textmodes/po-tests.el b/test/lisp/textmodes/po-tests.el new file mode 100644 index 0000000000..a098290ce1 --- /dev/null +++ b/test/lisp/textmodes/po-tests.el @@ -0,0 +1,68 @@ +;;; po-tests.el --- Tests for po.el -*- lexical-binding: t; -*- + +;; Copyright (C) 2020 Free Software Foundation, Inc. + +;; Author: Simen Heggestøyl +;; Keywords: + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Commentary: + +;; + +;;; Code: + +(require 'po) +(require 'ert) + +(defconst po-tests--buffer-string + "# Norwegian bokmål translation of the GIMP. +# Copyright (C) 1999-2001 Free Software Foundation, Inc. +# +msgid \"\" +msgstr \"\" +\"Project-Id-Version: gimp 2.8.5\\n\" +\"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gimp/issues\\n\" +\"POT-Creation-Date: 2013-05-27 14:57+0200\\n\" +\"PO-Revision-Date: 2013-05-27 15:21+0200\\n\" +\"Language: nb\\n\" +\"MIME-Version: 1.0\\n\" +\"Content-Type: text/plain; charset=UTF-8\\n\" +\"Content-Transfer-Encoding: 8bit\\n\" +\"Plural-Forms: nplurals=2; plural=(n != 1);\\n\" + +#: ../desktop/gimp.desktop.in.in.h:1 ../app/about.h:26 +msgid \"GNU Image Manipulation Program\" +msgstr \"GNU bildebehandlingsprogram\" +") + +(ert-deftest po-tests-find-charset () + (with-temp-buffer + (insert po-tests--buffer-string) + (should (equal (po-find-charset (cons nil (current-buffer))) + "UTF-8")))) + +(ert-deftest po-tests-find-file-coding-system-guts () + (with-temp-buffer + (insert po-tests--buffer-string) + (should (equal (po-find-file-coding-system-guts + 'insert-file-contents + (cons "*tmp*" (current-buffer))) + '(utf-8 . nil))))) + +(provide 'po-tests) +;;; po-tests.el ends here commit e8493e32f8f447da4196cab668ba35a879259e68 Author: Stefan Kangas Date: Sat Apr 25 07:58:26 2020 +0200 Use lexical-binding in forms.el example files * etc/forms/forms-d2.el: * etc/forms/forms-pass.el: Use lexical-binding. diff --git a/etc/forms/forms-d2.el b/etc/forms/forms-d2.el index 67cdb9cd01..1b0d6426e0 100644 --- a/etc/forms/forms-d2.el +++ b/etc/forms/forms-d2.el @@ -1,4 +1,4 @@ -;;; forms-d2.el --- demo forms-mode +;;; forms-d2.el --- demo forms-mode -*- lexical-binding:t -*- ;; Copyright (C) 1991, 1994-1997, 2001-2020 Free Software Foundation, ;; Inc. diff --git a/etc/forms/forms-pass.el b/etc/forms/forms-pass.el index 34d4548434..0f4ab48247 100644 --- a/etc/forms/forms-pass.el +++ b/etc/forms/forms-pass.el @@ -1,4 +1,4 @@ -;;; forms-pass.el --- passwd file demo for forms-mode +;;; forms-pass.el --- passwd file demo for forms-mode -*- lexical-binding:t -*- ;; This file is part of GNU Emacs. commit 89441bddea6e4f4d4fd32d8630d1e649ec12512a Author: Stefan Kangas Date: Sat Apr 25 00:39:31 2020 +0200 ; * test/lisp/international/mule-util-tests.el: Fix typos. diff --git a/test/lisp/international/mule-util-tests.el b/test/lisp/international/mule-util-tests.el index 18e63a8077..cc199bd497 100644 --- a/test/lisp/international/mule-util-tests.el +++ b/test/lisp/international/mule-util-tests.el @@ -1,4 +1,4 @@ -;;; mule-util --- tests for international/mule-util.el -*- lexical-binding:t -*- +;;; mule-util-tests.el --- tests for international/mule-util.el -*- lexical-binding:t -*- ;; Copyright (C) 2002-2020 Free Software Foundation, Inc. @@ -81,4 +81,4 @@ (dotimes (i (length mule-util-test-truncate-data)) (mule-util-test-truncate-create i)) -;;; mule-util.el ends here +;;; mule-util-tests.el ends here commit 3335dcca1f0e4eb209556ec5da3758977f2df1ac Author: Stefan Kangas Date: Fri Apr 24 20:38:47 2020 +0200 Use lexical-binding for international tests * test/lisp/international/mule-util-tests.el: * test/lisp/international/ccl-tests.el: Use lexical-binding. diff --git a/test/lisp/international/ccl-tests.el b/test/lisp/international/ccl-tests.el index 3581cd784f..283b2e1b32 100644 --- a/test/lisp/international/ccl-tests.el +++ b/test/lisp/international/ccl-tests.el @@ -1,3 +1,5 @@ +;;; ccl-tests.el --- unit tests for ccl.el -*- lexical-binding:t -*- + ;; Copyright (C) 2018-2020 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/test/lisp/international/mule-util-tests.el b/test/lisp/international/mule-util-tests.el index c571782d63..18e63a8077 100644 --- a/test/lisp/international/mule-util-tests.el +++ b/test/lisp/international/mule-util-tests.el @@ -1,4 +1,4 @@ -;;; mule-util --- tests for international/mule-util.el +;;; mule-util --- tests for international/mule-util.el -*- lexical-binding:t -*- ;; Copyright (C) 2002-2020 Free Software Foundation, Inc. commit fe15dd9deac2da6f08c274900d2da6583ad5a4ad Author: Stefan Kangas Date: Fri Apr 24 19:55:47 2020 +0200 Use lexical-binding for all net tests * test/lisp/net/dbus-tests.el: * test/lisp/net/gnutls-tests.el: * test/lisp/net/newsticker-tests.el: * test/lisp/net/puny-tests.el: * test/lisp/net/rfc2104-tests.el: Use lexical-binding. diff --git a/test/lisp/net/dbus-tests.el b/test/lisp/net/dbus-tests.el index 68f69f62b5..e263c4563f 100644 --- a/test/lisp/net/dbus-tests.el +++ b/test/lisp/net/dbus-tests.el @@ -1,4 +1,4 @@ -;;; dbus-tests.el --- Tests of D-Bus integration into Emacs +;;; dbus-tests.el --- Tests of D-Bus integration into Emacs -*- lexical-binding:t -*- ;; Copyright (C) 2013-2020 Free Software Foundation, Inc. diff --git a/test/lisp/net/gnutls-tests.el b/test/lisp/net/gnutls-tests.el index c2472d844c..07e30b6464 100644 --- a/test/lisp/net/gnutls-tests.el +++ b/test/lisp/net/gnutls-tests.el @@ -1,4 +1,4 @@ -;;; gnutls-tests.el --- Test suite for gnutls.el +;;; gnutls-tests.el --- Test suite for gnutls.el -*- lexical-binding:t -*- ;; Copyright (C) 2017-2020 Free Software Foundation, Inc. diff --git a/test/lisp/net/newsticker-tests.el b/test/lisp/net/newsticker-tests.el index 1a6e11dc51..5552fa8c1a 100644 --- a/test/lisp/net/newsticker-tests.el +++ b/test/lisp/net/newsticker-tests.el @@ -1,4 +1,4 @@ -;;; newsticker-testsuite.el --- Test suite for newsticker. +;;; newsticker-tests.el --- Test suite for newsticker. -*- lexical-binding:t -*- ;; Copyright (C) 2003-2020 Free Software Foundation, Inc. diff --git a/test/lisp/net/puny-tests.el b/test/lisp/net/puny-tests.el index 9fb2ebb546..288bc2ff6f 100644 --- a/test/lisp/net/puny-tests.el +++ b/test/lisp/net/puny-tests.el @@ -1,4 +1,4 @@ -;;; puny-tests.el --- tests for net/puny.el -*- coding: utf-8; -*- +;;; puny-tests.el --- tests for net/puny.el -*- coding: utf-8; lexical-binding:t -*- ;; Copyright (C) 2017-2020 Free Software Foundation, Inc. diff --git a/test/lisp/net/rfc2104-tests.el b/test/lisp/net/rfc2104-tests.el index 5c1f441093..9053589838 100644 --- a/test/lisp/net/rfc2104-tests.el +++ b/test/lisp/net/rfc2104-tests.el @@ -1,4 +1,4 @@ -;;; rfc2104-tests.el --- Tests of RFC2104 hashes +;;; rfc2104-tests.el --- Tests of RFC2104 hashes -*- lexical-binding:t -*- ;; Copyright (C) 2019-2020 Free Software Foundation, Inc. commit 1fab12efd4a8671cb8d3f5127c95ae37fcd6988f Author: Stefan Kangas Date: Fri Apr 24 18:49:28 2020 +0200 Use lexical-binding for textmodes tests * test/lisp/textmodes/mhtml-mode-tests.el: * test/lisp/textmodes/sgml-mode-tests.el: Use lexical-binding. diff --git a/test/lisp/textmodes/mhtml-mode-tests.el b/test/lisp/textmodes/mhtml-mode-tests.el index aa5f19efda..1840e8b401 100644 --- a/test/lisp/textmodes/mhtml-mode-tests.el +++ b/test/lisp/textmodes/mhtml-mode-tests.el @@ -1,4 +1,4 @@ -;;; mhtml-mode-tests.el --- Tests for mhtml-mode +;;; mhtml-mode-tests.el --- Tests for mhtml-mode -*- lexical-binding:t -*- ;; Copyright (C) 2017-2020 Free Software Foundation, Inc. diff --git a/test/lisp/textmodes/sgml-mode-tests.el b/test/lisp/textmodes/sgml-mode-tests.el index f0b93e24d2..a4457307b3 100644 --- a/test/lisp/textmodes/sgml-mode-tests.el +++ b/test/lisp/textmodes/sgml-mode-tests.el @@ -1,4 +1,4 @@ -;;; sgml-mode-tests.el --- Tests for sgml-mode +;;; sgml-mode-tests.el --- Tests for sgml-mode -*- lexical-binding:t -*- ;; Copyright (C) 2015-2020 Free Software Foundation, Inc. commit fe3c7158f5575340ccbde4979fbb3fe23e71e4e5 Author: Stefan Kangas Date: Fri Apr 24 18:38:11 2020 +0200 Use lexical-binding in most url tests * test/lisp/url/url-auth-tests.el: * test/lisp/url/url-expand-tests.el: * test/lisp/url/url-parse-tests.el: * test/lisp/url/url-tramp-tests.el: * test/lisp/url/url-util-tests.el: Use lexical-binding. diff --git a/test/lisp/url/url-auth-tests.el b/test/lisp/url/url-auth-tests.el index c574f3d373..d3acdef853 100644 --- a/test/lisp/url/url-auth-tests.el +++ b/test/lisp/url/url-auth-tests.el @@ -1,4 +1,4 @@ -;;; url-auth-tests.el --- Test suite for url-auth. +;;; url-auth-tests.el --- Test suite for url-auth. -*- lexical-binding:t -*- ;; Copyright (C) 2015-2020 Free Software Foundation, Inc. diff --git a/test/lisp/url/url-expand-tests.el b/test/lisp/url/url-expand-tests.el index 553bcf67bd..6e0ce86950 100644 --- a/test/lisp/url/url-expand-tests.el +++ b/test/lisp/url/url-expand-tests.el @@ -1,4 +1,4 @@ -;;; url-expand-tests.el --- Test suite for relative URI/URL resolution. +;;; url-expand-tests.el --- Test suite for relative URI/URL resolution. -*- lexical-binding:t -*- ;; Copyright (C) 2012-2020 Free Software Foundation, Inc. diff --git a/test/lisp/url/url-parse-tests.el b/test/lisp/url/url-parse-tests.el index 98e6dcb9ae..6ec46479a6 100644 --- a/test/lisp/url/url-parse-tests.el +++ b/test/lisp/url/url-parse-tests.el @@ -1,4 +1,4 @@ -;;; url-parse-tests.el --- Test suite for URI/URL parsing. +;;; url-parse-tests.el --- Test suite for URI/URL parsing. -*- lexical-binding:t -*- ;; Copyright (C) 2012-2020 Free Software Foundation, Inc. diff --git a/test/lisp/url/url-tramp-tests.el b/test/lisp/url/url-tramp-tests.el index d6f830afcf..965b9ea088 100644 --- a/test/lisp/url/url-tramp-tests.el +++ b/test/lisp/url/url-tramp-tests.el @@ -1,4 +1,4 @@ -;;; url-tramp-tests.el --- Test suite for Tramp / URL conversion. +;;; url-tramp-tests.el --- Test suite for Tramp / URL conversion. -*- lexical-binding:t -*- ;; Copyright (C) 2017-2020 Free Software Foundation, Inc. diff --git a/test/lisp/url/url-util-tests.el b/test/lisp/url/url-util-tests.el index fd3a8d6e10..0416331b03 100644 --- a/test/lisp/url/url-util-tests.el +++ b/test/lisp/url/url-util-tests.el @@ -1,4 +1,4 @@ -;;; url-util-tests.el --- Test suite for url-util. +;;; url-util-tests.el --- Test suite for url-util. -*- lexical-binding:t -*- ;; Copyright (C) 2012-2020 Free Software Foundation, Inc. commit c52f8863a536c003980c8fcc24dfb48dfb2353a8 Author: Stefan Kangas Date: Fri Apr 24 15:28:22 2020 +0200 Use lexical-binding in most src tests * test/src/charset-tests.el: * test/src/chartab-tests.el: * test/src/cmds-tests.el: * test/src/coding-tests.el (top-level) (generate-ascii-file, generate-mostly-nonascii-file): * test/src/doc-tests.el: * test/src/floatfns-tests.el: * test/src/font-tests.el: * test/src/keymap-tests.el: * test/src/process-tests.el (top-level) (process-test-sentinel-wait-function-working-p) (process-test-stderr-buffer, process-test-stderr-filter): * test/src/textprop-tests.el: * test/src/thread-tests.el: * test/src/timefns-tests.el: * test/src/undo-tests.el: * test/src/xml-tests.el: Use lexical-binding. diff --git a/test/src/charset-tests.el b/test/src/charset-tests.el index 01a68c21a5..9a1d0a46f9 100644 --- a/test/src/charset-tests.el +++ b/test/src/charset-tests.el @@ -1,4 +1,4 @@ -;;; charset-tests.el --- Tests for charset.c +;;; charset-tests.el --- Tests for charset.c -*- lexical-binding: t -*- ;; Copyright 2017-2020 Free Software Foundation, Inc. diff --git a/test/src/chartab-tests.el b/test/src/chartab-tests.el index da320e33b5..0ddea2b338 100644 --- a/test/src/chartab-tests.el +++ b/test/src/chartab-tests.el @@ -1,4 +1,4 @@ -;;; chartab-tests.el --- Tests for char-tab.c +;;; chartab-tests.el --- Tests for char-tab.c -*- lexical-binding: t -*- ;; Copyright (C) 2016-2020 Free Software Foundation, Inc. diff --git a/test/src/cmds-tests.el b/test/src/cmds-tests.el index 8604d34610..e98e578460 100644 --- a/test/src/cmds-tests.el +++ b/test/src/cmds-tests.el @@ -1,4 +1,4 @@ -;;; cmds-tests.el --- Testing some Emacs commands +;;; cmds-tests.el --- Testing some Emacs commands -*- lexical-binding: t -*- ;; Copyright (C) 2013-2020 Free Software Foundation, Inc. diff --git a/test/src/coding-tests.el b/test/src/coding-tests.el index a741e233d3..c438ae22ce 100644 --- a/test/src/coding-tests.el +++ b/test/src/coding-tests.el @@ -1,4 +1,4 @@ -;;; coding-tests.el --- tests for text encoding and decoding +;;; coding-tests.el --- tests for text encoding and decoding -*- lexical-binding: t -*- ;; Copyright (C) 2013-2020 Free Software Foundation, Inc. @@ -296,7 +296,7 @@ ;;; decoder, not for regression testing. (defun generate-ascii-file () - (dotimes (i 100000) + (dotimes (_i 100000) (insert-char ?a 80) (insert "\n"))) @@ -309,13 +309,13 @@ (insert "\n"))) (defun generate-mostly-nonascii-file () - (dotimes (i 30000) + (dotimes (_i 30000) (insert-char ?a 80) (insert "\n")) - (dotimes (i 20000) + (dotimes (_i 20000) (insert-char ?À 80) (insert "\n")) - (dotimes (i 10000) + (dotimes (_i 10000) (insert-char ?あ 80) (insert "\n"))) diff --git a/test/src/decompress-tests.el b/test/src/decompress-tests.el index 46fd26635c..0a32839681 100644 --- a/test/src/decompress-tests.el +++ b/test/src/decompress-tests.el @@ -1,4 +1,4 @@ -;;; decompress-tests.el --- Test suite for decompress. +;;; decompress-tests.el --- Test suite for decompress. -*- lexical-binding: t -*- ;; Copyright (C) 2013-2020 Free Software Foundation, Inc. diff --git a/test/src/doc-tests.el b/test/src/doc-tests.el index b6026e79c6..50cf0144b8 100644 --- a/test/src/doc-tests.el +++ b/test/src/doc-tests.el @@ -1,4 +1,4 @@ -;;; doc-tests.el --- Tests for doc.c +;;; doc-tests.el --- Tests for doc.c -*- lexical-binding: t -*- ;; Copyright (C) 2016-2020 Free Software Foundation, Inc. diff --git a/test/src/floatfns-tests.el b/test/src/floatfns-tests.el index c1c2c8996a..8c56674d4f 100644 --- a/test/src/floatfns-tests.el +++ b/test/src/floatfns-tests.el @@ -1,4 +1,4 @@ -;;; floatfns-tests.el --- tests for floating point operations +;;; floatfns-tests.el --- tests for floating point operations -*- lexical-binding: t -*- ;; Copyright 2017-2020 Free Software Foundation, Inc. diff --git a/test/src/font-tests.el b/test/src/font-tests.el index 73c2846b03..cfc6f4c31b 100644 --- a/test/src/font-tests.el +++ b/test/src/font-tests.el @@ -1,4 +1,4 @@ -;;; font-tests.el --- Test suite for font-related functions. +;;; font-tests.el --- Test suite for font-related functions. -*- lexical-binding: t -*- ;; Copyright (C) 2011-2020 Free Software Foundation, Inc. diff --git a/test/src/keymap-tests.el b/test/src/keymap-tests.el index dbf0a7d122..75f8c0f092 100644 --- a/test/src/keymap-tests.el +++ b/test/src/keymap-tests.el @@ -1,4 +1,4 @@ -;;; keymap-tests.el --- Test suite for src/keymap.c +;;; keymap-tests.el --- Test suite for src/keymap.c -*- lexical-binding: t -*- ;; Copyright (C) 2015-2020 Free Software Foundation, Inc. diff --git a/test/src/process-tests.el b/test/src/process-tests.el index 66a76fd33b..748afe41d2 100644 --- a/test/src/process-tests.el +++ b/test/src/process-tests.el @@ -1,4 +1,4 @@ -;;; process-tests.el --- Testing the process facilities +;;; process-tests.el --- Testing the process facilities -*- lexical-binding: t -*- ;; Copyright (C) 2013-2020 Free Software Foundation, Inc. @@ -33,7 +33,7 @@ (let ((proc (start-process "test" nil "bash" "-c" "exit 20")) (sentinel-called nil) (start-time (float-time))) - (set-process-sentinel proc (lambda (proc msg) + (set-process-sentinel proc (lambda (_proc _msg) (setq sentinel-called t))) (while (not (or sentinel-called (> (- (float-time) start-time) @@ -88,7 +88,7 @@ :stderr stderr-buffer)) (sentinel-called nil) (start-time (float-time))) - (set-process-sentinel proc (lambda (proc msg) + (set-process-sentinel proc (lambda (_proc _msg) (setq sentinel-called t))) (while (not (or sentinel-called (> (- (float-time) start-time) @@ -120,13 +120,13 @@ "exit 20")) :stderr stderr-proc)) (start-time (float-time))) - (set-process-filter proc (lambda (proc input) + (set-process-filter proc (lambda (_proc input) (push input stdout-output))) - (set-process-sentinel proc (lambda (proc msg) + (set-process-sentinel proc (lambda (_proc _msg) (setq sentinel-called t))) - (set-process-filter stderr-proc (lambda (proc input) + (set-process-filter stderr-proc (lambda (_proc input) (push input stderr-output))) - (set-process-sentinel stderr-proc (lambda (proc input) + (set-process-sentinel stderr-proc (lambda (_proc _input) (setq stderr-sentinel-called t))) (while (not (or sentinel-called (> (- (float-time) start-time) diff --git a/test/src/textprop-tests.el b/test/src/textprop-tests.el index 7333444df0..365d2c7a7b 100644 --- a/test/src/textprop-tests.el +++ b/test/src/textprop-tests.el @@ -1,4 +1,4 @@ -;;; textprop-tests.el --- Test suite for text properties. +;;; textprop-tests.el --- Test suite for text properties. -*- lexical-binding: t -*- ;; Copyright (C) 2015-2020 Free Software Foundation, Inc. diff --git a/test/src/thread-tests.el b/test/src/thread-tests.el index 5d85fc74e5..df34a2b66e 100644 --- a/test/src/thread-tests.el +++ b/test/src/thread-tests.el @@ -1,4 +1,4 @@ -;;; threads.el --- tests for threads. +;;; threads.el --- tests for threads. -*- lexical-binding: t -*- ;; Copyright (C) 2012-2020 Free Software Foundation, Inc. diff --git a/test/src/timefns-tests.el b/test/src/timefns-tests.el index b24d44335e..51dd1d1aeb 100644 --- a/test/src/timefns-tests.el +++ b/test/src/timefns-tests.el @@ -1,4 +1,4 @@ -;;; timefns-tests.el -- tests for timefns.c +;;; timefns-tests.el -- tests for timefns.c -*- lexical-binding: t -*- ;; Copyright (C) 2016-2020 Free Software Foundation, Inc. diff --git a/test/src/undo-tests.el b/test/src/undo-tests.el index 995e4365e1..13335a9bb1 100644 --- a/test/src/undo-tests.el +++ b/test/src/undo-tests.el @@ -1,4 +1,4 @@ -;;; undo-tests.el --- Tests of primitive-undo +;;; undo-tests.el --- Tests of primitive-undo -*- lexical-binding: t -*- ;; Copyright (C) 2012-2020 Free Software Foundation, Inc. diff --git a/test/src/xml-tests.el b/test/src/xml-tests.el index 02a52e9115..d758c8868c 100644 --- a/test/src/xml-tests.el +++ b/test/src/xml-tests.el @@ -1,4 +1,4 @@ -;;; libxml-parse-tests.el --- Test suite for libxml parsing. +;;; xml-tests.el --- Test suite for libxml parsing. -*- lexical-binding: t -*- ;; Copyright (C) 2014-2020 Free Software Foundation, Inc. commit 85fb94273375fe793ced4404ade6392e38b4c381 Author: Alan Mackenzie Date: Fri Apr 24 15:51:43 2020 +0000 Fix bug #40766, an error in edebug spec handling Also remove some debris. * lisp/emacs-lisp/edebug.el (edebug-spec): Move the entry for edebug-spec-list to before that for vector in the &or form. This assures that in a dotted list of vectors, that list gets handled correctly by edebug-spec-list rather than wrongly by (vector ...). (def-edebug-spec &key): Remove, since it is ill formed and superfluous. diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index bb7817f242..a376067443 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -1833,9 +1833,6 @@ contains a circular object." ;; This means nothing matched, so it is OK. nil) ;; So, return nothing - -(def-edebug-spec &key edebug-match-&key) - (defun edebug-match-&key (cursor specs) ;; Following specs must look like ( ) ... ;; where is the name of a keyword, and spec is its spec. @@ -2115,10 +2112,10 @@ into `edebug--cl-macrolet-defs' which is checked in `edebug-list-form-args'." (def-edebug-spec edebug-spec (&or + edebug-spec-list (vector &rest edebug-spec) ; matches a vector ("vector" &rest edebug-spec) ; matches a vector spec ("quote" symbolp) - edebug-spec-list stringp [edebug-lambda-list-keywordp &rest edebug-spec] [keywordp gate edebug-spec] commit 367b55980f9c0c927dce2ba93ab6f626cec6b1fc Author: Stefan Kangas Date: Mon Apr 20 09:27:17 2020 +0200 * etc/edt-user.el: Use lexical-binding. diff --git a/etc/edt-user.el b/etc/edt-user.el index 0ecd818ec7..2852f936f2 100644 --- a/etc/edt-user.el +++ b/etc/edt-user.el @@ -1,4 +1,4 @@ -;;; edt-user.el --- Sample user customizations for Emacs EDT emulation +;;; edt-user.el --- Sample user customizations for Emacs EDT emulation -*- lexical-binding: t -*- ;; Copyright (C) 1986, 1992-1993, 2000-2020 Free Software Foundation, ;; Inc. commit 01dd6593831e55dfdc9328e6078832da36ecc990 Author: Stefan Kangas Date: Mon Apr 20 09:24:20 2020 +0200 * lisp/kermit.el: Use lexical-binding. diff --git a/lisp/kermit.el b/lisp/kermit.el index b0a4d90932..f2607bfcf4 100644 --- a/lisp/kermit.el +++ b/lisp/kermit.el @@ -1,4 +1,4 @@ -;;; kermit.el --- additions to shell mode for use with kermit +;;; kermit.el --- additions to shell mode for use with kermit -*- lexical-binding: t -*- ;; Copyright (C) 1988, 2001-2020 Free Software Foundation, Inc. commit bef617d82fa2930e4c42277ba0dd67a8a6d87b1e Author: Michael Albinus Date: Fri Apr 24 11:25:50 2020 +0200 * test/lisp/net/tramp-tests.el (tramp-test32-shell-command-dont-erase-buffer): Tag it :unstable. diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 4966825840..d00c88a911 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -4642,7 +4642,8 @@ INPUT, if non-nil, is a string sent to the process." ;; This test is inspired by Bug#39067. (ert-deftest tramp-test32-shell-command-dont-erase-buffer () "Check `shell-command-dont-erase-buffer'." - :tags '(:expensive-test) + ;; The test fails due to recent changes in Emacs. So we mark it as unstable. + :tags '(:expensive-test :unstable) (skip-unless (tramp--test-enabled)) (skip-unless (or (tramp--test-adb-p) (tramp--test-sh-p))) ;; Prior Emacs 27, `shell-command-dont-erase-buffer' wasn't working properly.