*** empty log message ***

4 files changed, 86 insertions, 1 deletions

diff --git a/etc/NEWS b/etc/NEWS
index a67947e6196..33d3545147a 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -89,6 +89,68 @@ See the files mac/README and mac/INSTALL for build instructions.
 
 * Changes in Emacs 21.4
 
+** sql changes.
+
+*** The variable `sql-product' controls the highlightng of different
+SQL dialects.  This variable can be set globally via Customize, on a
+buffer-specific basis via local variable settings, or for the current
+session using the new SQL->Product submenu.  (This menu replaces the
+SQL->Highlighting submenu.)
+
+The following values are supported:
+
+    ansi        ANSI Standard (default)
+    db2         DB2
+    informix    Informix
+    ingres      Ingres
+    interbase   Interbase
+    linter      Linter
+    ms          Microsoft
+    mysql       MySQL
+    oracle      Oracle
+    postgres    Postgres
+    solid       Solid
+    sqlite      SQLite
+    sybase      Sybase
+
+The current product name will be shown on the mode line following the
+SQL mode indicator.
+
+The technique of setting `sql-mode-font-lock-defaults' directly in
+your .emacs will no longer establish the default highlighting -- Use
+`sql-product' to accomplish this.
+
+*** The function `sql-add-product-keywords' can be used to add
+font-lock rules to the product specific rules.  For example, to have
+all identifiers ending in "_t" under MS SQLServer treated as a type,
+you would use the following line in your .emacs file:
+
+  (sql-add-product-keywords 'ms
+             '("\\<\\w+_t\\>" . font-lock-type-face))
+
+*** Oracle support includes keyword highlighting for Oracle 9i.  Most
+SQL and PL/SQL keywords are implemented.  SQL*Plus commands are
+highlighted in `font-lock-doc-face'.
+
+*** Microsoft SQLServer support has been significantly improved.
+Keyword highlighting for SqlServer 2000 is implemented.
+sql-interactive-mode defaults to use osql, rather than isql, because
+osql flushes it's error stream more frequently.  Thus error messages
+are displayed when they occur rather than when the session is
+terminated.
+
+If the username and password are not provided to `sql-ms', osql is
+called with the -E command line argument to use the operating system
+credentials to authenticate the user.
+
+*** Imenu support has been enhanced to locate tables, views, indexes,
+packages, procedures, functions, triggers, sequences, rules, and
+defaults.
+
+*** Added SQL->Start SQLi Session menu entry which calls the
+appropriate sql-interactive-mode wrapper for the current setting of
+`sql-product'.
+
 ** M-x view-file and commands that use it now avoid interfering
 with special modes such as Tar mode.
 
@@ -102,7 +164,7 @@ the operating system or your X server.
 
 ** New minor mode, Visible mode, toggles invisibility in the current buffer.
 When enabled, it makes all invisible text visible.  When disabled, it
-restores the previous value of `buffer-invisibility-spec'. 
+restores the previous value of `buffer-invisibility-spec'.
 
 ** New command `kill-whole-line' kills an entire line at once.
 By default, it is bound to C-S-<backspace>.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b45ef6f61c0..302cf8c4a3b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-13  Juanma Barranquero  <lektu@terra.es>
+
+        * frame.el (modify-all-frames-parameters): Reinstalled (copyright
+        papers received).
+
 2003-07-13  Karl Eichwalder  <ke@suse.de>
 
         * textmodes/po.el (po-find-charset): White space at the start of the
diff --git a/man/ChangeLog b/man/ChangeLog
index 08bfd8d784f..985d82e41ce 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-13  Markus Rost  <rost@math.ohio-state.edu>
+
+        * buffers.texi (List Buffers): Adjust to new format of *Buffer
+        List*.
+
 2003-07-07  Luc Teirlinck  <teirllm@mail.auburn.edu>
 
         * info.texi (Help-Inv, Help-M, Help-Xref): Update following
diff --git a/src/ChangeLog b/src/ChangeLog
index 143aaac4bf2..8ba487f8892 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
+2003-07-13  Terje Rosten  <terjeros@phys.ntnu.no>
+
+        * xterm.c (x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask,
+        and use the Gtk+ function gtk_window_icon_from_file if available.
+
+        * xfns.c (x_bitmap_mask, x_create_bitmap_mask): New functions to
+        handle mask of bitmaps.
+        (x_allocate_bitmap_record, x_destroy_bitmap): Modify to handle the
+        mask property.
+        (xg_set_icon): New function, wrapper for gtk_window_icon_from_file.
+
+        * xterm.h (xg_set_icon): New function.
+
 2003-07-12  Paul Eggert  <eggert@twinsun.com>
 
         * unexelf.c (unexec): Consider a section to precede the .bss