aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes/python.el
diff options
context:
space:
mode:
authorFabián Ezequiel Gallina2012-05-17 00:03:00 -0300
committerFabián Ezequiel Gallina2012-05-17 00:03:00 -0300
commit2947016aa73340d27552601deb112a78d61993d4 (patch)
treed848104b086391194fed07ac62e4d5f21bebcb09 /lisp/progmodes/python.el
parent046428d32838bd413a44d221d929627949fb949a (diff)
downloademacs-2947016aa73340d27552601deb112a78d61993d4.tar.gz
emacs-2947016aa73340d27552601deb112a78d61993d4.zip
Small changes to ffap support
Diffstat (limited to 'lisp/progmodes/python.el')
-rw-r--r--lisp/progmodes/python.el8
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 83d58360551..6284e64be8e 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -66,6 +66,10 @@
66;; the shell completion in background so you should run 66;; the shell completion in background so you should run
67;; `python-shell-send-buffer' from time to time to get better results. 67;; `python-shell-send-buffer' from time to time to get better results.
68 68
69;; FFAP: You can find the filename for a given module when using ffap
70;; out of the box. This feature needs an inferior python shell
71;; running.
72
69;; Eldoc: returns documentation for object at point by using the 73;; Eldoc: returns documentation for object at point by using the
70;; inferior python subprocess to inspect its documentation. As you 74;; inferior python subprocess to inspect its documentation. As you
71;; might guessed you should run `python-shell-send-buffer' from time 75;; might guessed you should run `python-shell-send-buffer' from time
@@ -1472,9 +1476,7 @@ It is specially designed to be added to the
1472 (python-shell-send-and-clear-output 1476 (python-shell-send-and-clear-output
1473 (format python-ffap-string-code module) process))) 1477 (format python-ffap-string-code module) process)))
1474 (when module-file 1478 (when module-file
1475 (ffap-locate-file 1479 (substring-no-properties module-file 1 -1))))))
1476 (substring-no-properties module-file 1 -1)
1477 nil nil))))))
1478 1480
1479(eval-after-load "ffap" 1481(eval-after-load "ffap"
1480 '(progn 1482 '(progn