diff options
| author | Chong Yidong | 2011-07-09 23:11:47 -0400 |
|---|---|---|
| committer | Chong Yidong | 2011-07-09 23:11:47 -0400 |
| commit | 6cfd0fa2de12047b5f29963ae5c7dc2ea481100d (patch) | |
| tree | 03fbb1da0cd0518319f928838d4d8eb292703b1f | |
| parent | 7847b2a1dddfec08e68cf23890da38e2b1ea3045 (diff) | |
| download | emacs-6cfd0fa2de12047b5f29963ae5c7dc2ea481100d.tar.gz emacs-6cfd0fa2de12047b5f29963ae5c7dc2ea481100d.zip | |
Remove Syntax node from Emacs manual.
This node served no purpose in the Customization section.
* doc/emacs/custom.texi (Syntax): Node deleted.
* doc/emacs/emacs.texi (Top): Update node listing.
* doc/emacs/help.texi (Help Summary):
* doc/emacs/major.texi (Major Modes):
* doc/emacs/programs.texi (Parentheses):
* doc/emacs/search.texi (Regexp Backslash, Regexp Backslash)
(Regexp Backslash):
* doc/emacs/text.texi (Words): Callers changed.
| -rw-r--r-- | doc/emacs/ChangeLog | 9 | ||||
| -rw-r--r-- | doc/emacs/custom.texi | 32 | ||||
| -rw-r--r-- | doc/emacs/emacs.texi | 20 | ||||
| -rw-r--r-- | doc/emacs/glossary.texi | 5 | ||||
| -rw-r--r-- | doc/emacs/help.texi | 10 | ||||
| -rw-r--r-- | doc/emacs/killing.texi | 2 | ||||
| -rw-r--r-- | doc/emacs/major.texi | 1 | ||||
| -rw-r--r-- | doc/emacs/programs.texi | 5 | ||||
| -rw-r--r-- | doc/emacs/search.texi | 13 | ||||
| -rw-r--r-- | doc/emacs/text.texi | 7 |
10 files changed, 43 insertions, 61 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 8b373b3967c..1b2588fec58 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,5 +1,14 @@ | |||
| 1 | 2011-07-10 Chong Yidong <cyd@stupidchicken.com> | 1 | 2011-07-10 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 2 | ||
| 3 | * custom.texi (Syntax): Node deleted. | ||
| 4 | |||
| 5 | * help.texi (Help Summary): | ||
| 6 | * major.texi (Major Modes): | ||
| 7 | * programs.texi (Parentheses): | ||
| 8 | * search.texi (Regexp Backslash, Regexp Backslash) | ||
| 9 | (Regexp Backslash): | ||
| 10 | * text.texi (Words): Callers changed. | ||
| 11 | |||
| 3 | * text.texi (Refill, Longlines): Delete nodes. | 12 | * text.texi (Refill, Longlines): Delete nodes. |
| 4 | 13 | ||
| 5 | * ack.texi (Acknowledgments): Longlines removed from manual. | 14 | * ack.texi (Acknowledgments): Longlines removed from manual. |
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index 434c574ac42..4ecbb0c42cc 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi | |||
| @@ -31,8 +31,6 @@ Reference Manual}. | |||
| 31 | you can control their functioning. | 31 | you can control their functioning. |
| 32 | * Key Bindings:: The keymaps say what command each key runs. | 32 | * Key Bindings:: The keymaps say what command each key runs. |
| 33 | By changing them, you can "redefine keys". | 33 | By changing them, you can "redefine keys". |
| 34 | * Syntax:: The syntax table controls how words and | ||
| 35 | expressions are parsed. | ||
| 36 | * Init File:: How to write common customizations in the | 34 | * Init File:: How to write common customizations in the |
| 37 | @file{.emacs} file. | 35 | @file{.emacs} file. |
| 38 | @end menu | 36 | @end menu |
| @@ -2085,36 +2083,6 @@ invoke it; disabling also applies if the command is invoked using | |||
| 2085 | @kbd{M-x}. However, disabling a command has no effect on calling it | 2083 | @kbd{M-x}. However, disabling a command has no effect on calling it |
| 2086 | as a function from Lisp programs. | 2084 | as a function from Lisp programs. |
| 2087 | 2085 | ||
| 2088 | @node Syntax | ||
| 2089 | @section The Syntax Table | ||
| 2090 | @cindex syntax table | ||
| 2091 | |||
| 2092 | All the Emacs commands which parse words or balance parentheses are | ||
| 2093 | controlled by the @dfn{syntax table}. The syntax table says which | ||
| 2094 | characters are opening delimiters, which are parts of words, which are | ||
| 2095 | string quotes, and so on. It does this by assigning each character to | ||
| 2096 | one of fifteen-odd @dfn{syntax classes}. In some cases it specifies | ||
| 2097 | some additional information also. | ||
| 2098 | |||
| 2099 | Each major mode has its own syntax table (though related major modes | ||
| 2100 | sometimes share one syntax table), which it installs in each buffer | ||
| 2101 | that uses the mode. The syntax table installed in the current buffer | ||
| 2102 | is the one that all commands use, so we call it ``the'' syntax table. | ||
| 2103 | |||
| 2104 | @kindex C-h s | ||
| 2105 | @findex describe-syntax | ||
| 2106 | To display a description of the contents of the current syntax | ||
| 2107 | table, type @kbd{C-h s} (@code{describe-syntax}). The description of | ||
| 2108 | each character includes the string you would have to give to | ||
| 2109 | @code{modify-syntax-entry} to set up that character's current syntax, | ||
| 2110 | starting with the character which designates its syntax class, plus | ||
| 2111 | some English text to explain its meaning. | ||
| 2112 | |||
| 2113 | A syntax table is actually a Lisp object, a char-table, whose | ||
| 2114 | elements are cons cells. For full information on the syntax table, | ||
| 2115 | see @ref{Syntax Tables,, Syntax Tables, elisp, The Emacs Lisp | ||
| 2116 | Reference Manual}. | ||
| 2117 | |||
| 2118 | @node Init File | 2086 | @node Init File |
| 2119 | @section The Init File, @file{~/.emacs} | 2087 | @section The Init File, @file{~/.emacs} |
| 2120 | @cindex init file | 2088 | @cindex init file |
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index 6758b82abb3..c0f1712bada 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi | |||
| @@ -168,15 +168,13 @@ Important Text-Changing Commands | |||
| 168 | * Killing:: Killing (cutting) text. | 168 | * Killing:: Killing (cutting) text. |
| 169 | * Yanking:: Recovering killed text. Moving text. (Pasting.) | 169 | * Yanking:: Recovering killed text. Moving text. (Pasting.) |
| 170 | * Accumulating Text:: Other ways of copying text. | 170 | * Accumulating Text:: Other ways of copying text. |
| 171 | * Rectangles:: Operating on the text inside a rectangle on the screen. | 171 | * Rectangles:: Operating on text in rectangular areas. |
| 172 | * CUA Bindings:: Using @kbd{C-x}, @kbd{C-c}, @kbd{C-v} for copy | 172 | * CUA Bindings:: Using @kbd{C-x}, @kbd{C-c}, @kbd{C-v} to kill and yank. |
| 173 | and paste, with enhanced rectangle support. | ||
| 174 | * Registers:: Saving a text string or a location in the buffer. | 173 | * Registers:: Saving a text string or a location in the buffer. |
| 175 | * Display:: Controlling what text is displayed. | 174 | * Display:: Controlling what text is displayed. |
| 176 | * Search:: Finding or replacing occurrences of a string. | 175 | * Search:: Finding or replacing occurrences of a string. |
| 177 | * Fixit:: Commands especially useful for fixing typos. | 176 | * Fixit:: Commands especially useful for fixing typos. |
| 178 | * Keyboard Macros:: A keyboard macro records a sequence of | 177 | * Keyboard Macros:: Recording a sequence of keystrokes to be replayed. |
| 179 | keystrokes to be replayed with a single command. | ||
| 180 | 178 | ||
| 181 | Major Structures of Emacs | 179 | Major Structures of Emacs |
| 182 | * Files:: All about handling files. | 180 | * Files:: All about handling files. |
| @@ -192,7 +190,7 @@ Advanced Features | |||
| 192 | * Programs:: Commands and modes for editing programs. | 190 | * Programs:: Commands and modes for editing programs. |
| 193 | * Building:: Compiling, running and debugging programs. | 191 | * Building:: Compiling, running and debugging programs. |
| 194 | * Maintaining:: Features for maintaining large programs. | 192 | * Maintaining:: Features for maintaining large programs. |
| 195 | * Abbrevs:: How to define text abbreviations to reduce | 193 | * Abbrevs:: Defining text abbreviations to reduce |
| 196 | the number of characters you must type. | 194 | the number of characters you must type. |
| 197 | @c AFAICS, the tex stuff generates its own index and does not use this one. | 195 | @c AFAICS, the tex stuff generates its own index and does not use this one. |
| 198 | @ifnottex | 196 | @ifnottex |
| @@ -204,9 +202,9 @@ Advanced Features | |||
| 204 | * Dired:: You can ``edit'' a directory to manage files in it. | 202 | * Dired:: You can ``edit'' a directory to manage files in it. |
| 205 | * Calendar/Diary:: The calendar and diary facilities. | 203 | * Calendar/Diary:: The calendar and diary facilities. |
| 206 | * Document View:: Viewing PDF, PS and DVI files. | 204 | * Document View:: Viewing PDF, PS and DVI files. |
| 207 | * Gnus:: How to read netnews with Emacs. | 205 | * Gnus:: A flexible mail and news reader. |
| 208 | * Shell:: Executing shell commands from Emacs. | 206 | * Shell:: Executing shell commands from Emacs. |
| 209 | * Emacs Server:: Using Emacs as an editing server for @code{mail}, etc. | 207 | * Emacs Server:: Using Emacs as an editing server. |
| 210 | * Printing:: Printing hardcopies of buffers or regions. | 208 | * Printing:: Printing hardcopies of buffers or regions. |
| 211 | * Sorting:: Sorting lines, paragraphs or pages within Emacs. | 209 | * Sorting:: Sorting lines, paragraphs or pages within Emacs. |
| 212 | * Narrowing:: Restricting display and editing to a portion | 210 | * Narrowing:: Restricting display and editing to a portion |
| @@ -1066,10 +1064,8 @@ Customization | |||
| 1066 | * Variables:: Many Emacs commands examine Emacs variables | 1064 | * Variables:: Many Emacs commands examine Emacs variables |
| 1067 | to decide what to do; by setting variables, | 1065 | to decide what to do; by setting variables, |
| 1068 | you can control their functioning. | 1066 | you can control their functioning. |
| 1069 | * Key Bindings:: The keymaps say what command each key runs. | 1067 | * Key Bindings:: Keymaps say what command each key runs. |
| 1070 | By changing them, you can "redefine keys". | 1068 | By changing them, you can ``redefine'' keys. |
| 1071 | * Syntax:: The syntax table controls how words and | ||
| 1072 | expressions are parsed. | ||
| 1073 | * Init File:: How to write common customizations in the | 1069 | * Init File:: How to write common customizations in the |
| 1074 | @file{.emacs} file. | 1070 | @file{.emacs} file. |
| 1075 | 1071 | ||
diff --git a/doc/emacs/glossary.texi b/doc/emacs/glossary.texi index 3cf1cc522bf..e37e80bfab8 100644 --- a/doc/emacs/glossary.texi +++ b/doc/emacs/glossary.texi | |||
| @@ -962,7 +962,7 @@ special Emacs commands for moving over and operating on paragraphs. | |||
| 962 | @item Parsing | 962 | @item Parsing |
| 963 | We say that certain Emacs commands parse words or expressions in the | 963 | We say that certain Emacs commands parse words or expressions in the |
| 964 | text being edited. Really, all they know how to do is find the other | 964 | text being edited. Really, all they know how to do is find the other |
| 965 | end of a word or expression. @xref{Syntax}. | 965 | end of a word or expression. |
| 966 | 966 | ||
| 967 | @item Point | 967 | @item Point |
| 968 | Point is the place in the buffer at which insertion and deletion | 968 | Point is the place in the buffer at which insertion and deletion |
| @@ -1212,7 +1212,8 @@ See `font lock.' | |||
| 1212 | @item Syntax Table | 1212 | @item Syntax Table |
| 1213 | The syntax table tells Emacs which characters are part of a word, | 1213 | The syntax table tells Emacs which characters are part of a word, |
| 1214 | which characters balance each other like parentheses, etc. | 1214 | which characters balance each other like parentheses, etc. |
| 1215 | @xref{Syntax}. | 1215 | @xref{Syntax Tables,, Syntax Tables, elisp, The Emacs Lisp Reference |
| 1216 | Manual}. | ||
| 1216 | 1217 | ||
| 1217 | @item Super | 1218 | @item Super |
| 1218 | Super is the name of a modifier bit that a keyboard input character may | 1219 | Super is the name of a modifier bit that a keyboard input character may |
diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi index e00f8b9115a..76a9f2413b1 100644 --- a/doc/emacs/help.texi +++ b/doc/emacs/help.texi | |||
| @@ -139,8 +139,11 @@ command. | |||
| 139 | @item C-h r | 139 | @item C-h r |
| 140 | Display the Emacs manual in Info (@code{info-emacs-manual}). | 140 | Display the Emacs manual in Info (@code{info-emacs-manual}). |
| 141 | @item C-h s | 141 | @item C-h s |
| 142 | Display the current contents of the syntax table, with an explanation of | 142 | Display the current contents of the @dfn{syntax table}, with an |
| 143 | what they mean (@code{describe-syntax}). @xref{Syntax}. | 143 | explanation of what they mean (@code{describe-syntax}). The syntax |
| 144 | table says which characters are opening delimiters, which are parts of | ||
| 145 | words, which are string quotes, and so on. @xref{Syntax Tables,, | ||
| 146 | Syntax Tables, elisp, The Emacs Lisp Reference Manual}, for details. | ||
| 144 | @item C-h t | 147 | @item C-h t |
| 145 | Enter the Emacs interactive tutorial (@code{help-with-tutorial}). | 148 | Enter the Emacs interactive tutorial (@code{help-with-tutorial}). |
| 146 | @item C-h v @var{var} @key{RET} | 149 | @item C-h v @var{var} @key{RET} |
| @@ -583,7 +586,8 @@ bindings now in effect: first the local bindings of the current minor | |||
| 583 | modes, then the local bindings defined by the current major mode, and | 586 | modes, then the local bindings defined by the current major mode, and |
| 584 | finally the global bindings (@pxref{Key Bindings}). @kbd{C-h s} | 587 | finally the global bindings (@pxref{Key Bindings}). @kbd{C-h s} |
| 585 | displays the contents of the syntax table, with explanations of each | 588 | displays the contents of the syntax table, with explanations of each |
| 586 | character's syntax (@pxref{Syntax}). | 589 | character's syntax (@pxref{Syntax Tables,, Syntax Tables, elisp, The |
| 590 | Emacs Lisp Reference Manual}). | ||
| 587 | 591 | ||
| 588 | You can get a list of subcommands for a particular prefix key by | 592 | You can get a list of subcommands for a particular prefix key by |
| 589 | typing @kbd{C-h} after the prefix key. (There are a few prefix keys | 593 | typing @kbd{C-h} after the prefix key. (There are a few prefix keys |
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi index 41262e9c2d8..2ee2bd9be05 100644 --- a/doc/emacs/killing.texi +++ b/doc/emacs/killing.texi | |||
| @@ -19,7 +19,7 @@ units. | |||
| 19 | * Yanking:: Commands that insert text. | 19 | * Yanking:: Commands that insert text. |
| 20 | * Accumulating Text:: Other methods to add text to the buffer. | 20 | * Accumulating Text:: Other methods to add text to the buffer. |
| 21 | * Rectangles:: Operating on text in rectangular areas. | 21 | * Rectangles:: Operating on text in rectangular areas. |
| 22 | * CUA Bindings:: Using C-x/C-c/C-v to kill and yank. | 22 | * CUA Bindings:: Using @kbd{C-x}/@kbd{C-c}/@kbd{C-v} to kill and yank. |
| 23 | @end menu | 23 | @end menu |
| 24 | 24 | ||
| 25 | @node Deletion and Killing | 25 | @node Deletion and Killing |
diff --git a/doc/emacs/major.texi b/doc/emacs/major.texi index 9256c712f02..ff73e568311 100644 --- a/doc/emacs/major.texi +++ b/doc/emacs/major.texi | |||
| @@ -31,7 +31,6 @@ prefix key @kbd{C-c} normally contains mode-specific commands. In | |||
| 31 | addition, the commands which handle comments use the mode to determine | 31 | addition, the commands which handle comments use the mode to determine |
| 32 | how comments are to be delimited. Many major modes redefine the | 32 | how comments are to be delimited. Many major modes redefine the |
| 33 | syntactical properties of characters appearing in the buffer. | 33 | syntactical properties of characters appearing in the buffer. |
| 34 | @xref{Syntax}. | ||
| 35 | 34 | ||
| 36 | The major modes fall into three major groups. The first group | 35 | The major modes fall into three major groups. The first group |
| 37 | contains modes for normal text, either plain or with mark-up. It | 36 | contains modes for normal text, either plain or with mark-up. It |
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi index 803f6b6ce49..870986d421a 100644 --- a/doc/emacs/programs.texi +++ b/doc/emacs/programs.texi | |||
| @@ -643,8 +643,9 @@ balanced. | |||
| 643 | When talking about these facilities, the term ``parenthesis'' also | 643 | When talking about these facilities, the term ``parenthesis'' also |
| 644 | includes braces, brackets, or whatever delimiters are defined to match | 644 | includes braces, brackets, or whatever delimiters are defined to match |
| 645 | in pairs. The major mode controls which delimiters are significant, | 645 | in pairs. The major mode controls which delimiters are significant, |
| 646 | through the syntax table (@pxref{Syntax}). In Lisp, only parentheses | 646 | through the syntax table (@pxref{Syntax Tables,, Syntax Tables, elisp, |
| 647 | count; in C, these commands apply to braces and brackets too. | 647 | The Emacs Lisp Reference Manual}). In Lisp, only parentheses count; |
| 648 | in C, these commands apply to braces and brackets too. | ||
| 648 | 649 | ||
| 649 | You can use @kbd{M-x check-parens} to find any unbalanced | 650 | You can use @kbd{M-x check-parens} to find any unbalanced |
| 650 | parentheses and unbalanced string quotes in the buffer. | 651 | parentheses and unbalanced string quotes in the buffer. |
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi index b5d426210aa..015f9529b73 100644 --- a/doc/emacs/search.texi +++ b/doc/emacs/search.texi | |||
| @@ -870,8 +870,9 @@ matches at the end of the buffer only if the contents end with a | |||
| 870 | word-constituent character. | 870 | word-constituent character. |
| 871 | 871 | ||
| 872 | @item \w | 872 | @item \w |
| 873 | matches any word-constituent character. The syntax table | 873 | matches any word-constituent character. The syntax table determines |
| 874 | determines which characters these are. @xref{Syntax}. | 874 | which characters these are. @xref{Syntax Tables,, Syntax Tables, |
| 875 | elisp, The Emacs Lisp Reference Manual}. | ||
| 875 | 876 | ||
| 876 | @item \W | 877 | @item \W |
| 877 | matches any character that is not a word-constituent. | 878 | matches any character that is not a word-constituent. |
| @@ -892,7 +893,8 @@ symbol-constituent character. | |||
| 892 | matches any character whose syntax is @var{c}. Here @var{c} is a | 893 | matches any character whose syntax is @var{c}. Here @var{c} is a |
| 893 | character that designates a particular syntax class: thus, @samp{w} | 894 | character that designates a particular syntax class: thus, @samp{w} |
| 894 | for word constituent, @samp{-} or @samp{ } for whitespace, @samp{.} | 895 | for word constituent, @samp{-} or @samp{ } for whitespace, @samp{.} |
| 895 | for ordinary punctuation, etc. @xref{Syntax}. | 896 | for ordinary punctuation, etc. @xref{Syntax Tables,, Syntax Tables, |
| 897 | elisp, The Emacs Lisp Reference Manual}. | ||
| 896 | 898 | ||
| 897 | @item \S@var{c} | 899 | @item \S@var{c} |
| 898 | matches any character whose syntax is not @var{c}. | 900 | matches any character whose syntax is not @var{c}. |
| @@ -911,8 +913,9 @@ matches any character that does @emph{not} belong to category | |||
| 911 | @var{c}. | 913 | @var{c}. |
| 912 | @end table | 914 | @end table |
| 913 | 915 | ||
| 914 | The constructs that pertain to words and syntax are controlled by the | 916 | The constructs that pertain to words and syntax are controlled by |
| 915 | setting of the syntax table (@pxref{Syntax}). | 917 | the setting of the syntax table. @xref{Syntax Tables,, Syntax Tables, |
| 918 | elisp, The Emacs Lisp Reference Manual}. | ||
| 916 | 919 | ||
| 917 | @node Regexp Example | 920 | @node Regexp Example |
| 918 | @section Regular Expression Example | 921 | @section Regular Expression Example |
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi index 77e3035915e..dbda771e6a3 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi | |||
| @@ -154,9 +154,10 @@ the mark by one additional word. @kbd{M-@@} also accepts a numeric | |||
| 154 | argument that says how many words to scan for the place to put the | 154 | argument that says how many words to scan for the place to put the |
| 155 | mark. | 155 | mark. |
| 156 | 156 | ||
| 157 | The word commands' understanding of word boundaries is controlled | 157 | The word commands' understanding of word boundaries is controlled by |
| 158 | by the syntax table. Any character can, for example, be declared to | 158 | the syntax table. Any character can, for example, be declared to be a |
| 159 | be a word delimiter. @xref{Syntax}. | 159 | word delimiter. @xref{Syntax Tables,, Syntax Tables, elisp, The Emacs |
| 160 | Lisp Reference Manual}. | ||
| 160 | 161 | ||
| 161 | @node Sentences | 162 | @node Sentences |
| 162 | @section Sentences | 163 | @section Sentences |