Merge from origin/emacs-31

7a17f97baa7 Prettify special glyphs
f13287fde0d Revert "sh-script: Mark + and * as punctuation rather tha...
70b79b3ed8d Rename `icalendar-recur' type and related functions
3d2bb233f27 ; Minor Tramp changes
f6281d757d3 ; * etc/NEWS: Tell how to disable 'markdown-ts-mode'.
142b1e0d4c3 Fix Lisp injection via X-Draft-From in Gnus
d6f7b2d99bd Save/restore old_buffer slot via window configurations (B...
e0fbecaf658 Adapt ert-remote-temporary-file-directory settings
3de7f0ce5e5 Fix warning message in 'markdown-ts-mode--initialize'
7df8604ea63 ; Improve documentation of lazy-highlight in search and r...
2936b36164d Fix "assertion 'GTK_IS_WINDOW (window)' failed"
98348a0bdc9 [Xt] Fix child frame resizing glitch
13b29eebc16 Eglot: use standard face for completion annotations (bug#...

# Conflicts:
#	etc/NEWS

4 files changed, 35 insertions, 37 deletions

diff --git a/test/lisp/calendar/diary-icalendar-tests.el b/test/lisp/calendar/diary-icalendar-tests.el
index 22faeb7aa23..06272a39cf4 100644
--- a/test/lisp/calendar/diary-icalendar-tests.el
+++ b/test/lisp/calendar/diary-icalendar-tests.el
@@ -817,8 +817,8 @@ SOURCE, if given, should be a symbol; it is used to name the test."
    (should (equal (ical:date-time-to-date dtstart)
                   (calendar-nth-named-day 1 4 1 di:recurring-start-year)))
    (should (= 16 (decoded-time-hour dtstart)))
-   (should (eq (ical:recur-freq rrule) 'WEEKLY))
-   (should (equal (ical:recur-by* 'BYDAY rrule) (list 4)))))
+   (should (eq (ical:rrule-freq rrule) 'WEEKLY))
+   (should (equal (ical:rrule-by* 'BYDAY rrule) (list 4)))))
 
 (dit:parse-test
  ;; Multiline entry, parsed as one event:
@@ -961,10 +961,10 @@ SOURCE, if given, should be a symbol; it is used to name the test."
  :tests
  (ical:with-component (car parsed)
      ((ical:dtstart :value dtstart)
-      (ical:rrule :value recur-value)
+      (ical:rrule :value rrule)
       (ical:summary :value summary))
    (should (equal dtstart '(5 28 1995)))
-   (should (eq (ical:recur-freq recur-value) 'YEARLY))
+   (should (eq (ical:rrule-freq rrule) 'YEARLY))
    (should (equal summary "H's birthday"))))
 
 (dit:parse-test
@@ -977,11 +977,11 @@ SOURCE, if given, should be a symbol; it is used to name the test."
  :tests
  (ical:with-component (car parsed)
      ((ical:dtstart :value dtstart)
-      (ical:rrule :value recur-value)
+      (ical:rrule :value rrule)
       (ical:summary :value summary))
    (should (equal dtstart '(6 24 2012)))
-   (should (equal (ical:recur-freq recur-value) 'DAILY))
-   (should (equal (ical:recur-until recur-value) '(7 10 2012)))
+   (should (equal (ical:rrule-freq rrule) 'DAILY))
+   (should (equal (ical:rrule-until rrule) '(7 10 2012)))
    (should (equal summary "Vacation"))))
 
 (dit:parse-test
@@ -994,11 +994,11 @@ SOURCE, if given, should be a symbol; it is used to name the test."
  :tests
  (ical:with-component (car parsed)
      ((ical:dtstart :value dtstart)
-      (ical:rrule :value recur-value)
+      (ical:rrule :value rrule)
       (ical:summary :value summary))
    (should (equal dtstart '(3 1 2012)))
-   (should (eq (ical:recur-freq recur-value) 'DAILY))
-   (should (eq (ical:recur-interval-size recur-value) 50))
+   (should (eq (ical:rrule-freq rrule) 'DAILY))
+   (should (eq (ical:rrule-interval-size rrule) 50))
    (should (equal summary "Renew medication"))))
 
 (dit:parse-test
@@ -1011,13 +1011,13 @@ SOURCE, if given, should be a symbol; it is used to name the test."
  :tests
  (ical:with-component (car parsed)
      ((ical:dtstart :value dtstart)
-      (ical:rrule :value recur-value)
+      (ical:rrule :value rrule)
       (ical:summary :value summary))
    (should (equal dtstart
                   (calendar-nth-named-day 4 4 11 di:recurring-start-year)))
-   (should (eq (ical:recur-freq recur-value) 'MONTHLY))
-   (should (equal (ical:recur-by* 'BYMONTH recur-value) (list 11)))
-   (should (equal (ical:recur-by* 'BYDAY recur-value) (list '(4 . 4))))
+   (should (eq (ical:rrule-freq rrule) 'MONTHLY))
+   (should (equal (ical:rrule-by* 'BYMONTH rrule) (list 11)))
+   (should (equal (ical:rrule-by* 'BYDAY rrule) (list '(4 . 4))))
    (should (equal summary "American Thanksgiving"))))
 
 (dit:parse-test
@@ -1030,13 +1030,13 @@ SOURCE, if given, should be a symbol; it is used to name the test."
  :tests
  (ical:with-component (car parsed)
      ((ical:dtstart :value dtstart)
-      (ical:rrule :value recur-value)
+      (ical:rrule :value rrule)
       (ical:summary :value summary))
    (should (equal dtstart
                   (calendar-nth-named-day 4 5 1 di:recurring-start-year)))
-   (should (eq (ical:recur-freq recur-value) 'MONTHLY))
+   (should (eq (ical:rrule-freq rrule) 'MONTHLY))
    ;; day 3 is Wednesday, so offset of 2 means Friday (=5):
-   (should (equal (ical:recur-by* 'BYDAY recur-value) (list '(5 . 4))))
+   (should (equal (ical:rrule-by* 'BYDAY rrule) (list '(5 . 4))))
    (should (equal summary "Monthly committee meeting"))))
 
 (dit:parse-test
@@ -1052,11 +1052,11 @@ SOURCE, if given, should be a symbol; it is used to name the test."
  :tests
  (ical:with-component (car parsed)
      ((ical:dtstart :value dtstart)
-      (ical:rrule :value recur-value)
+      (ical:rrule :value rrule)
       (ical:exdate :values exdates)
       (ical:summary :value summary))
    (should (equal dtstart '(11 11 2024)))
-   (should (eq (ical:recur-freq recur-value) 'WEEKLY))
+   (should (eq (ical:rrule-freq rrule) 'WEEKLY))
    (should (equal exdates '((12 23 2024) (12 30 2024))))
    (should (equal summary "Reading group"))))
 
@@ -1070,12 +1070,12 @@ SOURCE, if given, should be a symbol; it is used to name the test."
  :tests
  (ical:with-component (car parsed)
      ((ical:dtstart :value dtstart)
-      (ical:rrule :value recur-value)
+      (ical:rrule :value rrule)
       (ical:summary :value summary))
    (should (equal dtstart (list 10 22 di:recurring-start-year)))
-   (should (eq (ical:recur-freq recur-value) 'YEARLY))
-   (should (equal (ical:recur-by* 'BYMONTH recur-value) (list 10 11 12)))
-   (should (equal (ical:recur-by* 'BYMONTHDAY recur-value) (list 22)))
+   (should (eq (ical:rrule-freq rrule) 'YEARLY))
+   (should (equal (ical:rrule-by* 'BYMONTH rrule) (list 10 11 12)))
+   (should (equal (ical:rrule-by* 'BYMONTHDAY rrule) (list 22)))
    (should (equal summary "Rake leaves"))))
 
 (dit:parse-test
diff --git a/test/lisp/calendar/icalendar-parser-tests.el b/test/lisp/calendar/icalendar-parser-tests.el
index f3c5de35c87..8215f977e26 100644
--- a/test/lisp/calendar/icalendar-parser-tests.el
+++ b/test/lisp/calendar/icalendar-parser-tests.el
@@ -388,21 +388,21 @@ test."
 
 (ipt:parse/print-test
 "FREQ=MONTHLY;BYDAY=MO,TU,WE,TH,FR;BYSETPOS=-1"
-:type icalendar-recur
+:type icalendar-rrule-value
 :parser icalendar-parse-value-node
 :printer icalendar-print-value-node
 :source rfc5545-sec3.3.10/1)
 
 (ipt:parse/print-test
 "FREQ=YEARLY;INTERVAL=2;BYMONTH=1;BYDAY=SU;BYHOUR=8,9;BYMINUTE=30"
-:type icalendar-recur
+:type icalendar-rrule-value
 :parser icalendar-parse-value-node
 :printer icalendar-print-value-node
 :source rfc5545-sec3.3.10/2)
 
 (ipt:parse/print-test
 "FREQ=DAILY;COUNT=10;INTERVAL=2"
-:type icalendar-recur
+:type icalendar-rrule-value
 :parser icalendar-parse-value-node
 :printer icalendar-print-value-node
 :source rfc5545-sec3.3.10/3)
diff --git a/test/lisp/calendar/icalendar-recur-tests.el b/test/lisp/calendar/icalendar-recur-tests.el
index c1f7bb90974..199d6c4aa25 100644
--- a/test/lisp/calendar/icalendar-recur-tests.el
+++ b/test/lisp/calendar/icalendar-recur-tests.el
@@ -1383,7 +1383,7 @@ END:VTIMEZONE
          (ts-obs/onset (icr:tz-observance-on ts ict:tz-eastern)))
     (should (eq 'ical:daylight (ical:ast-node-type obs)))
     (should (equal dt onset))
-    (should (equal end (ical:recur-until
+    (should (equal end (ical:rrule-until
                         (ical:with-property-of obs 'ical:rrule nil value))))
     (should (equal obs/onset ts-obs/onset)))
 
@@ -1534,10 +1534,10 @@ SOURCE should be a symbol; it is used to name the test."
      ,(format "Parse and evaluate recur-value example from `%s':\n%s"
               source doc)
      :tags ,tags
