diff options
| author | Eli Zaretskii | 2024-08-31 08:14:13 -0400 |
|---|---|---|
| committer | Eli Zaretskii | 2024-08-31 08:14:13 -0400 |
| commit | d1f896b5f8918ecd29a7e8e7a835ffefb655ddb5 (patch) | |
| tree | f4b2b4761623cba15beea66428881cf45f2a2f4c /lisp/progmodes/python.el | |
| parent | fa00e4a10c82b87143a21d494cdc5cfee94d2d1a (diff) | |
| parent | 4b60267d832e0de209dd7a7665f7ed165091bd7d (diff) | |
| download | emacs-d1f896b5f8918ecd29a7e8e7a835ffefb655ddb5.tar.gz emacs-d1f896b5f8918ecd29a7e8e7a835ffefb655ddb5.zip | |
Merge from origin/emacs-30
4b60267d832 Make Python skeletons available in 'python-ts-mode' as well
62dcbfb776f Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/...
1baa62b2ac1 ; * etc/NEWS: Fix typos.
dfcfaa0ef58 More accurate documentation of 'equal' in ELisp Reference
baaf97ce1a1 ; Fix some ungrammatical uses of "allows to"
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index a00289d6de9..fb4b9afc073 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -5390,8 +5390,8 @@ be added to `python-mode-skeleton-abbrev-table'." | |||
| 5390 | (format "Insert %s statement." name)) | 5390 | (format "Insert %s statement." name)) |
| 5391 | ,@skel)))) | 5391 | ,@skel)))) |
| 5392 | 5392 | ||
| 5393 | (define-abbrev-table 'python-mode-abbrev-table () | 5393 | (define-abbrev-table 'python-base-mode-abbrev-table () |
| 5394 | "Abbrev table for Python mode." | 5394 | "Abbrev table for Python modes." |
| 5395 | :parents (list python-mode-skeleton-abbrev-table)) | 5395 | :parents (list python-mode-skeleton-abbrev-table)) |
| 5396 | 5396 | ||
| 5397 | (defmacro python-define-auxiliary-skeleton (name &optional doc &rest skel) | 5397 | (defmacro python-define-auxiliary-skeleton (name &optional doc &rest skel) |