merge from upstream

5 files changed, 10 insertions, 16 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index dcb73156d7e..70e002f0f9e 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -6,6 +6,10 @@
 
         * NEWS: dbus.el supports alternative buses.
 
+2010-08-22  Alex Harsanyi  <harsanyi@mac.com>  (tiny change)
+
+        * emacs3.py: Import imp module and use it (Bug#5756).
+
 2010-08-14  Eli Zaretskii  <eliz@gnu.org>
 
         * tutorials/TUTORIAL.he: Use MAQAF instead of hyphen where appropriate.
diff --git a/etc/NEWS b/etc/NEWS
index 16525c378e7..72075945f62 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -235,6 +235,8 @@ kill ring).
 
 *** `mouse-drag-copy-region' now defaults to nil.
 
+*** Support for X cut buffers has been removed.
+
 
 * Changes in Specialized Modes and Packages in Emacs 24.1
 
@@ -425,6 +427,8 @@ system or session bus.
 
 * New Modes and Packages in Emacs 24.1
 
+** New global minor modes electric-pair-mode and electric-indent-mode.
+
 ** pcase.el provides the ML-style pattern matching macro `pcase'.
 
 ** smie.el is a package providing a simple generic indentation engine.
diff --git a/etc/emacs3.py b/etc/emacs3.py
index fd2e7c97c53..de81848e5c3 100644
--- a/etc/emacs3.py
+++ b/etc/emacs3.py
@@ -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 @@ Warning: This file is automatically generated from emacs2.py with the
 # 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 @@ def eimport (mod, dir):
     try:
         try:
             if mod in __dict__ and inspect.ismodule (__dict__[mod]):
-                reload (__dict__[mod])
+                imp.reload (__dict__[mod])
             else:
                 __dict__[mod] = __import__ (mod)
         except:
diff --git a/etc/gnus/gnus-setup.ast b/etc/gnus/gnus-setup.ast
index 31eeee024e1..f2493b8653f 100644
--- a/etc/gnus/gnus-setup.ast
+++ b/etc/gnus/gnus-setup.ast
@@ -48,8 +48,3 @@ Run M-x assistant and use the news-server.ast file as input.
 @c Local variables:
 @c mode: texinfo
 @c End:
-
-@ignore
-   arch-tag: 6b7b200b-9169-4b44-8b32-b73773fa71af
-@end ignore
-
diff --git a/etc/refcards/gnus-refcard.tex b/etc/refcards/gnus-refcard.tex
index ec9451587bd..1b23188cd93 100644
--- a/etc/refcards/gnus-refcard.tex
+++ b/etc/refcards/gnus-refcard.tex
@@ -1425,5 +1425,3 @@
 %%% mode: latex
 %%% TeX-master: t
 %%% End:
-
-% arch-tag: be438b0e-6832-4afb-8c56-5f84743e5cd1