commit d4d5830f8a071a3634926adeeaedaf573d49a063 (HEAD, refs/remotes/origin/master) Author: Po Lu Date: Thu Jan 18 10:32:50 2024 +0800 ; * src/androidterm.c (handle_one_android_event): Fix typo. diff --git a/src/androidterm.c b/src/androidterm.c index 2e4ee64f390..8632df1d4fc 100644 --- a/src/androidterm.c +++ b/src/androidterm.c @@ -938,9 +938,9 @@ handle_one_android_event (struct android_display_info *dpyinfo, sure it is processed before any subsequent edits. */ textconv_barrier (f, event->xkey.counter); - wchar_t copy_buffer[129]; + wchar_t copy_buffer[512]; wchar_t *copy_bufptr = copy_buffer; - int copy_bufsiz = 128 * sizeof (wchar_t); + int copy_bufsiz = 512; event->xkey.state |= android_emacs_to_android_modifiers (dpyinfo, commit 5f5faad249747ce5bd4b7f2968f737206c136265 Author: Jim Porter Date: Wed Jan 17 09:32:18 2024 -0800 ; Fix test failures from the fix for bug#67661 * test/lisp/eshell/em-cmpl-tests.el (em-cmpl-test/file-completion/non-unique): Make test more robust. diff --git a/test/lisp/eshell/em-cmpl-tests.el b/test/lisp/eshell/em-cmpl-tests.el index 13e42ffac88..f778816c4e1 100644 --- a/test/lisp/eshell/em-cmpl-tests.el +++ b/test/lisp/eshell/em-cmpl-tests.el @@ -175,18 +175,18 @@ ACTUAL and EXPECTED should both be lists of strings." (ert-with-temp-directory default-directory (write-region nil nil (expand-file-name "file.txt")) (write-region nil nil (expand-file-name "file.el")) + ;; Complete the first time. This should insert the common prefix + ;; of our completions. (should (equal (eshell-insert-and-complete "echo fi") "echo file.")) + ;; Make sure the completions buffer isn't displayed. + (should-not (get-buffer-window "*Completions*")) ;; Now try completing again. (let ((minibuffer-message-timeout 0) (inhibit-message t)) (completion-at-point)) - ;; FIXME: We can't use `current-message' here. - (with-current-buffer (messages-buffer) - (save-excursion - (goto-char (point-max)) - (forward-line -1) - (should (looking-at "Complete, but not unique"))))))) + ;; This time, we should display the completions buffer. + (should (get-buffer-window "*Completions*"))))) (ert-deftest em-cmpl-test/file-completion/glob () "Test completion of file names using a glob." commit c5031a52c5c6ad74fab27d3754700e7457717516 Author: Andrea Corallo Date: Wed Jan 17 15:28:43 2024 +0100 * Update a comp test (bug#68523) * test/src/comp-tests.el (comp-tests-ret-type-spec-71): Update a test due to new 'sxhash-equal' behaviour. diff --git a/test/src/comp-tests.el b/test/src/comp-tests.el index 0aa9e76fa2d..f479d175c43 100644 --- a/test/src/comp-tests.el +++ b/test/src/comp-tests.el @@ -1421,7 +1421,7 @@ Return a list of results." (if (= x 0.0) x (error ""))) - '(or (member -0.0 0.0) (integer 0 0))) + '(or (member 0.0 -0.0) (integer 0 0))) ;; 72 ((defun comp-tests-ret-type-spec-f (x)