Mercurial > emacs
comparison lisp/progmodes/python.el @ 91204:53108e6cea98
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-294
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 06 Dec 2007 09:51:45 +0000 |
parents | 880960b70474 8411562edbb6 |
children | 606f2d163a64 |
comparison
equal
deleted
inserted
replaced
91203:db40129142b2 | 91204:53108e6cea98 |
---|---|
63 ;; TODO: See various Fixmes below. | 63 ;; TODO: See various Fixmes below. |
64 | 64 |
65 ;;; Code: | 65 ;;; Code: |
66 | 66 |
67 (eval-when-compile | 67 (eval-when-compile |
68 (require 'cl) | |
69 (require 'compile) | 68 (require 'compile) |
70 (require 'comint) | 69 (require 'comint) |
71 (require 'hippie-exp)) | 70 (require 'hippie-exp)) |
72 | 71 |
73 (autoload 'comint-mode "comint") | 72 (autoload 'comint-mode "comint") |
1222 (modify-syntax-entry ?\' "." st) | 1221 (modify-syntax-entry ?\' "." st) |
1223 ;; Maybe we should do the same for double quotes? | 1222 ;; Maybe we should do the same for double quotes? |
1224 ;; (modify-syntax-entry ?\" "." st) | 1223 ;; (modify-syntax-entry ?\" "." st) |
1225 st)) | 1224 st)) |
1226 | 1225 |
1226 ;; Autoloaded. | |
1227 (declare-function compilation-shell-minor-mode "compile" (&optional arg)) | |
1228 | |
1227 ;; Fixme: This should inherit some stuff from `python-mode', but I'm | 1229 ;; Fixme: This should inherit some stuff from `python-mode', but I'm |
1228 ;; not sure how much: at least some keybindings, like C-c C-f; | 1230 ;; not sure how much: at least some keybindings, like C-c C-f; |
1229 ;; syntax?; font-locking, e.g. for triple-quoted strings? | 1231 ;; syntax?; font-locking, e.g. for triple-quoted strings? |
1230 (define-derived-mode inferior-python-mode comint-mode "Inferior Python" | 1232 (define-derived-mode inferior-python-mode comint-mode "Inferior Python" |
1231 "Major mode for interacting with an inferior Python process. | 1233 "Major mode for interacting with an inferior Python process. |
1653 (format "emacs.eargs(%S, %s)" | 1655 (format "emacs.eargs(%S, %s)" |
1654 (buffer-substring-no-properties (point) point) | 1656 (buffer-substring-no-properties (point) point) |
1655 python-imports)))))))))))) | 1657 python-imports)))))))))))) |
1656 | 1658 |
1657 ;;;; Info-look functionality. | 1659 ;;;; Info-look functionality. |
1660 | |
1661 (declare-function info-lookup-maybe-add-help "info-look" (&rest arg)) | |
1658 | 1662 |
1659 (defun python-after-info-look () | 1663 (defun python-after-info-look () |
1660 "Set up info-look for Python. | 1664 "Set up info-look for Python. |
1661 Used with `eval-after-load'." | 1665 Used with `eval-after-load'." |
1662 (let* ((version (let ((s (shell-command-to-string (concat python-command | 1666 (let* ((version (let ((s (shell-command-to-string (concat python-command |