diff options
| author | Dan Nicolaescu | 2006-04-18 22:34:54 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2006-04-18 22:34:54 +0000 |
| commit | 3398a4aee71874478ec1bfdefbe7f1bed83cb05c (patch) | |
| tree | 388bc5631a74c88c9bdc99294faeb89cfab795aa | |
| parent | ec7793c3a6c246f4f3f2508681d22c00115e7ae0 (diff) | |
| download | emacs-3398a4aee71874478ec1bfdefbe7f1bed83cb05c.tar.gz emacs-3398a4aee71874478ec1bfdefbe7f1bed83cb05c.zip | |
(python-mode): Add support for
hs-minor-mode.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/python.el | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b0f52fb9ff4..3d969ed802e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2006-04-18 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * progmodes/python.el (python-mode): Add support for | ||
| 4 | hs-minor-mode. | ||
| 5 | |||
| 1 | 2006-04-19 Reiner Steib <Reiner.Steib@gmx.de> | 6 | 2006-04-19 Reiner Steib <Reiner.Steib@gmx.de> |
| 2 | 7 | ||
| 3 | * abbrev.el (read-abbrev-file): Use abbrev-file-name if optional | 8 | * abbrev.el (read-abbrev-file): Use abbrev-file-name if optional |
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index f110828d602..8ae94df5ea3 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -1744,6 +1744,14 @@ lines count as headers. | |||
| 1744 | #'python-eldoc-function) | 1744 | #'python-eldoc-function) |
| 1745 | (add-hook 'eldoc-mode-hook | 1745 | (add-hook 'eldoc-mode-hook |
| 1746 | '(lambda () (run-python nil t)) nil t) ; need it running | 1746 | '(lambda () (run-python nil t)) nil t) ; need it running |
| 1747 | (unless (assoc 'pyhon-mode hs-special-modes-alist) | ||
| 1748 | (setq | ||
| 1749 | hs-special-modes-alist | ||
| 1750 | (cons (list | ||
| 1751 | 'python-mode "^\\s-*def\\>" nil "#" | ||
| 1752 | (lambda (arg)(python-end-of-defun)(skip-chars-backward " \t\n")) | ||
| 1753 | nil) | ||
| 1754 | hs-special-modes-alist))) | ||
| 1747 | (if (featurep 'hippie-exp) | 1755 | (if (featurep 'hippie-exp) |
| 1748 | (set (make-local-variable 'hippie-expand-try-functions-list) | 1756 | (set (make-local-variable 'hippie-expand-try-functions-list) |
| 1749 | (cons 'python-try-complete hippie-expand-try-functions-list))) | 1757 | (cons 'python-try-complete hippie-expand-try-functions-list))) |