# HG changeset patch
# User Kenichi Handa  <handa@m17n.org>
# Date 1267255452 -32400
# Node ID 8dc9cd276d24dd468f82835c110e482931e56ed5
# Parent  bf1a617b8f8a5ef103289a2d72d837700f508c81# Parent  26b234a2e9012f4cbee22898dc12d88a897fc003
from trunk

diff -r bf1a617b8f8a -r 8dc9cd276d24 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Feb 26 21:43:50 2010 +0900
+++ b/lisp/ChangeLog	Sat Feb 27 16:24:12 2010 +0900
@@ -1,3 +1,8 @@
+2010-02-27  Jeremy Whitlock  <jcscoobyrs@gmail.com>  (tiny change)
+
+	* progmodes/python.el (python-pdbtrack-stack-entry-regexp): Allow
+	the characters _<> in the stack entry (Bug#5653).
+
 2010-02-26  Kenichi Handa  <handa@m17n.org>
 
 	* language/burmese.el: Fix entries in composition-function-table.
diff -r bf1a617b8f8a -r 8dc9cd276d24 lisp/progmodes/python.el
--- a/lisp/progmodes/python.el	Fri Feb 26 21:43:50 2010 +0900
+++ b/lisp/progmodes/python.el	Sat Feb 27 16:24:12 2010 +0900
@@ -576,7 +576,7 @@
 (defvar python-pdbtrack-is-tracking-p nil)
 
 (defconst python-pdbtrack-stack-entry-regexp
-  "^> \\(.*\\)(\\([0-9]+\\))\\([?a-zA-Z0-9_]+\\)()"
+  "^> \\(.*\\)(\\([0-9]+\\))\\([?a-zA-Z0-9_<>]+\\)()"
   "Regular expression pdbtrack uses to find a stack trace entry.")
 
 (defconst python-pdbtrack-input-prompt "\n[(<]*[Pp]db[>)]+ "
diff -r bf1a617b8f8a -r 8dc9cd276d24 src/ChangeLog
--- a/src/ChangeLog	Fri Feb 26 21:43:50 2010 +0900
+++ b/src/ChangeLog	Sat Feb 27 16:24:12 2010 +0900
@@ -1,3 +1,8 @@
+2010-02-27  Chong Yidong  <cyd@stupidchicken.com>
+
+	* font.c (font_parse_fcname): Recognize "Book", "Condensed",
+	"Medium", and "Semi-Condensed" keywords in GTK names (Bug#5646).
+
 2010-02-26  Kenichi Handa  <handa@m17n.org>
 
 	* ftfont.c (ftfont_get_open_type_spec): Fix parsing of otf_spec.
diff -r bf1a617b8f8a -r 8dc9cd276d24 src/font.c
--- a/src/font.c	Fri Feb 26 21:43:50 2010 +0900
+++ b/src/font.c	Sat Feb 27 16:24:12 2010 +0900
@@ -1576,6 +1576,18 @@
 	      prop = font_intern_prop ("light", 5, 1);
 	      FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop);
 	    }
+	  else if (PROP_MATCH ("Book", 4))
+	    {
+	      prop_found = 1;
+	      prop = font_intern_prop ("book", 4, 1);
+	      FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop);
+	    }
+	  else if (PROP_MATCH ("Medium", 6))
+	    {
+	      prop_found = 1;
+	      prop = font_intern_prop ("medium", 6, 1);
+	      FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop);
+	    }
 	  else if (PROP_MATCH ("Semi-Bold", 9))
 	    {
 	      prop_found = 1;
@@ -1600,6 +1612,18 @@
 	      prop = font_intern_prop ("oblique", 7, 1);
 	      FONT_SET_STYLE (font, FONT_SLANT_INDEX, prop);
 	    }
+	  else if (PROP_MATCH ("Semi-Condensed", 14))
+	    {
+	      prop_found = 1;
+	      prop = font_intern_prop ("semi-condensed", 14, 1);
+	      FONT_SET_STYLE (font, FONT_WIDTH_INDEX, prop);
+	    }
+	  else if (PROP_MATCH ("Condensed", 9))
+	    {
+	      prop_found = 1;
+	      prop = font_intern_prop ("condensed", 9, 1);
+	      FONT_SET_STYLE (font, FONT_WIDTH_INDEX, prop);
+	    }
 	  else {
 	    if (prop_found)
 	      return -1; /* Unknown property in GTK-style font name.  */