Merge from trunk

4 files changed, 89 insertions, 33 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 7069d0b9ecb..5b78767cfda 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,11 @@
+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.
+
 2010-09-11  Glenn Morris  <rgm@gnu.org>
 
         * emacs.bash, emacs.csh, ms-kermit: Remove obsolete files (use
diff --git a/etc/NEWS b/etc/NEWS
index b72b000b2fe..0535690dede 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -49,7 +49,7 @@ also depend on Gtk+.  You can disable them with --without-rsvg and
 
 ** There is a new configure option --enable-use-lisp-union-type.
 This is only useful for Emacs developers to debug certain types of bugs.
-These is not a new feature; only the configure flag is new.
+This is not a new feature; only the configure flag is new.
 
 ---
 ** New translation of the Emacs Tutorial in Hebrew is available
@@ -114,14 +114,15 @@ top, left, right or bottom.  The Options => Show/Hide menu has entries
 for this.
 
 ** ImageMagick support.
-It is now possible to use the Imagemagick library to load many new
-image formats in Emacs.  To enable this, use the configure option
-`--with-imagemagick'.
+It is now possible to use the ImageMagick library to load many new
+image formats in Emacs.  By default, Emacs links with the ImageMagick
+libraries if they are present at build time.  To disable this, use
+the configure option `--without-imagemagick'.
 
 The new function `imagemagick-types' returns a list of image file
 extensions that your installation of ImageMagick supports.  The
 function `imagemagick-register-types' enables ImageMagick support for
-these imaeg types, minus those listed in `imagemagick-types-inhibit'.
+these image types, minus those listed in `imagemagick-types-inhibit'.
 
 See the Emacs Lisp Reference Manual for more information.
 
@@ -157,7 +158,7 @@ when a new variable `scroll-error-top-bottom' is non-nil.
 scroll a line instead of full screen.
 
 ** New property `scroll-command' should be set on a command's symbol to
-define it as a scroll command affected by `scroll-preserve-screen-position.
+define it as a scroll command affected by `scroll-preserve-screen-position'.
 
 ** Trash changes
 
@@ -189,8 +190,6 @@ loaded, customize `package-load-list'.
 
 ** completion-at-point is now an alias for complete-symbol.
 
-** mouse-region-delete-keys has been deleted.
-
 ** Deletion changes
 
 *** New option `delete-active-region'.
@@ -236,6 +235,8 @@ kill ring).
 
 * Changes in Specialized Modes and Packages in Emacs 24.1
 
