Mercurial > emacs
diff etc/emacs3.py @ 110138:99544439ab8f
merge changes in emacs-23 branch
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Thu, 02 Sep 2010 11:00:18 +0900 |
| parents | 1489c9287d53 |
| children | 376148b31b5e |
line wrap: on
line diff
--- a/etc/emacs3.py Thu Sep 02 01:46:34 2010 +0000 +++ b/etc/emacs3.py Thu Sep 02 11:00:18 2010 +0900 @@ -1,10 +1,3 @@ -""" -Warning: This file is automatically generated from emacs2.py with the -2to3 script. Do not hand edit. -""" - -"""Definitions used by commands sent to inferior Python in python.el.""" - # Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. # Author: Dave Love <fx@gnu.org> @@ -23,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. -import os, sys, traceback, inspect, __main__ +import os, sys, traceback, inspect, imp, __main__ try: set @@ -216,7 +209,7 @@ try: try: if mod in __dict__ and inspect.ismodule (__dict__[mod]): - reload (__dict__[mod]) + imp.reload (__dict__[mod]) else: __dict__[mod] = __import__ (mod) except: