aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes/python.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/progmodes/python.el')
-rw-r--r--lisp/progmodes/python.el9
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 8615400bf6a..6bc4db60596 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -119,7 +119,7 @@
119 (1 font-lock-type-face)) 119 (1 font-lock-type-face))
120 ;; Built-ins. (The next three blocks are from 120 ;; Built-ins. (The next three blocks are from
121 ;; `__builtin__.__dict__.keys()' in Python 2.7) These patterns 121 ;; `__builtin__.__dict__.keys()' in Python 2.7) These patterns
122 ;; are debateable, but they at least help to spot possible 122 ;; are debatable, but they at least help to spot possible
123 ;; shadowing of builtins. 123 ;; shadowing of builtins.
124 (,(rx symbol-start (or 124 (,(rx symbol-start (or
125 ;; exceptions 125 ;; exceptions
@@ -550,7 +550,7 @@ element matches `python-python-command'."
550 "^> \\(.*\\)(\\([0-9]+\\))\\([?a-zA-Z0-9_<>]+\\)()" 550 "^> \\(.*\\)(\\([0-9]+\\))\\([?a-zA-Z0-9_<>]+\\)()"
551 "Regular expression pdbtrack uses to find a stack trace entry.") 551 "Regular expression pdbtrack uses to find a stack trace entry.")
552 552
553(defconst python-pdbtrack-input-prompt "\n[(<]*[Pp]db[>)]+ " 553(defconst python-pdbtrack-input-prompt "\n[(<]*[Ii]?[Pp]db[>)]+ "
554 "Regular expression pdbtrack uses to recognize a pdb prompt.") 554 "Regular expression pdbtrack uses to recognize a pdb prompt.")
555 555
556(defconst python-pdbtrack-track-range 10000 556(defconst python-pdbtrack-track-range 10000
@@ -1122,7 +1122,7 @@ don't move and return nil. Otherwise return t."
1122 1122
1123;;;; Imenu. 1123;;;; Imenu.
1124 1124
1125;; For possibily speeding this up, here's the top of the ELP profile 1125;; For possibly speeding this up, here's the top of the ELP profile
1126;; for rescanning pydoc.py (2.2k lines, 90kb): 1126;; for rescanning pydoc.py (2.2k lines, 90kb):
1127;; Function Name Call Count Elapsed Time Average Time 1127;; Function Name Call Count Elapsed Time Average Time
1128;; ==================================== ========== ============= ============ 1128;; ==================================== ========== ============= ============
@@ -2553,7 +2553,7 @@ If the traceback target file path is invalid, we look for the
2553most recently visited python-mode buffer which either has the 2553most recently visited python-mode buffer which either has the
2554name of the current function or class, or which defines the 2554name of the current function or class, or which defines the
2555function or class. This is to provide for scripts not in the 2555function or class. This is to provide for scripts not in the
2556local filesytem (e.g., Zope's 'Script \(Python)', but it's not 2556local file system (e.g., Zope's 'Script \(Python)', but it's not
2557Zope specific). If you put a copy of the script in a buffer 2557Zope specific). If you put a copy of the script in a buffer
2558named for the script and activate python-mode, then pdbtrack will 2558named for the script and activate python-mode, then pdbtrack will
2559find it." 2559find it."
@@ -2583,6 +2583,7 @@ find it."
2583 (if (not (string-match (concat python-pdbtrack-input-prompt "$") block)) 2583 (if (not (string-match (concat python-pdbtrack-input-prompt "$") block))
2584 (python-pdbtrack-overlay-arrow nil) 2584 (python-pdbtrack-overlay-arrow nil)
2585 2585
2586 (setq block (ansi-color-filter-apply block))
2586 (setq target (python-pdbtrack-get-source-buffer block)) 2587 (setq target (python-pdbtrack-get-source-buffer block))
2587 2588
2588 (if (stringp target) 2589 (if (stringp target)