diff options
| -rw-r--r-- | man/glossary.texi | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/man/glossary.texi b/man/glossary.texi index bc07c0b4058..de8c26fad3d 100644 --- a/man/glossary.texi +++ b/man/glossary.texi | |||
| @@ -66,11 +66,17 @@ editing session. Emacs makes backup files automatically to help you | |||
| 66 | track down or cancel changes you later regret making. @xref{Backup}. | 66 | track down or cancel changes you later regret making. @xref{Backup}. |
| 67 | 67 | ||
| 68 | @item Balance Parentheses | 68 | @item Balance Parentheses |
| 69 | Emacs can balance parentheses manually or automatically. Manual | 69 | Emacs can balance parentheses (or other matching delimiters) either |
| 70 | balancing is done by the commands to move over balanced expressions | 70 | manually or automatically. Manual balancing is done by the commands |
| 71 | (@pxref{Lists}). Automatic balancing is done by blinking or | 71 | to move over parenthetical groupings (@pxref{Moving by Parens}). |
| 72 | highlighting the parenthesis that matches one just inserted | 72 | Automatic balancing is done by blinking or highlighting the delimiter |
| 73 | (@pxref{Matching,,Matching Parens}). | 73 | that matches the one you just inserted (@pxref{Matching,,Matching |
| 74 | Parens}). | ||
| 75 | |||
| 76 | @item Balanced Expressions | ||
| 77 | A balanced expression is a syntactically recognizable expression, such | ||
| 78 | as a symbol, number, string constant, block, parenthesized expression | ||
| 79 | in C. @xref{Expressions,Balanced Expressions}. | ||
| 74 | 80 | ||
| 75 | @item Balloon Help | 81 | @item Balloon Help |
| 76 | See `tooltips.' | 82 | See `tooltips.' |
| @@ -290,9 +296,9 @@ it is interpreted relative to the current buffer's default directory. | |||
| 290 | @xref{Minibuffer File,Default Directory}. | 296 | @xref{Minibuffer File,Default Directory}. |
| 291 | 297 | ||
| 292 | @item Defun | 298 | @item Defun |
| 293 | A defun is a list at the top level of parenthesis or bracket structure | 299 | A defun is a major definition at the top level in a program. The name |
| 294 | in a program. It is so named because most such lists in Lisp programs | 300 | comes from Lisp, where most such definitions use the construct |
| 295 | are calls to the Lisp function @code{defun}. @xref{Defuns}. | 301 | @code{defun}. @xref{Defuns}. |
| 296 | 302 | ||
| 297 | @item @key{DEL} | 303 | @item @key{DEL} |
| 298 | @key{DEL} is a character that runs the command to delete one character of | 304 | @key{DEL} is a character that runs the command to delete one character of |
| @@ -399,6 +405,9 @@ like the @key{SHIFT} key, is held down while another character is | |||
| 399 | typed), you press the @key{ESC} key as you would press a letter key, and | 405 | typed), you press the @key{ESC} key as you would press a letter key, and |
| 400 | it applies to the next character you type. | 406 | it applies to the next character you type. |
| 401 | 407 | ||
| 408 | @item Expression | ||
| 409 | See `balanced expression.' | ||
| 410 | |||
| 402 | @item Expunging | 411 | @item Expunging |
| 403 | Expunging an Rmail file or Dired buffer or a Gnus newsgroup buffer is an | 412 | Expunging an Rmail file or Dired buffer or a Gnus newsgroup buffer is an |
| 404 | operation that truly discards the messages or files you have previously | 413 | operation that truly discards the messages or files you have previously |
| @@ -674,7 +683,7 @@ parenthesis and ending with the matching close parenthesis. In C mode | |||
| 674 | and other non-Lisp modes, groupings surrounded by other kinds of matched | 683 | and other non-Lisp modes, groupings surrounded by other kinds of matched |
| 675 | delimiters appropriate to the language, such as braces, are also | 684 | delimiters appropriate to the language, such as braces, are also |
| 676 | considered lists. Emacs has special commands for many operations on | 685 | considered lists. Emacs has special commands for many operations on |
| 677 | lists. @xref{Lists}. | 686 | lists. @xref{Moving by Parens}. |
| 678 | 687 | ||
| 679 | @item Local | 688 | @item Local |
| 680 | Local means ``in effect only in a particular context''; the relevant | 689 | Local means ``in effect only in a particular context''; the relevant |
| @@ -1044,11 +1053,11 @@ Emacs has commands for moving by or killing by sentences. | |||
| 1044 | @xref{Sentences}. | 1053 | @xref{Sentences}. |
| 1045 | 1054 | ||
| 1046 | @item Sexp | 1055 | @item Sexp |
| 1047 | A sexp (short for ``s-expression'') is the basic syntactic unit of Lisp | 1056 | A sexp (short for ``s-expression'') is the basic syntactic unit of |
| 1048 | in its textual form: either a list, or Lisp atom. Many Emacs commands | 1057 | Lisp in its textual form: either a list, or Lisp atom. Sexps are also |
| 1049 | operate on sexps. The term `sexp' is generalized to languages other | 1058 | the balanced expressions (q.v.@:) of the Lisp language; this is why |
| 1050 | than Lisp, to mean a syntactically recognizable expression, such as a | 1059 | the commands for editing balanced expressions have `sexp' in their |
| 1051 | block or a parenthesized expression in C. @xref{Lists,Sexps}. | 1060 | name. @xref{Expressions,Sexps}. |
| 1052 | 1061 | ||
| 1053 | @item Simultaneous Editing | 1062 | @item Simultaneous Editing |
| 1054 | Simultaneous editing means two users modifying the same file at once. | 1063 | Simultaneous editing means two users modifying the same file at once. |
| @@ -1160,7 +1169,7 @@ level by aborting (q.v.@:) and quitting (q.v.@:). @xref{Quitting}. | |||
| 1160 | @item Transposition | 1169 | @item Transposition |
| 1161 | Transposing two units of text means putting each one into the place | 1170 | Transposing two units of text means putting each one into the place |
| 1162 | formerly occupied by the other. There are Emacs commands to transpose | 1171 | formerly occupied by the other. There are Emacs commands to transpose |
| 1163 | two adjacent characters, words, sexps (q.v.@:) or lines | 1172 | two adjacent characters, words, balanced expressions (q.v.@:) or lines |
| 1164 | (@pxref{Transpose}). | 1173 | (@pxref{Transpose}). |
| 1165 | 1174 | ||
| 1166 | @item Truncation | 1175 | @item Truncation |