commit 61dbe6bab18a902804f5223edf8b66dacb832d03 (HEAD, refs/remotes/origin/master) Author: Glenn Morris Date: Sat Dec 15 18:17:01 2018 -0800 Expect two epg tests to fail on hydra * test/lisp/epg-tests.el (epg-decrypt-1, epg-roundtrip-1): These currently fail for unknown reasons on hydra.nixos.org. diff --git a/test/lisp/epg-tests.el b/test/lisp/epg-tests.el index 6835027368..28d71fa798 100644 --- a/test/lisp/epg-tests.el +++ b/test/lisp/epg-tests.el @@ -107,6 +107,7 @@ (delete-directory epg-tests-home-directory t))))) (ert-deftest epg-decrypt-1 () + :expected-result (if (getenv "EMACS_HYDRA_CI") :failed :passed) ; fixme (with-epg-tests (:require-passphrase t) (with-temp-file (expand-file-name "gpg.conf" epg-tests-home-directory) (insert "ignore-mdc-error")) @@ -120,6 +121,7 @@ jA0EAwMCE19JBLTvvmhgyRrGGglRbnKkK9PJG8fDwO5ccjysrR7IcdNcnA== -----END PGP MESSAGE-----"))))) (ert-deftest epg-roundtrip-1 () + :expected-result (if (getenv "EMACS_HYDRA_CI") :failed :passed) ; fixme (with-epg-tests (:require-passphrase t) (let ((cipher (epg-encrypt-string epg-tests-context "symmetric" nil))) (should (equal "symmetric" commit 3edddba62b8cbd541408a87ee20e78aa6d3708e7 Author: Glenn Morris Date: Sat Dec 15 15:23:58 2018 -0800 ; * src/macuvs.h: Regenerate with new header. diff --git a/src/macuvs.h b/src/macuvs.h index 679e8fa457..e83a372df4 100644 --- a/src/macuvs.h +++ b/src/macuvs.h @@ -1,4 +1,5 @@ -/* Automatically generated by uvs.el. */ +/* This file was automatically generated from admin/unidata/IVD_Sequences.txt + by the script admin/unidata/uvs.el */ static const unsigned char mac_uvs_table_adobe_japan1_bytes[] = { 0x00, 0x0e, 0x00, 0x01, 0x1f, 0xb2, 0x00, 0x00, commit 2e2fb82e5f187614bd6997a3ace72d07bba4f1ab Merge: 498b6cb0bf fa953b58af Author: Glenn Morris Date: Sat Dec 15 15:19:25 2018 -0800 Merge from origin/emacs-26 fa953b5 (origin/emacs-26) Fix an epg test for recent GnuPG versions (... 3015636 Document font structure layout constraints f14d574 Document font structure layout constraints f519aa1 Fix display of line numbers in empty lines beyond EOB 24b5026 Fix redisplay when a window's scroll bar or fringes are changed 5d1b158 Tiny markup fix in Elisp manual commit 498b6cb0bf882367fe73f5efee5154348c209aea Author: Glenn Morris Date: Sat Dec 15 15:08:28 2018 -0800 Ensure flymake tests use gcc rather than $CC * test/lisp/progmodes/flymake-resources/Makefile: Force use of gcc. This seems to be what the tests expect. (Bug#33735) diff --git a/test/lisp/progmodes/flymake-resources/Makefile b/test/lisp/progmodes/flymake-resources/Makefile index 494407567f..05399ba388 100644 --- a/test/lisp/progmodes/flymake-resources/Makefile +++ b/test/lisp/progmodes/flymake-resources/Makefile @@ -8,6 +8,6 @@ CC_OPTS = -Wall -Wextra ## normally use flymake, so it seems like just avoiding the issue ## in this test is fine. Set flymake-log-level to 3 to investigate. check-syntax: - GCC_COLORS= $(CC) $(CC_OPTS) ${CHK_SOURCES} || true + GCC_COLORS= gcc $(CC_OPTS) ${CHK_SOURCES} || true # eof commit aca60820e16560cc84fe9e093030262f6c4cbd59 Author: Glenn Morris Date: Sat Dec 15 15:04:24 2018 -0800 Suppress filenotify remote test failures on hydra.nixos.org * test/lisp/filenotify-tests.el (file-notify--deftest-remote): Add optional argument to pass expected-result. (file-notify-test04-autorevert-remote) (file-notify-test08-backup-remote): Expect failure on hydra (bug#33735). diff --git a/test/lisp/filenotify-tests.el b/test/lisp/filenotify-tests.el index 612ea8cd7f..26b8276b8e 100644 --- a/test/lisp/filenotify-tests.el +++ b/test/lisp/filenotify-tests.el @@ -240,12 +240,13 @@ This returns only for the local case and gfilenotify; otherwise it is nil. (gfile-monitor-name file-notify--test-desc))) (cdr (assq file-notify--test-desc file-notify--test-monitors)))))) -(defmacro file-notify--deftest-remote (test docstring) +(defmacro file-notify--deftest-remote (test docstring &optional expected) "Define ert `TEST-remote' for remote files." (declare (indent 1)) `(ert-deftest ,(intern (concat (symbol-name test) "-remote")) () ,docstring :tags '(:expensive-test) + :expected-result (or ,expected :passed) (let* ((temporary-file-directory file-notify-test-remote-temporary-file-directory) (ert-test (ert-get-test ',test))) @@ -917,7 +918,8 @@ delivered." (file-notify--test-cleanup)))) (file-notify--deftest-remote file-notify-test04-autorevert - "Check autorevert via file notification for remote files.") + "Check autorevert via file notification for remote files." + (if (getenv "EMACS_HYDRA_CI") :failed :passed)) ; fixme bug#33735 (ert-deftest file-notify-test05-file-validity () "Check `file-notify-valid-p' for files." @@ -1239,7 +1241,8 @@ delivered." (file-notify--test-cleanup))) (file-notify--deftest-remote file-notify-test08-backup - "Check that backup keeps file notification for remote files.") + "Check that backup keeps file notification for remote files." + (if (getenv "EMACS_HYDRA_CI") :failed :passed)) ; fixme bug#33735 (ert-deftest file-notify-test09-watched-file-in-watched-dir () "Watches a directory and a file in that directory separately. commit 34b4da377ae02a0c505574f5ca5f146e92cfd046 Author: Glenn Morris Date: Sat Dec 15 14:49:46 2018 -0800 Fix an eshell ls dired test for non-recent files * test/lisp/eshell/em-ls-tests.el (em-ls-test-bug27844): Work around an eshell issue with non-recent files. (Bug#33734) diff --git a/test/lisp/eshell/em-ls-tests.el b/test/lisp/eshell/em-ls-tests.el index ea9dbff48f..9691ffc897 100644 --- a/test/lisp/eshell/em-ls-tests.el +++ b/test/lisp/eshell/em-ls-tests.el @@ -93,7 +93,14 @@ (dired-toggle-marks) (should (cdr (dired-get-marked-files))) (kill-buffer buf) - (setq buf (dired (expand-file-name "lisp/subr.el" source-directory))) + ;; Eshell's default format duplicates the year for non-recent files, + ;; eg "2015-05-06 2015", which doesn't make a lot of sense, + ;; and causes this portion of the test to fail if subr.el + ;; is non-recent (eg if building from a tarfile unpacked + ;; with a fixed early timestamp for reproducibility). Bug#33734. + (let ((eshell-ls-date-format "%b %e")) + (setq buf (dired (expand-file-name "lisp/subr.el" + source-directory)))) (should (looking-at "subr\\.el"))) (customize-set-variable 'eshell-ls-use-in-dired orig) (and (buffer-live-p buf) (kill-buffer))))) commit fa953b58afd39d396dab4d76a6ff0b8ba4040eb8 (refs/remotes/origin/emacs-26) Author: Glenn Morris Date: Fri Dec 14 20:09:02 2018 -0500 Fix an epg test for recent GnuPG versions (bug#33439) * test/lisp/epg-tests.el (epg-decrypt-1): Tell recent GnuPG (e.g. 2.2.11) not to worry about missing MDC. diff --git a/test/lisp/epg-tests.el b/test/lisp/epg-tests.el index 0fe15017dd..f2cc351d70 100644 --- a/test/lisp/epg-tests.el +++ b/test/lisp/epg-tests.el @@ -87,6 +87,8 @@ (ert-deftest epg-decrypt-1 () (skip-unless (epg-tests-find-usable-gpg-configuration 'require-passphrase)) (with-epg-tests (:require-passphrase t) + (with-temp-file (expand-file-name "gpg.conf" epg-tests-home-directory) + (insert "ignore-mdc-error")) (should (equal "test" (epg-decrypt-string epg-tests-context "\ -----BEGIN PGP MESSAGE----- commit 30156364714f7b66ee82b28c9c01abebba4f49e5 Author: Robert Pluim Date: Fri Dec 14 16:07:47 2018 +0100 Document font structure layout constraints This has to be the same as in src/ftcrfont.c and src/ftfont.c * src/xftfont.c (struct xftfont_info): Document layout constraints. diff --git a/src/xftfont.c b/src/xftfont.c index 5ef90a014e..9801d75d23 100644 --- a/src/xftfont.c +++ b/src/xftfont.c @@ -42,8 +42,9 @@ along with GNU Emacs. If not, see . */ struct xftfont_info { struct font font; - /* The following five members must be here in this order to be - compatible with struct ftfont_info (in ftfont.c). */ + /* The following members up to and including 'matrix' must be here + in this order to be compatible with struct ftfont_info (in + ftfont.c). */ #ifdef HAVE_LIBOTF bool maybe_otf; /* Flag to tell if this may be OTF or not. */ OTF *otf; @@ -51,6 +52,7 @@ struct xftfont_info FT_Size ft_size; int index; FT_Matrix matrix; + Display *display; XftFont *xftfont; unsigned x_display_id; commit f14d5742db39b797f742566c4e68dffa9a62646d Author: Robert Pluim Date: Fri Dec 14 15:04:14 2018 +0100 Document font structure layout constraints The layout of the initial members of ftcrfont_info must match ftfont_info * src/ftcrfont.c (struct ftcrfont_info): Likewise. * src/ftfont.c (struct ftfont_info): Document layout constraints. diff --git a/src/ftcrfont.c b/src/ftcrfont.c index 614ef08370..d19c300c5b 100644 --- a/src/ftcrfont.c +++ b/src/ftcrfont.c @@ -35,8 +35,9 @@ along with GNU Emacs. If not, see . */ struct ftcrfont_info { struct font font; - /* The following six members must be here in this order to be - compatible with struct ftfont_info (in ftfont.c). */ + /* The following members up to and including 'matrix' must be here + in this order to be compatible with struct ftfont_info (in + ftfont.c). */ #ifdef HAVE_LIBOTF bool maybe_otf; /* Flag to tell if this may be OTF or not. */ OTF *otf; diff --git a/src/ftfont.c b/src/ftfont.c index 8f048d2983..a05aa12c2a 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -56,8 +56,9 @@ struct ftfont_info { struct font font; #ifdef HAVE_LIBOTF - /* The following four members must be here in this order to be - compatible with struct xftfont_info (in xftfont.c). */ + /* The following members up to and including 'matrix' must be here in + this order to be compatible with struct xftfont_info (in + xftfont.c). */ bool maybe_otf; /* Flag to tell if this may be OTF or not. */ OTF *otf; #endif /* HAVE_LIBOTF */ commit f519aa10b47f7c652ae9b5f021363073f5c463ff Author: Eli Zaretskii Date: Fri Dec 14 10:43:37 2018 +0200 Fix display of line numbers in empty lines beyond EOB * src/xdisp.c (maybe_produce_line_number): When the current line is at EOB, use the 'line-number-current-line' face only on that single line, but not on the rest of empty lines beyond EOB. (Bug#33732) diff --git a/src/xdisp.c b/src/xdisp.c index 808eab7e53..435ab2c029 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -21185,7 +21185,10 @@ maybe_produce_line_number (struct it *it) if (lnum_face_id != current_lnum_face_id && (EQ (Vdisplay_line_numbers, Qvisual) ? this_line == 0 - : this_line == it->pt_lnum)) + : this_line == it->pt_lnum) + /* Avoid displaying the line-number-current-line face on + empty lines beyond EOB. */ + && it->what != IT_EOB) tem_it.face_id = current_lnum_face_id; else tem_it.face_id = lnum_face_id; commit 24b5026fb6b622966fd773178608617fa2f8add2 Author: Eli Zaretskii Date: Tue Dec 11 12:32:11 2018 +0200 Fix redisplay when a window's scroll bar or fringes are changed * src/window.c (set_window_fringes, set_window_scroll_bars): Set windows_or_buffers_changed flag to cause immediate thorough redisplay of a window when scroll bars or fringes are changed. (Bug#33694) diff --git a/src/window.c b/src/window.c index 5d99098cba..6026313e5a 100644 --- a/src/window.c +++ b/src/window.c @@ -7137,6 +7137,11 @@ set_window_fringes (struct window *w, Lisp_Object left_width, w->right_fringe_width = right; w->fringes_outside_margins = outside; + /* This is needed to trigger immediate redisplay of the window + when its fringes are changed, because fringes are redrawn + only if update_window is called, so we must trigger that even + if the window's glyph matrices did not change at all. */ + windows_or_buffers_changed = 35; return w; } else @@ -7254,6 +7259,12 @@ set_window_scroll_bars (struct window *w, Lisp_Object width, wset_horizontal_scroll_bar_type (w, Qnil); #endif + /* This is needed to trigger immediate redisplay of the window when + scroll bars are changed, because scroll bars are redisplayed only + if more than a single window needs to be considered, see + redisplay_internal. */ + if (changed) + windows_or_buffers_changed = 31; return changed ? w : NULL; } commit 5d1b158feb693847015326b3eae6605c9794b47d Author: Martin Rudalics Date: Tue Dec 11 09:16:21 2018 +0100 Tiny markup fix in Elisp manual * doc/lispref/lists.texi (Building Lists): Use '@var' instead of '@code' for argument. diff --git a/doc/lispref/lists.texi b/doc/lispref/lists.texi index ce62793550..fdcfe33661 100644 --- a/doc/lispref/lists.texi +++ b/doc/lispref/lists.texi @@ -640,7 +640,7 @@ resulting list. Instead, the sequence becomes the final @sc{cdr}, like any other non-list final argument. @defun copy-tree tree &optional vecp -This function returns a copy of the tree @code{tree}. If @var{tree} is a +This function returns a copy of the tree @var{tree}. If @var{tree} is a cons cell, this makes a new cons cell with the same @sc{car} and @sc{cdr}, then recursively copies the @sc{car} and @sc{cdr} in the same way.