diff options
| author | Philip Kaludercic | 2024-11-08 11:36:49 -0500 |
|---|---|---|
| committer | Philip Kaludercic | 2024-11-08 11:36:49 -0500 |
| commit | 8fa657f064cf605b19e6d11e083df152ca3e21d3 (patch) | |
| tree | 6e7d41223c5d3262d905ae2fdd3057dd17fa5ef9 /lisp/progmodes/python.el | |
| parent | e9f8dbf19439425568198deb44e48bff150212a4 (diff) | |
| parent | 551d1a2cd73bb3df2cad0f1f5b5d1628bb138483 (diff) | |
| download | emacs-8fa657f064cf605b19e6d11e083df152ca3e21d3.tar.gz emacs-8fa657f064cf605b19e6d11e083df152ca3e21d3.zip | |
Merge branch 'master' into feature/package-autosuggest
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 283a545bfb4..2438029bfdd 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -718,10 +718,11 @@ class declarations.") | |||
| 718 | "aiter" "anext" "ascii" "breakpoint" "bytearray" "bytes" "exec" | 718 | "aiter" "anext" "ascii" "breakpoint" "bytearray" "bytes" "exec" |
| 719 | ;; Special attributes: | 719 | ;; Special attributes: |
| 720 | ;; https://docs.python.org/3/reference/datamodel.html | 720 | ;; https://docs.python.org/3/reference/datamodel.html |
| 721 | "__annotations__" "__closure__" "__code__" | 721 | "__annotations__" "__bases__" "__closure__" "__code__" |
| 722 | "__defaults__" "__dict__" "__doc__" "__globals__" | 722 | "__defaults__" "__dict__" "__doc__" "__firstlineno__" |
| 723 | "__kwdefaults__" "__name__" "__module__" "__package__" | 723 | "__globals__" "__kwdefaults__" "__name__" "__module__" |
| 724 | "__qualname__" | 724 | "__mro__" "__package__" "__qualname__" |
| 725 | "__static_attributes__" "__type_params__" | ||
| 725 | ;; Extras: | 726 | ;; Extras: |
| 726 | "__all__") | 727 | "__all__") |
| 727 | symbol-end) . font-lock-builtin-face)) | 728 | symbol-end) . font-lock-builtin-face)) |
| @@ -1034,10 +1035,12 @@ It makes underscores and dots word constituent chars.") | |||
| 1034 | ">>" ">>=" "|" "|=" "~" "@" "@=")) | 1035 | ">>" ">>=" "|" "|=" "~" "@" "@=")) |
| 1035 | 1036 | ||
| 1036 | (defvar python--treesit-special-attributes | 1037 | (defvar python--treesit-special-attributes |
| 1037 | '("__annotations__" "__closure__" "__code__" | 1038 | '("__annotations__" "__bases__" "__closure__" "__code__" |
| 1038 | "__defaults__" "__dict__" "__doc__" "__globals__" | 1039 | "__defaults__" "__dict__" "__doc__" "__firstlineno__" |
| 1039 | "__kwdefaults__" "__name__" "__module__" "__package__" | 1040 | "__globals__" "__kwdefaults__" "__name__" "__module__" |
| 1040 | "__qualname__" "__all__")) | 1041 | "__mro__" "__package__" "__qualname__" |
| 1042 | "__static_attributes__" "__type_params__" | ||
| 1043 | "__all__")) | ||
| 1041 | 1044 | ||
| 1042 | (defvar python--treesit-exceptions | 1045 | (defvar python--treesit-exceptions |
| 1043 | '(;; Python 2 and 3: | 1046 | '(;; Python 2 and 3: |