Show
Ignore:
Timestamp:
04/04/08 22:04:40 (8 months ago)
Author:
miyoshi
Message:

Sync up with Emacs22.2.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/etc/emacs.py

    r4200 r4220  
    11"""Definitions used by commands sent to inferior Python in python.el.""" 
    22 
    3 # Copyright (C) 2004, 2005, 2006, 2007  Free Software Foundation, Inc. 
     3# Copyright (C) 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc. 
    44# Author: Dave Love <fx@gnu.org> 
    55 
    …… 
    88# GNU Emacs is free software; you can redistribute it and/or modify 
    99# it under the terms of the GNU General Public License as published by 
    10 # the Free Software Foundation; either version 2, or (at your option) 
     10# the Free Software Foundation; either version 3, or (at your option) 
    1111# any later version. 
    1212 
    …… 
    177177                    names.union_update (class_members (object)) 
    178178            except: names = all_names (dict) 
    179     except: return [] 
     179    except: 
     180        print '_emacs_out ()' 
     181        return [] 
    180182    l = len(name) 
    181183    print '_emacs_out (',