diff options
Diffstat (limited to 'doc/lispintro')
| -rw-r--r-- | doc/lispintro/ChangeLog | 18 | ||||
| -rw-r--r-- | doc/lispintro/Makefile.in | 7 | ||||
| -rw-r--r-- | doc/lispintro/README | 37 | ||||
| -rw-r--r-- | doc/lispintro/emacs-lisp-intro.texi | 126 |
4 files changed, 62 insertions, 126 deletions
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index 5e4655506f6..4182b6a3184 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -1,3 +1,17 @@ +2013-07-06 Glenn Morris <rgm@gnu.org> + + * emacs-lisp-intro.texi (Top): + Move WWW_GNU_ORG section outside @copying, update URL. + +2013-07-03 Glenn Morris <rgm@gnu.org> + + * emacs-lisp-intro.texi (edebug): Fix cross-references. + +2013-06-19 Glenn Morris <rgm@gnu.org> + + * Makefile.in (dist): Edit more configure variables. (Bug#14660) + Try to check that we do not miss any in future. + 2013-04-24 Eli Zaretskii <eliz@gnu.org> * makefile.w32-in (INFO_OPTS): Add "-I$(emacsdir)" to fix last @@ -28,7 +42,7 @@ * emacs-lisp-intro.texi (defcustom, defun) (simplified-beginning-of-buffer, defvar, Building Robots, Review) (save-excursion): `defun' and `defcustom' are now macros rather - than special forms. (Bug#13853) + than special forms. (Bug#13853) 2013-03-16 Glenn Morris <rgm@gnu.org> @@ -48,7 +62,7 @@ 2012-12-14 Paul Eggert <eggert@cs.ucla.edu> - Fix permissions bugs with setgid directories etc. (Bug#13125) + Fix permissions bugs with setgid directories etc. (Bug#13125) * emacs-lisp-intro.texi (Files List): directory-files-and-attributes now outputs t for attribute that's now a placeholder. diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in index 338b4ad86c4..b60c752e92b 100644 --- a/doc/lispintro/Makefile.in +++ b/doc/lispintro/Makefile.in @@ -19,6 +19,8 @@ SHELL = /bin/sh +# NB If you add any more configure variables, +# update the sed rules in the dist target below. srcdir = @srcdir@ version=@version@ @@ -107,7 +109,12 @@ dist: -e 's/^\(buildinfodir *=\).*/\1 ./' \ -e 's/^\(clean:.*\)/\1 infoclean/' \ -e "s/@ver[s]ion@/${version}/" \ + -e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \ + -e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \ ${srcdir}/Makefile.in > emacs-lispintro-${version}/Makefile + @if grep '@[a-zA-Z_]*@' emacs-lispintro-${version}/Makefile; then \ + echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \ + fi tar -cf emacs-lispintro-${version}.tar emacs-lispintro-${version} rm -rf emacs-lispintro-${version} diff --git a/doc/lispintro/README b/doc/lispintro/README index 360d6296b70..d1e15bc6d89 100644 --- a/doc/lispintro/README +++ b/doc/lispintro/README @@ -12,43 +12,6 @@ environment. This third edition of 2006 Oct 31 updates the previous editions to GNU Emacs 22. -The Texinfo source file `emacs-lisp-intro.texi', formats without -reported error using `pdfeTeXk', Version 3.141592-1.21a-2.2 (Web2C -7.5.4) and texinfo.tex version 2006-08-26.17 started by `texi2dvi' -version 4.8, and with `makeinfo' version 4.8. - -This directory contains the following Encapsulated PostScript figures: - - cons-1.eps, cons-2.eps, cons-2a.eps, cons-3.eps, cons-4.eps, cons-5.eps - drawers.eps, lambda-1.eps, lambda-2.eps, lambda-3.eps - -See the beginning of the `emacs-lisp-intro.texi' file for appropriate -settings. These figures are not necessary; they are merely nice to -look at --- without them you get the same figures printed with ASCII -characters. - -Whether and how you print PostScript depends on your site. You not -only need to set 'print-postscript-figures' before creating the .dvi -file, but then must convert the .dvi file to .ps with a 'dvips' or -equivalent command. - -On some systems you will see an error message when `psfig.tex' is -loaded for the last two .eps files: - - ! No room for a new \write . - -If this happens, try `epsf.tex' instead of `psfig.tex', or try typing -RET at the error; the formatting may continue successfully. - -Or else find the section that says: - - @c !!! Clear print-postscript-figures if the computer formatting this - @c document is too small and cannot handle all the diagrams and figures. - @c clear print-postscript-figures - -and change the file so it reads: @clear print-postscript-figures -This will prevent TeX from attempting to load the last few .eps files. - You will find additional instructions on formatting in the beginning of the Texinfo file 'emacs-lisp-intro.texi'. Best Wishes! diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index ce4da17658e..dafee51a020 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -10,19 +10,44 @@ @include emacsver.texi -@c --------- +@c ================ How to Print a Book in Various Sizes ================ + +@c This book can be printed in any of three different sizes. +@c Set the following @-commands appropriately. + +@c 7 by 9.25 inches: +@c @smallbook +@c @clear largebook + +@c 8.5 by 11 inches: +@c @c smallbook +@c @set largebook + +@c European A4 size paper: +@c @c smallbook +@c @afourpaper +@c @set largebook + +@c (Note: if you edit the book so as to change the length of the +@c table of contents, you may have to change the value of `pageno' below.) + @c <<<< For hard copy printing, this file is now @c set for smallbook, which works for all sizes @c of paper, and with PostScript figures >>>> + @set smallbook @ifset smallbook @smallbook @clear largebook @end ifset + +@c ================ Included Figures ================ + +@c If you clear this, the figures will be printed as ASCII diagrams +@c rather than PostScript/PDF. +@c (This is not relevant to Info, since Info only handles ASCII.) @set print-postscript-figures -@c set largebook @c clear print-postscript-figures -@c --------- @comment %**end of header @@ -41,37 +66,6 @@ @set edition-number 3.10 @set update-date 28 October 2009 -@c ================ Included Figures ================ - -@c Set print-postscript-figures if you print PostScript figures. -@c If you clear this, the ten figures will be printed as ASCII diagrams. -@c (This is not relevant to Info, since Info only handles ASCII.) -@c Your site may require editing changes to print PostScript; in this -@c case, search for `print-postscript-figures' and make appropriate changes. - -@c ================ How to Print a Book in Various Sizes ================ - -@c This book can be printed in any of three different sizes. -@c In the above header, set @-commands appropriately. - -@c 7 by 9.25 inches: -@c @smallbook -@c @clear largebook - -@c 8.5 by 11 inches: -@c @c smallbook -@c @set largebook - -@c European A4 size paper: -@c @c smallbook -@c @afourpaper -@c @set largebook - -@c (Note: if you edit the book so as to change the length of the -@c table of contents, you may have to change the value of `pageno' below.) - -@c ================ End of Formatting Sections ================ - @c For next or subsequent edition: @c create function using with-output-to-temp-buffer @c create a major mode, with keymaps @@ -118,14 +112,6 @@ Edition @value{edition-number}, @value{update-date} @ifnottex Distributed with Emacs version @value{EMACSVER}. @end ifnottex -@ifset WWW_GNU_ORG -@html -<p>The homepage for GNU Emacs is at -<a href="http://www.gnu.org/software/emacs/">http://www.gnu.org/software/emacs/</a>. -<br>To view this manual in other formats, click -<a href="/software/emacs/emacs-lisp-intro/emacs-lisp-intro.html">here</a>. -@end html -@end ifset @sp 1 Copyright @copyright{} 1990--1995, 1997, 2001--2013 Free Software Foundation, Inc. @@ -217,6 +203,15 @@ supports it in developing GNU and promoting software freedom.'' @node Top @top An Introduction to Programming in Emacs Lisp +@ifset WWW_GNU_ORG +@html +<p>The homepage for GNU Emacs is at +<a href="/software/emacs/">http://www.gnu.org/software/emacs/</a>.<br> +To view this manual in other formats, click +<a href="/software/emacs/manual/eintr.html">here</a>. +@end html +@end ifset + @insertcopying This master menu first lists each chapter and index; then it lists @@ -9523,10 +9518,6 @@ This sounds more complicated than it is and is easier seen in a diagram: @sp 1 @tex @center @image{cons-1} -%%%% old method of including an image -% \input /usr/local/lib/tex/inputs/psfig.tex -% \centerline{\psfig{figure=/usr/local/lib/emacs/man/cons-1.eps}} -% \catcode`\@=0 % @end tex @sp 1 @end ifset @@ -9586,10 +9577,6 @@ bouquet @sp 1 @tex @center @image{cons-2} -%%%% old method of including an image -% \input /usr/local/lib/tex/inputs/psfig.tex -% \centerline{\psfig{figure=/usr/local/lib/emacs/man/cons-2.eps}} -% \catcode`\@=0 % @end tex @sp 1 @end ifset @@ -9635,10 +9622,6 @@ bouquet @sp 1 @tex @center @image{cons-2a} -%%%% old method of including an image -% \input /usr/local/lib/tex/inputs/psfig.tex -% \centerline{\psfig{figure=/usr/local/lib/emacs/man/cons-2a.eps}} -% \catcode`\@=0 % @end tex @sp 1 @end ifset @@ -9702,10 +9685,6 @@ bouquet flowers @sp 1 @tex @center @image{cons-3} -%%%% old method of including an image -% \input /usr/local/lib/tex/inputs/psfig.tex -% \centerline{\psfig{figure=/usr/local/lib/emacs/man/cons-3.eps}} -% \catcode`\@=0 % @end tex @sp 1 @end ifset @@ -9774,10 +9753,6 @@ bouquet flowers @sp 1 @tex @center @image{cons-4} -%%%% old method of including an image -% \input /usr/local/lib/tex/inputs/psfig.tex -% \centerline{\psfig{figure=/usr/local/lib/emacs/man/cons-4.eps}} -% \catcode`\@=0 % @end tex @sp 1 @end ifset @@ -9891,10 +9866,6 @@ Here is a fanciful representation: @sp 1 @tex @center @image{drawers} -%%%% old method of including an image -% \input /usr/local/lib/tex/inputs/psfig.tex -% \centerline{\psfig{figure=/usr/local/lib/emacs/man/drawers.eps}} -% \catcode`\@=0 % @end tex @sp 1 @end ifset @@ -10067,10 +10038,6 @@ kill-ring kill-ring-yank-pointer @sp 1 @tex @center @image{cons-5} -%%%% old method of including an image -% \input /usr/local/lib/tex/inputs/psfig.tex -% \centerline{\psfig{figure=/usr/local/lib/emacs/man/cons-5.eps}} -% \catcode`\@=0 % @end tex @sp 1 @end ifset @@ -18517,7 +18484,7 @@ shows which line you are currently executing. You can walk through the execution of a function, line by line, or run quickly until reaching a @dfn{breakpoint} where execution stops. -Edebug is described in @ref{edebug, , Edebug, elisp, The GNU Emacs +Edebug is described in @ref{Edebug, , , elisp, The GNU Emacs Lisp Reference Manual}. @need 1250 @@ -18644,7 +18611,7 @@ error or at specified stopping points; you can cause it to display the changing values of various expressions; you can find out how many times a function is called, and more. -Edebug is described in @ref{edebug, , Edebug, elisp, The GNU Emacs +Edebug is described in @ref{Edebug, , , elisp, The GNU Emacs Lisp Reference Manual}. @need 1500 @@ -20878,10 +20845,7 @@ equivalent of @code{multiply-by-seven} is: @noindent If we want to multiply 3 by 7, we can write: -@c !!! Clear print-postscript-figures if the computer formatting this -@c document is too small and cannot handle all the diagrams and figures. @c clear print-postscript-figures -@c set print-postscript-figures @c lambda example diagram #1 @ifnottex @smallexample @@ -20897,10 +20861,6 @@ If we want to multiply 3 by 7, we can write: @sp 1 @tex @center @image{lambda-1} -%%%% old method of including an image -% \input /usr/local/lib/tex/inputs/psfig.tex -% \centerline{\psfig{figure=/usr/local/lib/emacs/man/lambda-1.eps}} -% \catcode`\@=0 % @end tex @sp 1 @end ifset @@ -20939,10 +20899,6 @@ Similarly, we can write: @sp 1 @tex @center @image{lambda-2} -%%%% old method of including an image -% \input /usr/local/lib/tex/inputs/psfig.tex -% \centerline{\psfig{figure=/usr/local/lib/emacs/man/lambda-2.eps}} -% \catcode`\@=0 % @end tex @sp 1 @end ifset @@ -20978,10 +20934,6 @@ If we want to divide 100 by 50, we can write: @sp 1 @tex @center @image{lambda-3} -%%%% old method of including an image -% \input /usr/local/lib/tex/inputs/psfig.tex -% \centerline{\psfig{figure=/usr/local/lib/emacs/man/lambda-3.eps}} -% \catcode`\@=0 % @end tex @sp 1 @end ifset |