+** latex-electric-env-pair-mode keeps \begin..\end matched on the fly.
+
 ** FIXME: xdg-open for browse-url and reportbug, 2010/08.  (Close bug#4546?)
 
 ** Archive Mode has basic support to browse 7z archives.
@@ -257,6 +258,7 @@ You can get a comparable behavior with:
 (setq completion-pcm-complete-word-inserts-delimiters t)
 
 ** mpc.el: Can use pseudo tags of the form tag1|tag2 as a union of two tags.
+
 ** Customize
 
 *** Customize buffers now contain a search field.
@@ -319,9 +321,11 @@ variables `sql-product', `sql-user', `sql-server', `sql-database' and
 
 *** `sql-dialect' is a synonym for `sql-product'.
 
-*** Added ability to login with a port on MySQL.
+*** Added ability to login with a port on MySQL and Postgres.
 The custom variable `sql-port' can be specified for connection to
-MySQL servers.
+MySQL or Postgres servers.  By default, the port is not listed in
+either login parameter, but will be added to the command line if set
+to a non-zero value.
 
 *** Dynamic selection of product in an SQL interactive session.
 If you use `sql-product-interactive' to start an SQL interactive
@@ -348,22 +352,34 @@ Each supported product has a custom variable `sql-*-login-params'
 which is a list of the parameters to be prompted for before a
 connection is established.
 
-By default, the value of the parameter is simply prompted for.  For
-`server' and `database', they can be specified in a list as shown
-below:
-
-  (server :file ARG)
-  (database :file ARG)
-  (server :completion ARG)
-  (database :completion ARG)
-
-The ARG when :file is specified is a regexp that will match valid file
-names (without the directory portion).  Generally these strings will
-be of the form ".+\.SUF" where SUF is the desired file suffix.
-
-When :completion is specified, the ARG corresponds to the PREDICATE
-argument to the `completing-read' function (a list of possible values
-or a function returning such a list).
+The lists consist of the following five tokens: `user', `password',
+`database', `server', and `port'.  The order in which they appear is
+the order in which they are prompted.  The tokens symbols can be
+replaced by a sublist starting with the token and followed by a plist
+which control the prompting for values.  The tokens `user',
+`database', and `server' each can take a property of :default which
+specifies the value to be used if no value is entered.  The
+`database', `server', and `port' tokens handle the :completion
+property which restricts the entry to either one of the values in the
+list or to one of the values returned by the function provided as the
+property value.  The `database' and `server' tokens also accept the
+:file property whose value is a regexp to identify useful file names.
+
+  (user :default DEF)
+  (database :default DEF
+            :file FILEPAT
+            :completion COMPLETE)
+  (server :default DEF
+          :file FILEPAT
+          :completion COMPLETE)
+
+The FILEPAT when :file is specified is a regexp that will match valid
+file names (without the directory portion).  Generally these strings
+will be of the form ".+\.SUF" where SUF is the desired file suffix.
+
+When :completion is specified, the COMPLETE corresponds to the
+PREDICATE argument to the `completing-read' function (a list of
+possible values or a function returning such a list).
 
 *** Added `sql-connection-alist' to record login parameter values.
 An alist for recording different username, database and server
@@ -393,7 +409,7 @@ SQLite database without prompting; the "prd" connection would prompt
 for the users password and then connect to the Oracle database.
 
 **** Added SQL->Start... submenu when connections are defined.
-When connections have been defined, There is a submenu available that
+When connections have been defined, there is a submenu available that
 allows the user to select one to start a SQLi session.  The "Start
 SQLi Session" item moves to the "Start..." submenu when cnnections
 have been defined.
@@ -403,6 +419,26 @@ When a SQLi session is not started by a connection then
 `sql-save-connection' will gather the login params specified for the
 session and save them as a new connection.
 
+*** List database objects and details.
+Once a SQL interactive session has been started, you can get a list of
+the objects in the database and see details of those objects.  The
+objects shown and the details available are product specific.
+
+**** List all objects.
+Using `M-x sql-list-all', `C-c C-l a' or selecting "SQL->List all
+objects" will list all the objects in the database.  At a minimum it
+lists the tables and views in the database.  Preceeding the command by
+universal argument may provide additional details or extend the
+listing to include other schemas objects.  The list will appear in a
+separate window in view-mode.
+
+**** List Table details.
+Using `M-x sql-list-table', `C-c C-l t' or selecting "SQL->List Table
+details" will ask for the name of a database table or view and display
+the list of columns in the relation.  Preceeding the comand with the
+universal argument may provide additional details about each column.
+The list will appear in a separate window in view-mode.
+
 *** Added option `sql-send-terminator'.
 When set makes sure that each command sent with `sql-send-*' commands
 are properly terminated and submitted to the SQL processor.
@@ -434,6 +470,11 @@ threads simultaneously.
 *** It is possible now, to access alternative buses than the default
 system or session bus.
 
+** Tramp
+
+*** The following access methods are discontinued: "ssh1_old",
+"ssh2_old", "scp1_old", "scp2_old" and "fish".
+
 
 * New Modes and Packages in Emacs 24.1
 
@@ -498,7 +539,7 @@ syntactic rules.
 ** prog-mode is a new major-mode meant to be the parent of programming mode.
 ** define-minor-mode accepts a new keyword :variable.
 
-** `delete-file' and `delete-directory now accept optional arg TRASH.
+** `delete-file' and `delete-directory' now accept optional arg TRASH.
 Trashing is performed if TRASH and `delete-by-moving-to-trash' are
 both non-nil.  Interactively, TRASH defaults to t, unless a prefix
 argument is supplied (see Trash changes, above).
@@ -521,10 +562,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 74291bab8ab..bee89d368b5 100644
--- a/etc/NEWS.23
+++ b/etc/NEWS.23
@@ -40,6 +40,10 @@ 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