aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert J. Chassell2006-10-31 18:07:16 +0000
committerRobert J. Chassell2006-10-31 18:07:16 +0000
commitb096c3a92d0b7c38f6ab44ecb389d533a10c2ee9 (patch)
tree3d0f0a40433d7f5d414abb5ccbed9e9acb031d2e
parent6c850af4a10e64f86433e554c801cbe3fcd337d1 (diff)
downloademacs-b096c3a92d0b7c38f6ab44ecb389d533a10c2ee9.tar.gz
emacs-b096c3a92d0b7c38f6ab44ecb389d533a10c2ee9.zip
* emacs-lisp-intro.texi: Remove version reference for X colors.
Document `='. Remove mention that :eval was new in 21. Updated instance's edition-number to 3.01.
-rw-r--r--lispintro/ChangeLog6
-rw-r--r--lispintro/emacs-lisp-intro.texi36
2 files changed, 20 insertions, 22 deletions
diff --git a/lispintro/ChangeLog b/lispintro/ChangeLog
index bc9a128b1b9..324a5f6c746 100644
--- a/lispintro/ChangeLog
+++ b/lispintro/ChangeLog
@@ -7,7 +7,11 @@
7 now irrelevant. Updated Info file in ../info. Changed numbering 7 now irrelevant. Updated Info file in ../info. Changed numbering
8 so is now Revised Third Edition and this instance's edition-number 8 so is now Revised Third Edition and this instance's edition-number
9 is 3.00. Did not update ISBN number. 9 is 3.00. Did not update ISBN number.
10 10
11 * emacs-lisp-intro.texi: Remove version reference for X colors.
12 Document `='. Remove mention that :eval was new in 21. Updated
13 instance's edition-number to 3.01.
14
112006-10-30 Robert J. Chassell <bob@rattlesnake.com> 152006-10-30 Robert J. Chassell <bob@rattlesnake.com>
12 16
13 * emacs-lisp-intro.texi: Many changes since it turned out that 17 * emacs-lisp-intro.texi: Many changes since it turned out that
diff --git a/lispintro/emacs-lisp-intro.texi b/lispintro/emacs-lisp-intro.texi
index 6d1f9bf88fe..77d2252b671 100644
--- a/lispintro/emacs-lisp-intro.texi
+++ b/lispintro/emacs-lisp-intro.texi
@@ -24,7 +24,7 @@
24 24
25@comment %**end of header 25@comment %**end of header
26 26
27@set edition-number 3.00 27@set edition-number 3.01
28@set update-date 2006 Oct 31 28@set update-date 2006 Oct 31
29 29
30@ignore 30@ignore
@@ -731,7 +731,7 @@ Your @file{.emacs} File
731* Loading Files:: Load (i.e., evaluate) files automatically. 731* Loading Files:: Load (i.e., evaluate) files automatically.
732* Autoload:: Make functions available. 732* Autoload:: Make functions available.
733* Simple Extension:: Define a function; bind it to a key. 733* Simple Extension:: Define a function; bind it to a key.
734* X11 Colors:: Colors in version 19 in X. 734* X11 Colors:: Colors in X.
735* Miscellaneous:: 735* Miscellaneous::
736* Mode Line:: How to customize your mode line. 736* Mode Line:: How to customize your mode line.
737 737
@@ -4526,6 +4526,10 @@ tests whether the first argument is less than or equal to the second and
4526the second. In all cases, both arguments must be numbers or markers 4526the second. In all cases, both arguments must be numbers or markers
4527(markers indicate positions in buffers). 4527(markers indicate positions in buffers).
4528 4528
4529@item =
4530The @code{=} function tests whether two arguments, , both numbers or
4531markers, are equal.
4532
4529@item string< 4533@item string<
4530@itemx string-lessp 4534@itemx string-lessp
4531@itemx string= 4535@itemx string=
@@ -15730,15 +15734,6 @@ nil
15730@end group 15734@end group
15731@end smallexample 15735@end smallexample
15732 15736
15733@ignore
15734(directory-files-and-attributes "/usr/local/src/emacs/lisp/mail/") -->
15735(("." t 3 1000 100 (17733 1296) (17718 8756) (17718 8756) 4096 "drwxr-xr-x" nil 1273504 773))
15736
15737(directory-files-and-attributes "/usr/local/src/emacs/lisp/") -->
15738(... ("mail" t 3 1000 100 (17733 1296) (17718 8756) (17718 8756) 4096
15739"drwxr-xr-x" nil 1273504 773) ...)
15740@end ignore
15741
15742@need 1200 15737@need 1200
15743On the other hand, @file{mail/} is a directory within the @file{lisp/} 15738On the other hand, @file{mail/} is a directory within the @file{lisp/}
15744directory. The beginning of its listing looks like this: 15739directory. The beginning of its listing looks like this:
@@ -17172,8 +17167,8 @@ initialization file, which is usually called @file{.emacs}.
17172I myself use @code{customize} for hardly anything. Mostly, I write 17167I myself use @code{customize} for hardly anything. Mostly, I write
17173expressions myself. 17168expressions myself.
17174 17169
17175@findex defsubst 17170@findex defsubst
17176@findex defconst 17171@findex defconst
17177Incidentally, @code{defsubst} defines an inline function. The syntax 17172Incidentally, @code{defsubst} defines an inline function. The syntax
17178is just like that of @code{defun}. @code{defconst} defines a symbol 17173is just like that of @code{defun}. @code{defconst} defines a symbol
17179as a constant. The intent is that neither programs nor users should 17174as a constant. The intent is that neither programs nor users should
@@ -18308,13 +18303,12 @@ this number. (Buffer names can and often should be longer than 12
18308characters; this length works well in a typical 80 column wide 18303characters; this length works well in a typical 80 column wide
18309window.) 18304window.)
18310 18305
18311@code{:eval} was a new feature in GNU Emacs version 21. It says to 18306@code{:eval} says to evaluate the following form and use the result as
18312evaluate the following form and use the result as a string to display. 18307a string to display. In this case, the expression displays the first
18313In this case, the expression displays the first component of the full 18308component of the full system name. The end of the first component is
18314system name. The end of the first component is a @samp{.} (`period'), 18309a @samp{.} (`period'), so I use the @code{string-match} function to
18315so I use the @code{string-match} function to tell me the length of the 18310tell me the length of the first component. The substring from the
18316first component. The substring from the zeroth character to that 18311zeroth character to that length is the name of the machine.
18317length is the name of the machine.
18318 18312
18319@need 1250 18313@need 1250
18320This is the expression: 18314This is the expression:
@@ -19491,7 +19485,7 @@ element.
19491Incidentally, both @code{kill-ring} and @code{kill-ring-yank-pointer} 19485Incidentally, both @code{kill-ring} and @code{kill-ring-yank-pointer}
19492are @dfn{global variables}. That means that any expression in Emacs 19486are @dfn{global variables}. That means that any expression in Emacs
19493Lisp can access them. They are not like the local variables set by 19487Lisp can access them. They are not like the local variables set by
19494@code{let} or like the symbols in an argument list. 19488@code{let} or like the symbols in an argument list.
19495Local variables can only be accessed 19489Local variables can only be accessed
19496within the @code{let} that defines them or the function that specifies 19490within the @code{let} that defines them or the function that specifies
19497them in an argument list (and within expressions called by them). 19491them in an argument list (and within expressions called by them).