From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 20 May 2023 14:56:40 +0000 (+0300)
Subject: Fix Skeletons menu-bar menu in Python modes
X-Git-Tag: emacs-29.0.92~122
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8c56557cd9dff754b7f28f5fb919ca3b2c58ebf3;p=emacs.git

Fix Skeletons menu-bar menu in Python modes

* lisp/progmodes/python.el (python-mode, python-ts-mode): Call
'python-skeleton-add-menu-items' here, not in 'python-base-mode',
since the "Python" menu is not yet set up in the latter.
(Bug#63598)
---

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index f810f1e2164..6fc05b246a6 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -6694,8 +6694,6 @@ implementations: `python-mode' and `python-ts-mode'."
 
   (setq-local prettify-symbols-alist python-prettify-symbols-alist)
 
-  (python-skeleton-add-menu-items)
-
   (make-local-variable 'python-shell-internal-buffer)
 
   (add-hook 'flymake-diagnostic-functions #'python-flymake nil t))
@@ -6719,6 +6717,8 @@ implementations: `python-mode' and `python-ts-mode'."
 
   (add-hook 'which-func-functions #'python-info-current-defun nil t)
 
+  (python-skeleton-add-menu-items)
+
   (when python-indent-guess-indent-offset
     (python-indent-guess-indent-offset)))
 
@@ -6745,6 +6745,8 @@ implementations: `python-mode' and `python-ts-mode'."
                 #'python--treesit-defun-name)
     (treesit-major-mode-setup)
 
+    (python-skeleton-add-menu-items)
+
     (when python-indent-guess-indent-offset
       (python-indent-guess-indent-offset))