Merged revisions 81049 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81049 | andrew.kuchling | 2010-05-10 13:18:25 -0400 (Mon, 10 May 2010) | 1 line

  Move { out of #if...#else block; this confuses Emacs' C-mode
........
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index 40b9844..65aa01e 100644
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -1234,10 +1234,11 @@
   int rtn;
 
 #ifndef WINDOW_HAS_FLAGS
-  if (0) {
+  if (0)
 #else
-  if (self->win->_flags & _ISPAD) {
+  if (self->win->_flags & _ISPAD)
 #endif
+    {
     switch(PyTuple_Size(args)) {
     case 6:
       if (!PyArg_ParseTuple(args, 
@@ -1403,10 +1404,11 @@
   int rtn;
   
 #ifndef WINDOW_HAS_FLAGS
-  if (0) {
+  if (0)
 #else
-  if (self->win->_flags & _ISPAD) {
+  if (self->win->_flags & _ISPAD)
 #endif
+    {
     switch(PyTuple_Size(args)) {
     case 6:
       if (!PyArg_ParseTuple(args,