[Emacs-diffs] Changes to emacs/man/emacs.texi [lexbind]

[Miles Bader]

Index: emacs/man/emacs.texi
diff -c emacs/man/emacs.texi:1.58.2.1 emacs/man/emacs.texi:1.58.2.2
*** emacs/man/emacs.texi:1.58.2.1       Fri Apr  4 01:20:47 2003
--- emacs/man/emacs.texi        Tue Oct 14 18:56:22 2003
***************
*** 115,120 ****
--- 115,121 ----
  
  @menu
  * Distrib::           How to get the latest Emacs distribution.
+ * Acknowledgements::    Contributors to GNU Emacs.
  * Copying::           The GNU General Public License gives you permission
                          to redistribute GNU Emacs on certain terms;
                          it also explains that there is no warranty.
***************
*** 166,171 ****
--- 167,174 ----
  * Display::           Controlling what text is displayed.
  * Search::            Finding or replacing occurrences of a string.
  * Fixit::             Commands especially useful for fixing typos.
+ * Keyboard Macros::   A keyboard macro records a sequence of
+                         keystrokes to be replayed with a single command.
  
  Major Structures of Emacs
  * Files::             All about handling files.
***************
*** 334,339 ****
--- 337,352 ----
  * Fixing Case::         Correcting case of last word entered.
  * Spelling::          Apply spelling checker to a word or a whole buffer.
  
+ Keyboard Macros
+ 
+ * Basic Keyboard Macro::     Defining and running keyboard macros.
+ * Keyboard Macro Ring::      Where previous keyboard macros are saved.
+ * Keyboard Macro Counter::   Inserting incrementing numbers in macros.
+ * Keyboard Macro Query::     Making keyboard macros do different things each 
time.
+ * Save Keyboard Macro::      Giving keyboard macros names; saving them in 
files.
+ * Edit Keyboard Macro::      Editing keyboard macros.
+ * Keyboard Macro Step-Edit::   Interactively executing and editing a keyboard 
macro.
+ 
  File Handling
  
  * File Names::          How to type and edit file-name arguments.
***************
*** 721,728 ****
  * Variables::         Many Emacs commands examine Emacs variables
                          to decide what to do; by setting variables,
                          you can control their functioning.
- * Keyboard Macros::   A keyboard macro records a sequence of
-                         keystrokes to be replayed with a single command.
  * Key Bindings::      The keymaps say what command each key runs.
                          By changing them, you can "redefine keys".
  * Keyboard Translations::
--- 734,739 ----
***************
*** 744,755 ****
  * Locals::            Per-buffer values of variables.
  * File Variables::      How files can specify variable values.
  
- Keyboard Macros
- 
- * Basic Kbd Macro::     Defining and running keyboard macros.
- * Save Kbd Macro::      Giving keyboard macros names; saving them in files.
- * Kbd Macro Query::     Making keyboard macros do different things each time.
- 
  Customizing Key Bindings
  
  * Keymaps::             Generalities.  The global keymap.
--- 755,760 ----
***************
*** 897,903 ****
  manual.  @xref{MS-DOS}, for information about using Emacs on MS-DOS.
  @end iftex
  
! @node Distrib, Copying, Top, Top
  @unnumbered Distribution
  
  GNU Emacs is @dfn{free software}; this means that everyone is free to
--- 902,908 ----
  manual.  @xref{MS-DOS}, for information about using Emacs on MS-DOS.
  @end iftex
  
! @node Distrib, Acknowledgements, Top, Top
  @unnumbered Distribution
  
  GNU Emacs is @dfn{free software}; this means that everyone is free to
***************
*** 924,932 ****
  General Public License.  In other words, the program must be free for you
  when you get it, not just free for the manufacturer.
  
