comparison etc/emacs2.py @ 107010:238592f6c24a

Merge from trunk
author Jason Rumney <jasonr@gnu.org>
date Thu, 14 Jan 2010 22:19:01 +0800
parents 1d1d5d9bd884
children 376148b31b5e
comparison
equal deleted inserted replaced
107009:3e16e7dbb4a5 107010:238592f6c24a
1 """Definitions used by commands sent to inferior Python in python.el.""" 1 """Definitions used by commands sent to inferior Python in python.el."""
2 2
3 # Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 3 # Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
4 # Author: Dave Love <fx@gnu.org> 4 # Author: Dave Love <fx@gnu.org>
5 5
6 # This file is part of GNU Emacs. 6 # This file is part of GNU Emacs.
7 7
8 # GNU Emacs is free software: you can redistribute it and/or modify 8 # GNU Emacs is free software: you can redistribute it and/or modify