* 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

4 files changed, 18 insertions, 9 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e17c25a17db..e1eb8a78082 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2011-11-16  Ken Manheimer  <ken.manheimer@gmail.com>
+
+	* 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  <lekktu@gmail.com>
 
 	* 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  <lekktu@gmail.com>
 
 	* allout.el (allout-encryption-plaintext-sanitization-regexps):
diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el
index da21244b7b1..c5d34fc3e3b 100644
--- a/lisp/allout-widgets.el
+++ b/lisp/allout-widgets.el
@@ -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:
 
diff --git a/lisp/allout.el b/lisp/allout.el
index 2a4f5cbafbb..4098ba9ba5b 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -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.
 
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 8615400bf6a..fe6bab0160d 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -550,7 +550,7 @@ element matches `python-python-command'."
   "^> \\(.*\\)(\\([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 @@ find it."
         (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)