From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 25 May 2024 12:00:48 +0000 (-0400)
Subject: Merge from origin/emacs-29
X-Git-Tag: archive/raspbian/1%30.1+1-3+rpi1^2~2^2~20^2~1368
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ed7e57697572f641b50d24071867675bf89bed0f;p=emacs.git

Merge from origin/emacs-29

4f0121f8dbe Avoid assertion violations in displaying under 'outline-m...
1bf65836622 Improve documentation of 'no-special-glyphs' frame parameter
3647645e948 Fix Python font lock of chained assignment statement
3291dea441f Fix example in Calc manual
350ae75f5c1 Avoid crashes on MS-Windows due to invalid UNC file names
ccf8dba44a3 ; * lisp/face-remap.el (text-scale-adjust): Doc fix.
5ab144c77cd ; Improve documentation of backing up files
---

ed7e57697572f641b50d24071867675bf89bed0f
diff --cc test/lisp/progmodes/python-tests.el
index b19c5c31f16,06943e22f5b..de6a4316758
--- a/test/lisp/progmodes/python-tests.el
+++ b/test/lisp/progmodes/python-tests.el
@@@ -491,39 -474,16 +491,49 @@@ def f(x: CustomInt) -> CustomInt
       (136 . font-lock-operator-face) (137)
       (144 . font-lock-keyword-face) (150))))
  
 +(ert-deftest python-font-lock-assignment-statement-19 ()
 +  (python-tests-assert-faces
 +   "a: List[List[CustomInt], List[CustomInt]] = []"
 +   '((1 . font-lock-variable-name-face) (2)
 +     (4 . font-lock-type-face) (8)
 +     (9 . font-lock-type-face) (13)
 +     (14 . font-lock-type-face) (23)
 +     (26 . font-lock-type-face) (30)
 +     (31 . font-lock-type-face) (40)
 +     (43 . font-lock-operator-face) (44))))
 +
+ (ert-deftest python-font-lock-assignment-statement-20 ()
+   (python-tests-assert-faces
+    "a = b = c = 1"
+    '((1 . font-lock-variable-name-face) (2)
+      (3 . font-lock-operator-face) (4)
+      (5 . font-lock-variable-name-face) (6)
+      (7 . font-lock-operator-face) (8)
+      (9 . font-lock-variable-name-face) (10)
+      (11 . font-lock-operator-face) (12))))
+ 
 +(ert-deftest python-font-lock-operator-1 ()
 +  (python-tests-assert-faces
 +   "1 << 2 ** 3 == +4%-5|~6&7^8%9"
 +   '((1)
 +     (3 . font-lock-operator-face) (5)
 +     (8 . font-lock-operator-face) (10)
 +     (13 . font-lock-operator-face) (15)
 +     (16 . font-lock-operator-face) (17)
 +     (18 . font-lock-operator-face) (20)
 +     (21 . font-lock-operator-face) (23)
 +     (24 . font-lock-operator-face) (25)
 +     (26 . font-lock-operator-face) (27)
 +     (28 . font-lock-operator-face) (29))))
 +
 +(ert-deftest python-font-lock-operator-2 ()
 +  "Keyword operators are font-locked as keywords."
 +  (python-tests-assert-faces
 +   "is_ is None"
 +   '((1)
 +     (5 . font-lock-keyword-face) (7)
 +     (8 . font-lock-constant-face))))
 +
  (ert-deftest python-font-lock-escape-sequence-string-newline ()
    (python-tests-assert-faces
     "'\\n'