From cf98857824ddf9e195f3dd8ed215dadb19ae0884 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 26 Apr 2012 13:56:38 -0400 Subject: [PATCH] Some menu fixes for doc/lispref * doc/lispref/elisp.texi, doc/lispref/vol1.texi, doc/lispref/vol2.texi: Some fixes for detailed menu. * doc/lispref/modes.texi (Major Modes, Auto-Indentation): * doc/lispref/buffers.texi (Buffers): Some fixes for menu descriptions. --- doc/lispref/ChangeLog | 6 ++++++ doc/lispref/buffers.texi | 2 +- doc/lispref/elisp.texi | 38 +++++++++++++++++++++++++++----------- doc/lispref/modes.texi | 20 ++++++++++---------- doc/lispref/vol1.texi | 39 ++++++++++++++++++++++++++++----------- doc/lispref/vol2.texi | 35 ++++++++++++++++++++++++++--------- 6 files changed, 98 insertions(+), 42 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 401b674f98b..c66fed1ca04 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,9 @@ +2012-04-26 Glenn Morris + + * elisp.texi, vol1.texi, vol2.texi: Some fixes for detailed menu. + * modes.texi (Major Modes, Auto-Indentation): + * buffers.texi (Buffers): Some fixes for menu descriptions. + 2012-04-26 Stefan Monnier * functions.texi (Simple Lambda, Argument List): diff --git a/doc/lispref/buffers.texi b/doc/lispref/buffers.texi index fecf2decfc3..fa0cb117772 100644 --- a/doc/lispref/buffers.texi +++ b/doc/lispref/buffers.texi @@ -24,7 +24,7 @@ not be displayed in any windows. * Buffer File Name:: The buffer file name indicates which file is visited. * Buffer Modification:: A buffer is @dfn{modified} if it needs to be saved. * Modification Time:: Determining whether the visited file was changed - ``behind Emacs's back''. + "behind Emacs's back". * Read Only Buffers:: Modifying text is not allowed in a read-only buffer. * The Buffer List:: How to look at all the existing buffers. * Creating Buffers:: Functions that create buffers. diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index 058067fe209..9c5ae73f718 100644 --- a/doc/lispref/elisp.texi +++ b/doc/lispref/elisp.texi @@ -459,7 +459,7 @@ Functions * Closures:: Functions that enclose a lexical environment. * Obsolete Functions:: Declaring functions obsolete. * Inline Functions:: Defining functions that the compiler - will open code. + will expand inline. * Declaring Functions:: Telling the compiler that a function is defined. * Function Safety:: Determining whether a function is safe to call. * Related Topics:: Cross-references to specific Lisp primitives @@ -492,7 +492,7 @@ Common Problems Using Macros * Eval During Expansion:: Don't evaluate them; put them in the expansion. * Repeated Expansion:: Avoid depending on how many times expansion is done. -Writing Customization Definitions +Customization Settings * Common Keywords:: Common keyword arguments for all kinds of customization declarations. @@ -753,6 +753,7 @@ Defining Menus various features. * Menu Separators:: Drawing a horizontal line through a menu. * Alias Menu Items:: Using command aliases in menu items. +* Toolkit Differences:: Not all toolkits provide the same features. Major and Minor Modes @@ -823,6 +824,21 @@ Multiline Font Lock Constructs * Region to Refontify:: Controlling which region gets refontified after a buffer change. +Automatic Indentation of code + +* SMIE:: A simple minded indentation engine. + +Simple Minded Indentation Engine + +* SMIE setup:: SMIE setup and features. +* Operator Precedence Grammars:: A very simple parsing technique. +* SMIE Grammar:: Defining the grammar of a language. +* SMIE Lexer:: Defining tokens. +* SMIE Tricks:: Working around the parser's limitations. +* SMIE Indentation:: Specifying indentation rules. +* SMIE Indentation Helpers:: Helper functions for indentation rules. +* SMIE Indentation Example:: Sample indentation rules. + Documentation * Documentation Basics:: Where doc strings are defined and stored. @@ -1219,8 +1235,7 @@ Processes * Datagrams:: UDP network connections. * Low-Level Network:: Lower-level but more general function to create connections and servers. -* Misc Network:: Additional relevant functions for - network connections. +* Misc Network:: Additional relevant functions for net connections. * Serial Ports:: Communicating with serial ports. * Byte Packing:: Using bindat to pack and unpack binary data. @@ -1340,6 +1355,7 @@ Images * GIF Images:: Special features for GIF format. * TIFF Images:: Special features for TIFF format. * PostScript Images:: Special features for PostScript format. +* ImageMagick Images:: Special features available through ImageMagick. * Other Image Types:: Various other formats are supported. * Defining Images:: Convenient ways to define an image for later use. * Showing Images:: Convenient ways to display an image once @@ -1395,13 +1411,6 @@ Operating System Interface * Notifications:: Desktop notifications. * Dynamic Libraries:: On-demand loading of support libraries. -Preparing Lisp code for distribution - -* Packaging Basics:: The basic concepts of Emacs Lisp packages. -* Simple Packages:: How to package a single .el file. -* Multi-file Packages:: How to package multiple files. -* Package Archives:: Maintaining package archives. - Starting Up Emacs * Startup Summary:: Sequence of actions Emacs performs at startup. @@ -1420,6 +1429,13 @@ Terminal Input * Input Modes:: Options for how input is processed. * Recording Input:: Saving histories of recent or all input events. +Preparing Lisp code for distribution + +* Packaging Basics:: The basic concepts of Emacs Lisp packages. +* Simple Packages:: How to package a single .el file. +* Multi-file Packages:: How to package multiple files. +* Package Archives:: Maintaining package archives. + Tips and Conventions * Coding Conventions:: Conventions for clean and robust programs. diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index aaed86d3da3..e9be9f1763f 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi @@ -284,7 +284,7 @@ buffer is put in Fundamental mode (@pxref{Major Mode Conventions}). * Derived Modes:: Defining a new major mode based on another major mode. * Basic Major Modes:: Modes that other modes are often derived from. -* Mode Hooks:: Hooks run at the end of major mode commands. +* Mode Hooks:: Hooks run at the end of major mode functions. * Tabulated List Mode:: Parent mode for buffers containing tabulated data. * Generic Modes:: Defining a simple major mode that supports comment syntax and Font Lock mode. @@ -3375,7 +3375,7 @@ Another one is SMIE which takes an approach in the spirit of Lisp sexps and adapts it to non-Lisp languages. @menu -* SMIE:: A simple minded indentation engine +* SMIE:: A simple minded indentation engine. @end menu @node SMIE @@ -3401,14 +3401,14 @@ languages cannot be parsed correctly using SMIE, at least not without resorting to some special tricks (@pxref{SMIE Tricks}). @menu -* SMIE setup:: SMIE setup and features -* Operator Precedence Grammars:: A very simple parsing technique -* SMIE Grammar:: Defining the grammar of a language -* SMIE Lexer:: Defining tokens -* SMIE Tricks:: Working around the parser's limitations -* SMIE Indentation:: Specifying indentation rules -* SMIE Indentation Helpers:: Helper functions for indentation rules -* SMIE Indentation Example:: Sample indentation rules +* SMIE setup:: SMIE setup and features. +* Operator Precedence Grammars:: A very simple parsing technique. +* SMIE Grammar:: Defining the grammar of a language. +* SMIE Lexer:: Defining tokens. +* SMIE Tricks:: Working around the parser's limitations. +* SMIE Indentation:: Specifying indentation rules. +* SMIE Indentation Helpers:: Helper functions for indentation rules. +* SMIE Indentation Example:: Sample indentation rules. @end menu @node SMIE setup diff --git a/doc/lispref/vol1.texi b/doc/lispref/vol1.texi index 204c155680b..2687cd57d5a 100644 --- a/doc/lispref/vol1.texi +++ b/doc/lispref/vol1.texi @@ -479,7 +479,7 @@ Functions * Closures:: Functions that enclose a lexical environment. * Obsolete Functions:: Declaring functions obsolete. * Inline Functions:: Defining functions that the compiler - will open code. + will expand inline. * Declaring Functions:: Telling the compiler that a function is defined. * Function Safety:: Determining whether a function is safe to call. * Related Topics:: Cross-references to specific Lisp primitives @@ -512,7 +512,7 @@ Common Problems Using Macros * Eval During Expansion:: Don't evaluate them; put them in the expansion. * Repeated Expansion:: Avoid depending on how many times expansion is done. -Writing Customization Definitions +Customization Settings * Common Keywords:: Common keyword arguments for all kinds of customization declarations. @@ -775,6 +775,7 @@ Defining Menus various features. * Menu Separators:: Drawing a horizontal line through a menu. * Alias Menu Items:: Using command aliases in menu items. +* Toolkit Differences:: Not all toolkits provide the same features. Major and Minor Modes @@ -801,7 +802,7 @@ Major Modes * Derived Modes:: Defining a new major mode based on another major mode. * Basic Major Modes:: Modes that other modes are often derived from. -* Mode Hooks:: Hooks run at the end of major mode commands. +* Mode Hooks:: Hooks run at the end of major mode functions. * Tabulated List Mode:: Parent mode for buffers containing tabulated data. * Generic Modes:: Defining a simple major mode that supports comment syntax and Font Lock mode. @@ -845,6 +846,21 @@ Multiline Font Lock Constructs * Region to Refontify:: Controlling which region gets refontified after a buffer change. +Automatic Indentation of code + +* SMIE:: A simple minded indentation engine. + +Simple Minded Indentation Engine + +* SMIE setup:: SMIE setup and features. +* Operator Precedence Grammars:: A very simple parsing technique. +* SMIE Grammar:: Defining the grammar of a language. +* SMIE Lexer:: Defining tokens. +* SMIE Tricks:: Working around the parser's limitations. +* SMIE Indentation:: Specifying indentation rules. +* SMIE Indentation Helpers:: Helper functions for indentation rules. +* SMIE Indentation Example:: Sample indentation rules. + Documentation * Documentation Basics:: Where doc strings are defined and stored. @@ -1241,8 +1257,7 @@ Processes * Datagrams:: UDP network connections. * Low-Level Network:: Lower-level but more general function to create connections and servers. -* Misc Network:: Additional relevant functions for - network connections. +* Misc Network:: Additional relevant functions for net connections. * Serial Ports:: Communicating with serial ports. * Byte Packing:: Using bindat to pack and unpack binary data. @@ -1362,6 +1377,7 @@ Images * GIF Images:: Special features for GIF format. * TIFF Images:: Special features for TIFF format. * PostScript Images:: Special features for PostScript format. +* ImageMagick Images:: Special features available through ImageMagick. * Other Image Types:: Various other formats are supported. * Defining Images:: Convenient ways to define an image for later use. * Showing Images:: Convenient ways to display an image once @@ -1417,12 +1433,6 @@ Operating System Interface * Notifications:: Desktop notifications. * Dynamic Libraries:: On-demand loading of support libraries. -Preparing Lisp code for distribution - -* Packaging Basics:: The basic concepts of Emacs Lisp packages. -* Simple Packages:: How to package a single .el file. -* Multi-file Packages:: How to package multiple files. - Starting Up Emacs * Startup Summary:: Sequence of actions Emacs performs at startup. @@ -1441,6 +1451,13 @@ Terminal Input * Input Modes:: Options for how input is processed. * Recording Input:: Saving histories of recent or all input events. +Preparing Lisp code for distribution + +* Packaging Basics:: The basic concepts of Emacs Lisp packages. +* Simple Packages:: How to package a single .el file. +* Multi-file Packages:: How to package multiple files. +* Package Archives:: Maintaining package archives. + Tips and Conventions * Coding Conventions:: Conventions for clean and robust programs. diff --git a/doc/lispref/vol2.texi b/doc/lispref/vol2.texi index 97d357c4ace..c74e7c438b4 100644 --- a/doc/lispref/vol2.texi +++ b/doc/lispref/vol2.texi @@ -478,7 +478,7 @@ Functions * Closures:: Functions that enclose a lexical environment. * Obsolete Functions:: Declaring functions obsolete. * Inline Functions:: Defining functions that the compiler - will open code. + will expand inline. * Declaring Functions:: Telling the compiler that a function is defined. * Function Safety:: Determining whether a function is safe to call. * Related Topics:: Cross-references to specific Lisp primitives @@ -511,7 +511,7 @@ Common Problems Using Macros * Eval During Expansion:: Don't evaluate them; put them in the expansion. * Repeated Expansion:: Avoid depending on how many times expansion is done. -Writing Customization Definitions +Customization Settings * Common Keywords:: Common keyword arguments for all kinds of customization declarations. @@ -774,6 +774,7 @@ Defining Menus various features. * Menu Separators:: Drawing a horizontal line through a menu. * Alias Menu Items:: Using command aliases in menu items. +* Toolkit Differences:: Not all toolkits provide the same features. Major and Minor Modes @@ -800,7 +801,7 @@ Major Modes * Derived Modes:: Defining a new major mode based on another major mode. * Basic Major Modes:: Modes that other modes are often derived from. -* Mode Hooks:: Hooks run at the end of major mode commands. +* Mode Hooks:: Hooks run at the end of major mode functions. * Tabulated List Mode:: Parent mode for buffers containing tabulated data. * Generic Modes:: Defining a simple major mode that supports comment syntax and Font Lock mode. @@ -844,6 +845,21 @@ Multiline Font Lock Constructs * Region to Refontify:: Controlling which region gets refontified after a buffer change. +Automatic Indentation of code + +* SMIE:: A simple minded indentation engine. + +Simple Minded Indentation Engine + +* SMIE setup:: SMIE setup and features. +* Operator Precedence Grammars:: A very simple parsing technique. +* SMIE Grammar:: Defining the grammar of a language. +* SMIE Lexer:: Defining tokens. +* SMIE Tricks:: Working around the parser's limitations. +* SMIE Indentation:: Specifying indentation rules. +* SMIE Indentation Helpers:: Helper functions for indentation rules. +* SMIE Indentation Example:: Sample indentation rules. + Documentation * Documentation Basics:: Where doc strings are defined and stored. @@ -1361,6 +1377,7 @@ Images * GIF Images:: Special features for GIF format. * TIFF Images:: Special features for TIFF format. * PostScript Images:: Special features for PostScript format. +* ImageMagick Images:: Special features available through ImageMagick. * Other Image Types:: Various other formats are supported. * Defining Images:: Convenient ways to define an image for later use. * Showing Images:: Convenient ways to display an image once @@ -1416,12 +1433,6 @@ Operating System Interface * Notifications:: Desktop notifications. * Dynamic Libraries:: On-demand loading of support libraries. -Preparing Lisp code for distribution - -* Packaging Basics:: The basic concepts of Emacs Lisp packages. -* Simple Packages:: How to package a single .el file. -* Multi-file Packages:: How to package multiple files. - Starting Up Emacs * Startup Summary:: Sequence of actions Emacs performs at startup. @@ -1440,6 +1451,12 @@ Terminal Input * Input Modes:: Options for how input is processed. * Recording Input:: Saving histories of recent or all input events. +Preparing Lisp code for distribution + +* Packaging Basics:: The basic concepts of Emacs Lisp packages. +* Simple Packages:: How to package a single .el file. +* Multi-file Packages:: How to package multiple files. + Tips and Conventions * Coding Conventions:: Conventions for clean and robust programs. -- 2.11.4.GIT