mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-01 09:51:22 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-29

Browse source 
f8d9e40d2c Attempt to fix redisplay problems on macOS
4daa6f7049 ; * lisp/simple.el (async-shell-command): Add commentary ...
dc1a437d46 Clarify misleading comment in isearch.el
af3b0dc53f Improve documentation of package-menu commands
d879847cd4 Fix M-x completion-predicate under python-ts-mode
1e57b2b4c7 * Account for `byte-compile-warnings' during native compi...
b5bfd808c6 Avoid duplicate VC packages in 'package-selected-packages'
c18f9f155f * lisp/tab-bar.el (tab-bar-new-tab-to): Set 'window-side'...
33485fe8f7 ; Better warning message when loading tree-sitter fails
95a724abaa Update to Org 9.6.6
c665ca79ff ; * admin/make-tarball.txt: Minor copyedits.
3aef46e466 Merge branch 'emacs-29' of git.sv.gnu.org:/srv/git/emacs ...
229af8e4b3 ; * lisp/progmodes/csharp-mode.el (csharp-ts-mode--defun-...
This commit is contained in:
Eli Zaretskii 2023-05-18 07:49:49 -04:00
commit f518543aa4
15 changed files with 156 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/progmodes/python.el
View file

@ -5032,7 +5032,7 @@ the if condition."
(defun python--completion-predicate (_ buffer)
(provided-mode-derived-p
(buffer-local-value 'major-mode buffer)
'python-mode))
'python-base-mode))
(defmacro python-skeleton-define (name doc &rest skel)
"Define a `python-mode' skeleton using NAME DOC and SKEL.
@ -6856,7 +6856,7 @@ implementations: `python-mode' and `python-ts-mode'."
(defun python-shell--completion-predicate (_ buffer)
(provided-mode-derived-p
(buffer-local-value 'major-mode buffer)
'python-mode 'inferior-python-mode))
'python-base-mode 'inferior-python-mode))
;; Commands that only make sense in the Python shell or when editing
;; Python code.