*** empty log message ***

4 files changed, 30 insertions, 8 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 713ddea4521..27e3d815f3c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -3106,11 +3106,13 @@ KEEP-MARGINS which will preserve the window's current margin, fringe,
 and scroll-bar settings if non-nil.
 
 +++
-** Renamed file hooks to follow the convention:
+** Renamed hooks to better follow the naming convention:
 find-file-hooks to find-file-hook,
 find-file-not-found-hooks to find-file-not-found-functions,
 write-file-hooks to write-file-functions,
-write-contents-hooks to write-contents-functions.
+write-contents-hooks to write-contents-functions,
+x-lost-selection-hooks to x-lost-selection-functions,
+x-sent-selection-hooks to x-sent-selection-functions.
 Marked local-write-file-hooks as obsolete (use the LOCAL arg of `add-hook').
 
 +++
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3db9724a749..43df724bb4c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2004-10-28  Stefan  <monnier@iro.umontreal.ca>
+
+        * mouse.el (mouse-show-mark): Adjust to new name and don't assume
+        x-lost-selection-functions is bound.
+
+        * mouse-sel.el (mouse-sel-mode):
+        * emacs-lisp/lselect.el: Adjust to new names for
+        x-(lost|sent)-selection-functions.
+
+        * subr.el (x-lost-selection-hooks, x-sent-selection-hooks):
+        New obsolete aliases of x-lost-selection-functions and
+        x-sent-selection-functions.
+
 2004-10-28  Kim F. Storm  <storm@cua.dk>
 
         * imenu.el (imenu-scanning-message): Remove.
diff --git a/src/ChangeLog b/src/ChangeLog
index 891c165ab01..3b327c24548 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-28  Stefan  <monnier@iro.umontreal.ca>
+
+        * xselect.c (Vx_lost_selection_functions, Vx_sent_selection_functions):
+        Rename from Vx_lost_selection_hooks and Vx_sent_selection_hooks.
+        (x_handle_selection_request, x_handle_selection_clear)
+        (x_clear_frame_selections, syms_of_xselect): Adjust accordingly.
+
 2004-10-28  Richard M. Stallman  <rms@gnu.org>
 
         * w32fns.c (Fx_server_vendor, Fx_server_version): Doc fixes.
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index 91fcdd1c899..a9465058194 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -6,25 +6,25 @@
 
 1999-12-31  William M. Perry  <wmperry@aventail.com>
 
-        * xfns.c (jpeg_format): Added the :data keyword
+        * xfns.c (jpeg_format): Add the :data keyword
         (jpeg_image_p): JPEG is valid with :file _or_ :data
-        (jpeg_memory_src): Defined new JPEG image source to read from a
+        (jpeg_memory_src): Define new JPEG image source to read from a
         memory buffer.
         (jpeg_load): Pay attention to the :data keyword if specified.
         Instantiates a jpeg_memory_src instead of jpeg_stdio_src if found.
-        (png_format): Added the :data keyword
+        (png_format): Add the :data keyword
         (png_image_p): PNG is valid with :file _or_ :data
         (png_read_from_memory): New PNG read function to read from a
         memory buffer.
         (png_load): Pay attention to the :data keyword if specified.
         Use png_set_read_fn() instead of png_init_io() if specified.
-        (tiff_format): Added the :data keyword for TIFF images.
+        (tiff_format): Add the :data keyword for TIFF images.
         (tiff_image_p): TIFF is valid with :file _or_ :data
-        (tiff_read_from_memory): Defined new TIFF I/O functions to read
+        (tiff_read_from_memory): Define new TIFF I/O functions to read
         from a memory buffer.
         (tiff_load): Pay attention to the :data keyword if specified.
         Uses TIFFClientOpen() instead of TIFFOpen() if specified.
-        (gif_format): Added the :data keyword
+        (gif_format): Add the :data keyword
         (gif_image_p): GIF is valid with :file _or_ :data
         (gif_read_from_memory): New GIF input function to read from a
         memory buffer.