mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 16:51:06 -07:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-26

Browse source 
b3f4a3a (origin/emacs-26) Special-case %DUMBFW for GnuTLS between 3.2...
c2ae057 Work around GnuTLS version issues with %DUMBFW (tiny change)
2f9d9ef ; Remove the mention of "plain C code" in the docstring as well
aca827b Merge branch 'widen-less' into emacs-26
87548f5 ; Rephrase NEWS entry a bit
da0d773 (emacs-26) ; * lisp/erc/erc.el: Update URL.
3a60515 * lisp/erc/erc.el (erc-shorten-server-name): Silence compiler...
471b6c1 ; Replace non-ascii quote characters in doc strings etc
7af7f5e Fix some more aliases to user options
79fb4b5 Fix some flymake aliases
b9fbc03 (origin/widen-less) Widen in indent-for-tab-command in the no...
446faf3 Replace the mention of c-indent-defun with js-indent-line
7e9eef0 Consolidate 'widen' calls

# Conflicts:
#	etc/NEWS
#	lisp/progmodes/flymake-proc.el
This commit is contained in:
Glenn Morris 2017-12-20 21:15:43 -05:00
commit b1cf262a79
21 changed files with 211 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

5
test/src/emacs-module-tests.el
View file

@ -231,10 +231,9 @@ must evaluate to a regular expression string."
(point) (point-max))))))))
(ert-deftest module--test-assertions--load-non-live-object ()
"Check that -module-assertions verify that non-live objects
aren’t accessed."
"Check that -module-assertions verify that non-live objects aren't accessed."
(skip-unless (file-executable-p mod-test-emacs))
;; This doesn’t yet cause undefined behavior.
;; This doesn't yet cause undefined behavior.
(should (eq (mod-test-invalid-store) 123))
(module--test-assertion (rx "Emacs value not found in "
(+ digit) " values of "

4
test/src/eval-tests.el
View file

@ -28,14 +28,14 @@
(require 'ert)
(ert-deftest eval-tests--bug24673 ()
"Checks that Bug#24673 has been fixed."
"Check that Bug#24673 has been fixed."
;; This should not crash.
(should-error (funcall '(closure)) :type 'invalid-function))
(defvar byte-compile-debug)
(ert-deftest eval-tests--bugs-24912-and-24913 ()
"Checks that Emacs doesn’t accept weird argument lists.
"Check that Emacs doesn't accept weird argument lists.
Bug#24912 and Bug#24913."
(dolist (args '((&optional) (&rest) (&optional &rest) (&rest &optional)
(&optional &rest a) (&optional a &rest)

2
test/src/fns-tests.el
View file

@ -548,7 +548,7 @@
(should-error (nconc (cyc2 1 2) 'tail) :type 'circular-list))
(ert-deftest plist-get/odd-number-of-elements ()
"Test that ‘plist-get’ doesn’t signal an error on degenerate plists."
"Test that `plist-get' doesn't signal an error on degenerate plists."
(should-not (plist-get '(:foo 1 :bar) :bar)))
(ert-deftest lax-plist-get/odd-number-of-elements ()

4
test/src/regex-tests.el
View file

@ -27,13 +27,13 @@
"Path to regex-resources directory next to the \"regex-tests.el\" file.")
(ert-deftest regex-word-cc-fallback-test ()
"Test that ‘[[:cc:]]*x’ matches ‘x’ (bug#24020).
"Test that \"[[:cc:]]*x\" matches \"x\" (bug#24020).
Test that a regex of the form \"[[:cc:]]*x\" where CC is
a character class which matches a multibyte character X, matches
string \"x\".
For example, ‘[[:word:]]*\u2620’ regex (note: \u2620 is a word
For example, \"[[:word:]]*\u2620\" regex (note: \u2620 is a word
character) must match a string \"\u2420\"."
(dolist (class '("[[:word:]]" "\\sw"))
(dolist (repeat '("*" "+"))