mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

(python-eldoc-function): Re-enable quit while waiting for process.

Browse source
This commit is contained in:
Stefan Monnier 2006-08-30 21:10:10 +00:00
parent 762ce89d58
commit 132579d3e8
2 changed files with 27 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2006-08-30 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/python.el (python-eldoc-function): Re-enable quit while
waiting for process.
2006-08-30 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* term/mac-win.el (mac-string-to-utxt): If adjustment for MacJapanese
@ -5,8 +10,8 @@
2006-08-29 Romain Francoise <romain@orebokech.com>
* startup.el (normal-splash-screen, fancy-splash-screens): Make
buffer read-only and arrange to enter view mode if necessary.
* startup.el (normal-splash-screen, fancy-splash-screens):
Make buffer read-only and arrange to enter view mode if necessary.
2006-08-29 Chong Yidong <cyd@stupidchicken.com>

38
lisp/progmodes/python.el
View file

@ -1599,24 +1599,26 @@ Only works when point is in a function name, not its arg list, for
instance. Assumes an inferior Python is running."
(let ((symbol (with-syntax-table python-dotty-syntax-table
(current-word))))
;; First try the symbol we're on.
(or (and symbol
(python-send-receive (format "emacs.eargs(%S, %s)"
symbol python-imports)))
;; Try moving to symbol before enclosing parens.
(let ((s (syntax-ppss)))
(unless (zerop (car s))
(when (eq ?\( (char-after (nth 1 s)))
(save-excursion
(goto-char (nth 1 s))
(skip-syntax-backward "-")
(let ((point (point)))
(skip-chars-backward "a-zA-Z._")
(if (< (point) point)
(python-send-receive
(format "emacs.eargs(%S, %s)"
(buffer-substring-no-properties (point) point)
python-imports)))))))))))
;; This is run from timers, so inhibit-quit tends to be set.
(with-local-quit
;; First try the symbol we're on.
(or (and symbol
(python-send-receive (format "emacs.eargs(%S, %s)"
symbol python-imports)))
;; Try moving to symbol before enclosing parens.
(let ((s (syntax-ppss)))
(unless (zerop (car s))
(when (eq ?\( (char-after (nth 1 s)))
(save-excursion
(goto-char (nth 1 s))
(skip-syntax-backward "-")
(let ((point (point)))
(skip-chars-backward "a-zA-Z._")
(if (< (point) point)
(python-send-receive
(format "emacs.eargs(%S, %s)"
(buffer-substring-no-properties (point) point)
python-imports))))))))))))
;;;; Info-look functionality.