procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Backport Use derived-mode-p in python.el instead of equality test with major-mode

Browse source 
Fixes: debbugs:18854

* progmodes/python.el (python-ffap-module-path): Use
`derived-mode-p' instead of equality test on `major-mode'.
This commit is contained in:
Ivan Andrus 2014-11-01 12:33:02 -06:00
parent df33e85a80
commit 15ec2d7cff
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2014-11-14 Ivan Andrus <darthandrus@gmail.com>
* progmodes/python.el (python-ffap-module-path): Use
`derived-mode-p' instead of equality test on `major-mode'.
2014-11-13 Ulrich Müller <ulm@gentoo.org>
* version.el (emacs-repository-get-version): Call `git log'

2
lisp/progmodes/python.el
View file

@ -3281,7 +3281,7 @@ The skeleton will be bound to python-skeleton-NAME."
(defun python-ffap-module-path (module)
"Function for `ffap-alist' to return path for MODULE."
(let ((process (or
(and (eq major-mode 'inferior-python-mode)
(and (derived-mode-p 'inferior-python-mode)
(get-buffer-process (current-buffer)))
(python-shell-get-process))))
(if (not process)