-     (let* ((parsed (ical:parse-from-string 'ical:recur ,recur-string))
+     (let* ((parsed (ical:parse-from-string 'ical:rrule-value ,recur-string))
             (recvalue (ical:ast-node-value parsed))
-            (until (ical:recur-until recvalue))
-            (count (ical:recur-count recvalue))
+            (until (ical:rrule-until recvalue))
+            (count (ical:rrule-count recvalue))
             (dtstart ,dtstart)
             (tzid
              (when (cl-typep dtstart 'ical:date-time)
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index c0ad7205c5d..4d11faf64de 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -117,9 +117,10 @@
        (t (add-to-list
            'tramp-methods
            `("mock"
-	     (tramp-login-program	,tramp-default-remote-shell)
+	     (tramp-login-program	,tramp-encoding-shell)
 	     (tramp-login-args		(("-i")))
              (tramp-direct-async	("-c"))
+             (tramp-tmpdir		,temporary-file-directory)
 	     (tramp-remote-shell	,tramp-default-remote-shell)
 	     (tramp-remote-shell-args	("-c"))
 	     (tramp-connection-timeout	10)))
@@ -225,7 +226,8 @@
       auto-revert-use-notify t
       ert-batch-backtrace-right-margin nil
       ert-remote-temporary-file-directory
-      (expand-file-name ert-remote-temporary-file-directory)
+      (let ((tramp-show-ad-hoc-proxies t) (non-essential t))
+	(expand-file-name ert-remote-temporary-file-directory))
       password-cache-expiry nil
       remote-file-name-inhibit-cache nil
       tramp-allow-unsafe-temporary-files t
@@ -6855,8 +6857,7 @@ INPUT, if non-nil, is a string sent to the process."
   "Check loooong `tramp-remote-path'."
   :tags '(:expensive-test)
   (skip-unless (tramp--test-enabled))
-  (skip-unless (tramp--test-sh-p))
-  (skip-unless (not (tramp--test-crypt-p)))
+  (skip-unless (tramp--test-supports-environment-variables-p))
 
   (let* ((tmp-name1 (tramp--test-make-temp-name))
 	 (default-directory ert-remote-temporary-file-directory)
@@ -9330,9 +9331,6 @@ If INTERACTIVE is non-nil, the tests are run interactively."
 
 ;; Use `skip-when' starting with Emacs 30.1.
 
-;; Starting with Emacs 29, use `ert-with-temp-file' and
-;; `ert-with-temp-directory'.
-
 (provide 'tramp-tests)
 
 ;;; tramp-tests.el ends here