(complete.class_members): Make sure we return the _emacs_out

message even in the face of exceptions.

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 87202bbef2449163e4d046ad04d427faf288d66f..c8e8d8bb58116882285f946171322fba81bbb9ac 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs.py (complete.class_members): Make sure we return the _emacs_out
+       message even in the face of exceptions.
+
 2007-09-05  Jason Rumney  <jasonr@gnu.org>
 
        * NEWS: Mention focus-follows-mouse change.
@@ -9,10 +14,10 @@
 
 2007-08-22  Karl Berry  <karl@gnu.org>
 
-       * refcard.tex: updates for printing.
-        (\versionyear): update to 2007.
-       (\copyrightnotice): modified or unmodified ok.
-       (Simple Customization): don't use goto-line, since now it's bound.
+       * refcard.tex: Updates for printing.
+       (\versionyear): Update to 2007.
+       (\copyrightnotice): Modified or unmodified ok.
+       (Simple Customization): Don't use goto-line, since now it's bound.
        Also, use now-preferred (kbd ...) syntax.
 
 2007-08-14  Glenn Morris  <rgm@gnu.org>
@@ -26,7 +31,7 @@
 
 2007-07-25  Glenn Morris  <rgm@gnu.org>
 
-       *  Relicense all FSF files to GPLv3 or later.
+       * Relicense all FSF files to GPLv3 or later.
 
        * COPYING: Switch to GPLv3.
 

diff --git a/etc/emacs.py b/etc/emacs.py
index f11913cd7b59a0e7272010c728a96b0308fd419b..d8bfb6bcd68cc96cc626eb247aba0ee583699aab 100644 (file)
--- a/etc/emacs.py
+++ b/etc/emacs.py
@@ -176,7 +176,9 @@ def complete (name, imports):
                    names.add('__class__')
                    names.union_update (class_members (object))
            except: names = all_names (dict)
-    except: return []
+    except:
+        print '_emacs_out ()'
+        return []
     l = len(name)
     print '_emacs_out (',
     for n in names: