From: Glenn Morris <rgm@gnu.org>
Date: Mon, 15 Jan 2018 21:53:40 +0000 (-0800)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~5874
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9bd8f01cd6613795e6a7bb228b1aff342cc88c8b;p=emacs.git

Merge from origin/emacs-26

2c0cfa6455 * ChangeLog.3: Update
4387bb44ae Update authors
bce51bd6f7 * lisp/gnus/message.el (message-do-auto-fill): Prevent do-...
bd2a2a1e84 Improve documentation of etags
7ba75b9637 Teach etags new interpreters for some languages
1f7f03742d * lisp/emacs-lisp/generator.el (iter-defun): Add 'doc-stri...
dbb4aac212 * lisp/emacs-lisp/syntax.el (syntax-propertize): Fix bug#2...
80463a43da Improve documentation of fill-separate-heterogeneous-words...
4bd2416d55 Fix documentation of some x-* functions
9c2b11484f Inherit query-on-exit flag to stderr process (Bug#30031)
3efb1e7def Fix Bug#30057
a9b884c60f Tag some unstable tests, and skip by default (bug#24503)

# Conflicts:
#	test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
---

9bd8f01cd6613795e6a7bb228b1aff342cc88c8b
diff --cc test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
index 4657321506b,5ba094c0072..69dc16443f9
--- a/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
+++ b/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
@@@ -898,22 -892,10 +898,23 @@@ Subclasses to override slot attributes.
  (defmethod constructor :static ((_x eieio--testing) newname &rest _args)
    (list newname 2))
  
 +(defun eieio-test-dump-trace ()
 +  (message "%s" (with-current-buffer "*trace-output*"
 +                  (goto-char (point-min))
 +                  (while (re-search-forward "[\0-\010\013-\037]" nil t)
 +                    (insert (prog1 (format "\\%03o" (char-before))
 +                              (delete-char -1))))
 +                  (buffer-string))))
 +(eieio-test-dump-trace)
 +
  (ert-deftest eieio-test-37-obsolete-name-in-constructor ()
-   ;; FIXME repeated intermittent failures on hydra (bug#24503)
+   ;; FIXME repeated intermittent failures on hydra and elsewhere (bug#24503).
+   :tags '(:unstable)
 -  (should (equal (eieio--testing "toto") '("toto" 2))))
 +  (with-current-buffer "*trace-output*"
 +    (erase-buffer))
 +  (unwind-protect
 +      (should (equal (eieio--testing "toto") '("toto" 2)))
 +    (eieio-test-dump-trace)))
  
  (ert-deftest eieio-autoload ()
    "Tests to see whether reftex-auc has been autoloaded"