diff options
| author | Miles Bader | 2006-01-25 07:10:04 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-01-25 07:10:04 +0000 |
| commit | b2ba4dcba149f845bf7fcf15b6cede6a6cbcc336 (patch) | |
| tree | d9ca500b0501201584dbab3b74a83d1ba7e374c9 /lisp/progmodes/python.el | |
| parent | 90fc2bc59774318b3db7c3642df00a1297f6b7ff (diff) | |
| parent | 7347faa822b5ea177df5b2ed7a2b7d79194f0bcc (diff) | |
| download | emacs-b2ba4dcba149f845bf7fcf15b6cede6a6cbcc336.tar.gz emacs-b2ba4dcba149f845bf7fcf15b6cede6a6cbcc336.zip | |
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-7
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 4-14)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (base, patch 1-7)
- tag of miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-187
- Update from CVS
- Merge from emacs--devo--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10 (patch 187)
- Update from CVS
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 6ed2e39e4e8..0ed58fd558e 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -1743,7 +1743,7 @@ lines count as headers. | |||
| 1743 | (set (make-local-variable 'eldoc-documentation-function) | 1743 | (set (make-local-variable 'eldoc-documentation-function) |
| 1744 | #'python-eldoc-function) | 1744 | #'python-eldoc-function) |
| 1745 | (add-hook 'eldoc-mode-hook | 1745 | (add-hook 'eldoc-mode-hook |
| 1746 | '(lambda () (run-python 0 t)) nil t) ; need it running | 1746 | '(lambda () (run-python nil t)) nil t) ; need it running |
| 1747 | (if (featurep 'hippie-exp) | 1747 | (if (featurep 'hippie-exp) |
| 1748 | (set (make-local-variable 'hippie-expand-try-functions-list) | 1748 | (set (make-local-variable 'hippie-expand-try-functions-list) |
| 1749 | (cons 'python-try-complete hippie-expand-try-functions-list))) | 1749 | (cons 'python-try-complete hippie-expand-try-functions-list))) |