From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 28 Jan 2005 16:29:27 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: ttn-vms-21-2-B4~2568
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5c243ee4377a8c2328167147ddec963a1ba988de;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 77a600427e2..86e279685c1 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* message.el (message-beginning-of-line): Change the behavior when
+	invoked between BOL and : so that it first moves backward.
+
 2005-01-20  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* mm-decode.el (mm-insert-part): Switch the multibyteness of data
@@ -14,8 +19,7 @@
 
 	* mm-bodies.el (mm-body-encoding): Don't permit 7-bit to be used
 	when mm-use-ultra-safe-encoding is enabled (e.g., for PGP/MIME)
-	and we have trailing white space.  Reported by Werner Koch
-	<wk@gnupg.org>.
+	and we have trailing white space.  Reported by Werner Koch <wk@gnupg.org>.
 
 2004-12-17  Kim F. Storm  <storm@cua.dk>
 
@@ -58,8 +62,8 @@
 
 2004-12-13  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-	* gnus-group.el (gnus-group-make-rss-group): Use
-	gnus-group-make-group instead of gnus-group-unsubscribe-group.
+	* gnus-group.el (gnus-group-make-rss-group):
+	Use gnus-group-make-group instead of gnus-group-unsubscribe-group.
 
 	* gnus-start.el (gnus-setup-news): Honor user's setting to
 	gnus-message-archive-method.  Suggested by Lute Kamstra
diff --git a/src/ChangeLog b/src/ChangeLog
index cd258fa08bd..6030a3a4886 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* keymap.c (access_keymap): YAILOM.
+
 2005-01-27  Kim F. Storm  <storm@cua.dk>
 
 	* xdisp.c (get_phys_cursor_geometry): New function to calculate
@@ -518,8 +522,13 @@
 	(install_window_handler) [TARGET_API_MAC_CARBON]:
 	Register handlers for tracking/receiving drag-and-drop items.
 	(do_ae_open_documents): Generate unibyte strings for filenames.
+<<<<<<< ChangeLog
+	(mac_do_receive_drag) [TARGET_API_MAC_CARBON] : Likewise.
+	Reject only non-filename items.  Set event modifiers and return value.
+=======
 	(mac_do_receive_drag) [TARGET_API_MAC_CARBON] : Likewise.
 	Reject only non-filename items.  Set event modifiers, and return value.
+>>>>>>> 1.4187
 
 2004-12-28  Dan Nicolaescu  <dann@ics.uci.edu>
 
@@ -629,7 +638,12 @@
 	(x_make_frame_visible) [TARGET_API_MAC_CARBON]: Reposition window
 	if the position is neither user-specified nor program-specified.
 	(x_free_frame_resources): Free size_hints.
+<<<<<<< ChangeLog
+	(x_wm_set_size_hint): Allocate size_hints if needed.
+	Set size_hints.
+=======
 	(x_wm_set_size_hint): Allocate size_hints if needed.  Set size_hints.
+>>>>>>> 1.4187
 	(mac_clear_font_name_table): New function.
 	(mac_do_list_fonts): Initialize font_name_table if needed.
 	(x_list_fonts): Don't initialize font_name_table.  Add BLOCK_INPUT
@@ -681,7 +695,11 @@
 
 2004-12-27  Richard M. Stallman  <rms@gnu.org>
 
+<<<<<<< ChangeLog
+	* buffer.c (Fbuffer_disable_undo): Delete (moved to simple.el).
+=======
 	* buffer.c (Fbuffer_disable_undo): Delete (move to simple.el).
+>>>>>>> 1.4187
 	(syms_of_buffer): Don't defsubr it.
 
 	* process.c (list_processes_1): Set undo_list instead