[Emacs-diffs] Changes to emacs/man/ChangeLog

[Richard M . Stallman]

Index: emacs/man/ChangeLog
diff -c emacs/man/ChangeLog:1.413 emacs/man/ChangeLog:1.414
*** emacs/man/ChangeLog:1.413   Mon Dec 20 20:02:10 2004
--- emacs/man/ChangeLog Mon Dec 27 19:57:47 2004
***************
*** 1,3 ****
--- 1,14 ----
+ 2004-12-27  Richard M. Stallman  <address@hidden>
+ 
+       * Makefile.in (MAKEINFO): Specify --force.
+ 
+       * basic.texi (Moving Point): C-e now runs move-end-of-line.
+       (Undo): Doc undo-outer-limit.
+ 
+ 2004-12-11  Richard M. Stallman  <address@hidden>
+ 
+       * Makefile.in (MAKEINFO): Add --force.
+ 
  2004-12-20  Jay Belanger  <address@hidden>
  
        * calc.texi (Types Tutorial): Emphasized that you can't divide by
***************
*** 23,28 ****
--- 34,40 ----
        the standard "The GNU Emacs Manual" in fifth argument of @xref's.
        (Dealing with HTTP documents): @inforef->@xref.
  
+ >>>>>>> 1.412
  2004-12-15  Juri Linkov  <address@hidden>
  
        * mark.texi (Transient Mark, Mark Ring): M-< and other
***************
*** 39,44 ****
--- 51,57 ----
  
        * calc.texi: Fix some TeX definitions.
  
+ >>>>>>> 1.407
  2004-12-12  Juri Linkov  <address@hidden>
  
        * misc.texi (FFAP): Add C-x C-r, C-x C-v, C-x C-d,
***************
*** 52,57 ****
--- 65,71 ----
        * mark.texi (Marking Objects): Marking commands also extend the
        region when mark is active in Transient Mark mode.
  
+ >>>>>>> 1.403
  2004-12-09  Luc Teirlinck  <address@hidden>
  
        * reftex.texi (Imprint): Remove erroneous @value's.