! You can also order copies of GNU Emacs from the Free Software Foundation
! on address@hidden  This is a convenient and reliable way to get a copy; it is
! also a good way to help fund our work.  (The Foundation has always
  received most of its funds in this way.)  An order form is included in
  the file @file{etc/ORDERS} in the Emacs distribution, and on our web
  site in @url{http://www.gnu.org/order/order.html}.  For further
--- 929,937 ----
  General Public License.  In other words, the program must be free for you
  when you get it, not just free for the manufacturer.
  
! You can also order copies of GNU Emacs from the Free Software
! Foundation.  This is a convenient and reliable way to get a copy; it
! is also a good way to help fund our work.  (The Foundation has always
  received most of its funds in this way.)  An order form is included in
  the file @file{etc/ORDERS} in the Emacs distribution, and on our web
  site in @url{http://www.gnu.org/order/order.html}.  For further
***************
*** 951,957 ****
  might instead suggest ordering a CD-ROM from the Foundation
  occasionally, or subscribing to periodic updates.
  
! @iftex
  Contributors to GNU Emacs include Per Abrahamsen, Jay K. Adams, Joe
  Arceneaux, Boaz Ben-Zvi, Jim Blandy, Terrence Brannon, Frank Bresz,
  Peter Breton, Kevin Broadey, Vincent Broman, David M. Brown, Bill
--- 956,964 ----
  might instead suggest ordering a CD-ROM from the Foundation
  occasionally, or subscribing to periodic updates.
  
! @node Acknowledgements, Copying, Distrib, Top
! @section Acknowledgements
! 
  Contributors to GNU Emacs include Per Abrahamsen, Jay K. Adams, Joe
  Arceneaux, Boaz Ben-Zvi, Jim Blandy, Terrence Brannon, Frank Bresz,
  Peter Breton, Kevin Broadey, Vincent Broman, David M. Brown, Bill
***************
*** 969,975 ****
  Ingebrigtsen, Andrew Innes, Michael K. Johnson, Kyle Jones, Tomoji
  Kagatani, Brewster Kahle, David Kaufman, Henry Kautz, Howard Kaye,
  Michael Kifer, Richard King, Larry K. Kolodney, Robert Krawitz,
! Sebastian Kremer, Geoff Kuenning, David address@hidden gedal, Daniel 
LaLiberte,
  Aaron Larson, James R. Larus, Frederic Lepied, Lars Lindberg, Eric
  Ludlam, Neil M. Mager, Ken Manheimer, Bill Mann, Brian Marick, Simon
  Marshall, Bengt Martensson, Charlie Martin, Thomas May, Roland McGrath,
--- 976,982 ----
  Ingebrigtsen, Andrew Innes, Michael K. Johnson, Kyle Jones, Tomoji
  Kagatani, Brewster Kahle, David Kaufman, Henry Kautz, Howard Kaye,
  Michael Kifer, Richard King, Larry K. Kolodney, Robert Krawitz,
! Sebastian Kremer, Geoff Kuenning, David address@hidden, Daniel LaLiberte,
  Aaron Larson, James R. Larus, Frederic Lepied, Lars Lindberg, Eric
  Ludlam, Neil M. Mager, Ken Manheimer, Bill Mann, Brian Marick, Simon
  Marshall, Bengt Martensson, Charlie Martin, Thomas May, Roland McGrath,
***************
*** 993,1001 ****
  Wilkinson, Mike Williams, Steven A. Wood, Dale R. Worley, Felix
  S. T. Wu, Tom Wurgler, Eli Zaretskii, Jamie Zawinski, Ian T. Zimmermann,
  Reto Zimmermann, and Neal Ziring.
- @end iftex
  
! @node Copying, GNU Free Documentation License, Distrib, Top
  @unnumbered GNU GENERAL PUBLIC LICENSE
  @center Version 2, June 1991
  
--- 1000,1007 ----
  Wilkinson, Mike Williams, Steven A. Wood, Dale R. Worley, Felix
  S. T. Wu, Tom Wurgler, Eli Zaretskii, Jamie Zawinski, Ian T. Zimmermann,
  Reto Zimmermann, and Neal Ziring.
  
! @node Copying, GNU Free Documentation License, Acknowledgements, Top
  @unnumbered GNU GENERAL PUBLIC LICENSE
  @center Version 2, June 1991
  
***************
*** 1463,1468 ****
--- 1469,1475 ----
  @include display.texi
  @include search.texi
  @include fixit.texi
+ @include kmacro.texi
  @include files.texi
  @include buffers.texi
  @include windows.texi
***************
*** 1542,1544 ****
--- 1549,1554 ----
  @contents
  @bye
  
+ @ignore
+    arch-tag: ed48740a-410b-46ea-9387-c9a9252a3392
+ @end ignore