[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r106395: * python.el (python-pdbtrack
From: |
Ken Manheimer |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r106395: * python.el (python-pdbtrack-stack-entry-regexp) |
Date: |
Wed, 16 Nov 2011 11:37:48 -0500 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 106395
committer: Ken Manheimer <address@hidden>
branch nick: trunk
timestamp: Wed 2011-11-16 11:37:48 -0500
message:
* python.el (python-pdbtrack-stack-entry-regexp)
(python-pdbtrack-input-prompt, python-pdbtrack-track-stack-file):
Adjust to recognize ipdb as well as regular python pdb prompts.
Adjustments shamelessly taken exactly as suggested in EmacsWiki
page: http://www.emacswiki.org/PythonProgrammingInEmacs#toc14
modified:
lisp/ChangeLog
lisp/allout-widgets.el
lisp/allout.el
lisp/progmodes/python.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-11-16 12:34:47 +0000
+++ b/lisp/ChangeLog 2011-11-16 16:37:48 +0000
@@ -1,3 +1,11 @@
+2011-11-16 Ken Manheimer <address@hidden>
+
+ * python.el (python-pdbtrack-stack-entry-regexp)
+ (python-pdbtrack-input-prompt, python-pdbtrack-track-stack-file):
+ Adjust to recognize ipdb as well as regular python pdb prompts.
+ Adjustments shamelessly taken exactly as suggested in EmacsWiki
+ page: http://www.emacswiki.org/PythonProgrammingInEmacs#toc14
+
2011-11-16 Juanma Barranquero <address@hidden>
* expand.el (expand-pos, expand-index, expand-point):
@@ -47,6 +55,7 @@
which wasn't being used. Add optional arg to force given state.
(rmail-mime): Add optional arg to force given state.
+>>>>>>> MERGE-SOURCE
2011-11-15 Juanma Barranquero <address@hidden>
* allout.el (allout-encryption-plaintext-sanitization-regexps):
=== modified file 'lisp/allout-widgets.el'
--- a/lisp/allout-widgets.el 2011-11-15 07:55:13 +0000
+++ b/lisp/allout-widgets.el 2011-11-16 16:37:48 +0000
@@ -1,14 +1,13 @@
;; allout-widgets.el --- Visually highlight allout outline structure.
-;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Ken Manheimer
+;; Copyright (C) 2005-2011 Free Software Foundation, Inc.
-;; Author: Ken Manheimer <ken dot manheimer at gmail dot com>
-;; Maintainer: Ken Manheimer <ken dot manheimer at gmail dot com>
+;; Author: Ken Manheimer <ken dot manheimer at gmail...>
+;; Maintainer: Ken Manheimer <ken dot manheimer at gmail...>
;; Version: 1.0
;; Created: Dec 2005
-;; Version: 1.0
;; Keywords: outlines
-;; Website: http://myriadicity.net/Sundry/EmacsAllout
+;; Website: http://myriadicity.net/software-and-systems/craft/emacs-allout
;;; Commentary:
=== modified file 'lisp/allout.el'
--- a/lisp/allout.el 2011-11-15 17:37:37 +0000
+++ b/lisp/allout.el 2011-11-16 16:37:48 +0000
@@ -2,12 +2,12 @@
;; Copyright (C) 1992-1994, 2001-2011 Free Software Foundation, Inc.
-;; Author: Ken Manheimer <ken dot manheimer at gmail dot com>
-;; Maintainer: Ken Manheimer <ken dot manheimer at gmail dot com>
+;; Author: Ken Manheimer <ken dot manheimer at gmail...>
+;; Maintainer: Ken Manheimer <ken dot manheimer at gmail...>
;; Created: Dec 1991 -- first release to usenet
;; Version: 2.3
;; Keywords: outlines, wp, languages, PGP, GnuPG
-;; Website: http://myriadicity.net/Sundry/EmacsAllout
+;; Website: http://myriadicity.net/software-and-systems/craft/emacs-allout
;; This file is part of GNU Emacs.
=== modified file 'lisp/progmodes/python.el'
--- a/lisp/progmodes/python.el 2011-11-09 15:00:32 +0000
+++ b/lisp/progmodes/python.el 2011-11-16 16:37:48 +0000
@@ -550,7 +550,7 @@
"^> \\(.*\\)(\\([0-9]+\\))\\([?a-zA-Z0-9_<>]+\\)()"
"Regular expression pdbtrack uses to find a stack trace entry.")
-(defconst python-pdbtrack-input-prompt "\n[(<]*[Pp]db[>)]+ "
+(defconst python-pdbtrack-input-prompt "\n[(<]*[Ii]?[Pp]db[>)]+ "
"Regular expression pdbtrack uses to recognize a pdb prompt.")
(defconst python-pdbtrack-track-range 10000
@@ -2583,6 +2583,7 @@
(if (not (string-match (concat python-pdbtrack-input-prompt "$")
block))
(python-pdbtrack-overlay-arrow nil)
+ (setq block (ansi-color-filter-apply block))
(setq target (python-pdbtrack-get-source-buffer block))
(if (stringp target)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r106395: * python.el (python-pdbtrack-stack-entry-regexp),
Ken Manheimer <=