merge trunk

4 files changed, 14 insertions, 5 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 84754efb148..5b78767cfda 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-21  Eric Ludlam  <zappo@gnu.org>
+
+        * srecode/java.srt: Make NAME be a prompt.
+
 2010-09-13  Michael Albinus  <michael.albinus@gmx.de>
 
         * NEWS: Some Tramp methods are discontinued.
diff --git a/etc/NEWS b/etc/NEWS
index 8f61d9d3467..0647603a3f3 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -561,10 +561,13 @@ by the Graphic Control Extension of the image.
 ** XML and HTML parsing
 
 *** If Emacs is compiled with libxml2 support (which is the default),
-two new Emacs Lisp-level functions are defined: `html-parse-string'
-(which will parse "real world" HTML) and `xml-parse-string' (which
-parses XML).  Both return an Emacs Lisp parse tree.  See the Emacs
-Lisp Reference Manual for details.
+two new Emacs Lisp-level functions are defined:
+`xml-parse-html-string-internal' (which will parse "real world" HTML)
+and `xml-parse-string-internal' (which parses XML).  Both return an
+Emacs Lisp parse tree.
+
+FIXME: These should be front-ended by xml.el.
+
 
 ** Isearch
 
diff --git a/etc/NEWS.23 b/etc/NEWS.23
index e63767d891c..bee89d368b5 100644
--- a/etc/NEWS.23
+++ b/etc/NEWS.23
@@ -40,6 +40,8 @@ This can be used in place of the default appt-message-warning-time.
 
 * Lisp changes in Emacs 23.3
 
+** `e' and `pi' are now called `float-e' and `float-pi'.
+  The old names are obsolete.
 ** The use of unintern without an obarray arg is declared obsolete.
 
 ** New function byte-to-string, like char-to-string but for bytes.
diff --git a/etc/srecode/java.srt b/etc/srecode/java.srt
index c449f0d77c9..d4cc986a323 100644
--- a/etc/srecode/java.srt
+++ b/etc/srecode/java.srt
@@ -83,7 +83,7 @@ public Class {{?NAME}} {{#PARENTS}}{{#FIRST}}extends {{/FIRST}}{{#NOTFIRST}}impl
 template include :blank
 "An include statement."
 ----
-import {{NAME}};
+import {{?NAME}};
 ----
 
 context misc