diff options
| author | Miles Bader | 2005-09-25 22:07:01 +0000 |
|---|---|---|
| committer | Miles Bader | 2005-09-25 22:07:01 +0000 |
| commit | 7b9dc9afcc06c9d5c3e3f75f3bb420d57cd1de12 (patch) | |
| tree | 27ba66e7b5ca9a56ca0c0a76169249ee48337e6c /lisp/progmodes/python.el | |
| parent | 2f022b888f8e37778c13736539bd4434cc882eb2 (diff) | |
| parent | 5fae1caef32374fffc256f7f92952398d226fff2 (diff) | |
| download | emacs-7b9dc9afcc06c9d5c3e3f75f3bb420d57cd1de12.tar.gz emacs-7b9dc9afcc06c9d5c3e3f75f3bb420d57cd1de12.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-85
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 556-561)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 122-124)
- Update from CVS: lisp/mm-url.el (mm-url-decode-entities): Fix regexp.
- Update from CVS
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 433476f7957..f7788404350 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -1341,9 +1341,9 @@ don't support `help'." | |||
| 1341 | nil nil symbol)))) | 1341 | nil nil symbol)))) |
| 1342 | (if (equal symbol "") (error "No symbol")) | 1342 | (if (equal symbol "") (error "No symbol")) |
| 1343 | (let* ((func `(lambda () | 1343 | (let* ((func `(lambda () |
| 1344 | (comint-redirect-send-command (format "emacs.ehelp(%S)\n" | 1344 | (comint-redirect-send-command |
| 1345 | ,symbol) | 1345 | (format "emacs.ehelp(%S, globals(), locals())\n" ,symbol) |
| 1346 | "*Help*" nil)))) | 1346 | "*Help*" nil)))) |
| 1347 | ;; Ensure we have a suitable help buffer. | 1347 | ;; Ensure we have a suitable help buffer. |
| 1348 | ;; Fixme: Maybe process `Related help topics' a la help xrefs and | 1348 | ;; Fixme: Maybe process `Related help topics' a la help xrefs and |
| 1349 | ;; allow C-c C-f in help buffer. | 1349 | ;; allow C-c C-f in help buffer. |