*** empty log message ***

2 files changed, 32 insertions, 3 deletions

diff --git a/man/custom.texi b/man/custom.texi
index 3e4d627b0a9..696dce30c5f 100644
--- a/man/custom.texi
+++ b/man/custom.texi
@@ -1369,6 +1369,7 @@ it checks the global keymap.  This is not precisely how key lookup
 works, but it's good enough for understanding ordinary circumstances.
 
 @cindex rebinding major mode keys
+@findex define-key
   To change the local bindings of a major mode, you must change the
 mode's local keymap.  Normally you must wait until the first time the
 mode is used, because most major modes don't create their keymaps until
@@ -1512,11 +1513,9 @@ command is less work to invoke when you really want to.
 @node Init Rebinding
 @subsection Rebinding Keys in Your Init File
 
-@findex define-key
-@findex substitute-key-definition
   If you have a set of key bindings that you like to use all the time,
 you can specify them in your @file{.emacs} file by using their Lisp
-syntax.
+syntax.  (@xref{Init File}.)
 
   The simplest method for doing this works for ASCII characters and
 Meta-modified ASCII characters only.  This method uses a string to
@@ -2199,6 +2198,7 @@ Do the same thing for Lisp mode only.
 Redefine all keys which now run @code{next-line} in Fundamental mode
 so that they run @code{forward-line} instead.
 
+@findex substitute-key-definition
 @example
 (substitute-key-definition 'next-line 'forward-line
                            global-map)
diff --git a/src/ChangeLog b/src/ChangeLog
index 32d7cbf7509..6240729fe15 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,26 @@
+1999-11-09  Richard M. Stallman  <rms@caffeine.ai.mit.edu>
+
+        * cmds.c (Fbeginning_of_line): Doc fix.
+        (Fend_of_line): Doc fix.
+
+        * editfns.c (Fline_beginning_position): If N is not 1,
+        pass t to Fconstrain_to_field for ESCAPE-FROM-EDGE.
+
+        * syntax.c (Fforward_word): Handle fields even if would have hit
+        an edge of the buffer.  Return nil if affected by fields.
+
+1999-11-09  Richard M. Stallman  <rms@caffeine.ai.mit.edu>
+
+        * editfns.c (preceding_pos): Function deleted.
+        (text_property_stickiness): Decrement POS directly.
+        Fix a confusion that used PT instead of POS.
+
+        * editfns.c (find_field): Properly handle the case
+        of a field boundary where `field' inherits from neither side.
+
+        * editfns.c (Ffield_beginning, Ffield_end): Doc fixes.
+        (Ferase_field, Ffield_string, Ffield_string_no_properties): Doc fixes.
+
 1999-11-08  Gerd Moellmann  <gerd@gnu.org>
 
         * bytecode.c (Fbyte_code) <BinsertN, Bcall>: Do the
@@ -176,6 +199,11 @@
         Redefine PTY_TTY_NAME_SPRINTF.
         * config.in: Add undef for HAVE_DEV_PTMX.
 
+1999-10-26  Richard M. Stallman  <rms@caffeine.ai.mit.edu>
+
+        * regex.c (POP_FAILURE_POINT): Use failure_id.integer
+        as arg to DEBUG_POP and DEBUG_PRINT.
+
 1999-10-27  Richard M. Stallman  <rms@caffeine.ai.mit.edu>
 
         * data.c (Qad_activate_internal): Renamed from Qad_activate.
@@ -586,6 +614,7 @@
         (shrink_mini_window): Restore old window sizes only if old
         size information is valid in all windows in a window tree.
         
+>>>>>>> 1.44
 1999-10-15  Gerd Moellmann  <gerd@gnu.org>
 
         * xmenu.c (set_frame_menubar): Don't call