diff options
Diffstat (limited to 'lispintro')
| -rw-r--r-- | lispintro/ChangeLog | 22 | ||||
| -rw-r--r-- | lispintro/Makefile.am | 2 | ||||
| -rw-r--r-- | lispintro/Makefile.in | 2 | ||||
| -rw-r--r-- | lispintro/Makefile.old | 2 | ||||
| -rw-r--r-- | lispintro/configure.in | 4 | ||||
| -rw-r--r-- | lispintro/emacs-lisp-intro.texi | 49 | ||||
| -rw-r--r-- | lispintro/makefile.w32-in | 73 | ||||
| -rw-r--r-- | lispintro/mkinstalldirs | 2 | ||||
| -rw-r--r-- | lispintro/texinfo.tex | 6 |
9 files changed, 136 insertions, 26 deletions
diff --git a/lispintro/ChangeLog b/lispintro/ChangeLog index 5892f5b34db..159bf98259e 100644 --- a/lispintro/ChangeLog +++ b/lispintro/ChangeLog @@ -1,3 +1,21 @@ +2004-02-29 Juanma Barranquero <lektu@terra.es> + + * makefile.w32-in (mostlyclean, clean, maintainer-clean): Use + $(DEL) instead of rm, and ignore exit code. + +2003-11-16 Kevin Ryde <user42@zip.com.au> + + * emacs-lisp-intro.texi: [CVS commitment by <bob@rattlesnake.com>] + Corrections to cross references, + (Interactive Options): elisp "interactive" -> "Using Interactive". + (defvar and asterisk): Remove emacs "Edit Options" reference, + edit-options is no longer described in the emacs manual. + (Lists diagrammed): elisp "List Type" -> "Cons Cell Type". + +2003-09-03 Peter Runestig <peter@runestig.com> + + * makefile.w32-in: New file. + 2001-11-29 Eli Zaretskii <eliz@is.elta.co.il> * emacs-lisp-intro.texi (Index): @ignore extraneous text. @@ -17,10 +35,12 @@ * *.eps: Rename to avoid clashes in DOS 8+3 namespace. ;; Local Variables: -;; coding: iso-2022-7bit-unix +;; coding: iso-2022-7bit ;; End: Copyright (C) 2001 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. + +;;; arch-tag: ee4f8e1f-e14c-4d2e-86de-4dd697e6f1c3 diff --git a/lispintro/Makefile.am b/lispintro/Makefile.am index 082d100217c..1b89c55528b 100644 --- a/lispintro/Makefile.am +++ b/lispintro/Makefile.am @@ -3,3 +3,5 @@ info_TEXINFOS = emacs-lisp-intro.texi EXTRA_DIST = INSTALL MANIFEST README drawers.eps \ cons-1.eps cons-2.eps cons-2a.eps cons-3.eps \ cons-4.eps cons-5.eps lambda-1.eps lambda-2.eps lambda-3.eps + +# arch-tag: 6a3e6d99-7aa2-479f-939c-5531165c5747 diff --git a/lispintro/Makefile.in b/lispintro/Makefile.in index 88ac4975010..14c1b1c9ab9 100644 --- a/lispintro/Makefile.in +++ b/lispintro/Makefile.in @@ -69,3 +69,5 @@ maintainer-clean: distclean # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: + +# arch-tag: eb660994-cd29-4ab8-8043-5042e2dbde84 diff --git a/lispintro/Makefile.old b/lispintro/Makefile.old index 50713d1e8ef..248de3d9c9c 100644 --- a/lispintro/Makefile.old +++ b/lispintro/Makefile.old @@ -339,3 +339,5 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: + +# arch-tag: f1a44ea0-b792-4ac7-be28-9626b972c216 diff --git a/lispintro/configure.in b/lispintro/configure.in index e222b955a25..7d60c898d01 100644 --- a/lispintro/configure.in +++ b/lispintro/configure.in @@ -3,3 +3,7 @@ dnl autoconf input file for the emacs lisp intro AC_INIT(emacs-lisp-intro.texi) AM_INIT_AUTOMAKE(emacs-lisp-intro, 2.00) AC_OUTPUT(Makefile) + +m4_if(dnl Do not change this comment + arch-tag: 8d676bd8-8677-4ae0-8aa0-99bfd595b373 +)dnl diff --git a/lispintro/emacs-lisp-intro.texi b/lispintro/emacs-lisp-intro.texi index 8f6c9236c38..cf01932d024 100644 --- a/lispintro/emacs-lisp-intro.texi +++ b/lispintro/emacs-lisp-intro.texi @@ -21,8 +21,8 @@ @comment %**end of header -@set edition-number 2.10 -@set update-date 2003 July 15 +@set edition-number 2.12 +@set update-date 2003 Nov 19 @ignore ## Summary of shell commands to create various output formats: @@ -3519,7 +3519,7 @@ this. Alternatively, if the special letter-codes are not right for your application, you can pass your own arguments to @code{interactive} as -a list. @xref{interactive, , Using @code{Interactive}, elisp, The +a list. @xref{Using Interactive, , Using @code{Interactive}, elisp, The GNU Emacs Lisp Reference Manual}, for more information about this advanced technique. @@ -8066,8 +8066,8 @@ internal variables that you would not expect a user to change and for variables that you do expect a user to change. Although you can still use @code{defvar} for user customizable variables, please use @code{defcustom} instead, since that special form provides a path into -the Customization commands. (@xref{defcustom, , Setting Variables -with @code{defcustom}}.) +the Customization commands. (@xref{defcustom, , Specifying Variables +using @code{defcustom}}.) When you specified a variable using the @code{defvar} special form, you could distinguish a readily settable variable from others by @@ -8082,23 +8082,24 @@ string. For example: @end group @end smallexample +@findex set-variable @noindent -This means that you could (and still can) use the @code{edit-options} -command to change the value of -@code{shell-command-default-error-buffer} temporarily. - -@findex edit-options -However, options set using @code{edit-options} are set only for the -duration of your editing session. The new values are not saved -between sessions. Each time Emacs starts, it reads the original +You could (and still can) use the @code{set-variable} command to +change the value of @code{shell-command-default-error-buffer} +temporarily. However, options set using @code{set-variable} are set +only for the duration of your editing session. The new values are not +saved between sessions. Each time Emacs starts, it reads the original value, unless you change the value within your @file{.emacs} file, either by setting it manually or by using @code{customize}. @xref{Emacs Initialization, , Your @file{.emacs} File}. -For me, the major use of the @code{edit-options} command is to suggest -variables that I might want to set in my @file{.emacs} file. I urge -you to look through the list. (@xref{Edit Options, , Editing Variable -Values, emacs, The GNU Emacs Manual}.) +For me, the major use of the @code{set-variable} command is to suggest +variables that I might want to set in my @file{.emacs} file. There +are now more than 700 such variables --- far too many to remember +readily. Fortunately, you can press @key{TAB} after calling the +@code{M-x set-variable} command to see the list of variables. +(@xref{Examining, , Examining and Setting Variables, emacs, +The GNU Emacs Manual}.) @node copy-region-as-kill, cons & search-fwd Review, defvar, Cutting & Storing Text @comment node-name, next, previous, up @@ -9142,7 +9143,7 @@ address-boxes, the first of which holds the address of @code{violet}, and the second of which holds the address of @code{buttercup}. A pair of address-boxes is called a @dfn{cons cell} or @dfn{dotted -pair}. @xref{List Type, , List Type , elisp, The GNU Emacs Lisp +pair}. @xref{Cons Cell Type, , Cons Cell and List Types, elisp, The GNU Emacs Lisp Reference Manual}, and @ref{Dotted Pair Notation, , Dotted Pair Notation, elisp, The GNU Emacs Lisp Reference Manual}, for more information about cons cells and dotted pairs. @@ -14373,7 +14374,7 @@ version, you may have to evaluate the following: @end smallexample @noindent -(@xref{defcustom, , Setting Variables with @code{defcustom}}. +(@xref{defcustom, , Specifying Variables using @code{defcustom}}.) Then evaluate the @code{lengths-list-file} expression.) @need 1200 @@ -16125,9 +16126,9 @@ For example, the customizable user option variable The name of the variable is @code{text-mode-hook}; it has no default value; and its documentation string tells you what it does. -The @code{:type} keyword tells Emacs what kind of data -@code{text-mode-hook} should be set to and how to display the value in -a Customization buffer. +The @code{:type} keyword tells Emacs the kind of data to which +@code{text-mode-hook} should be set and how to display the value in a +Customization buffer. The @code{:options} keyword specifies a suggested list of values for the variable. Currently, you can use @code{:options} only for a hook. @@ -21831,3 +21832,7 @@ airplane. @end iftex @bye + +@ignore + arch-tag: da1a2154-531f-43a8-8e33-fc7faad10acf +@end ignore diff --git a/lispintro/makefile.w32-in b/lispintro/makefile.w32-in new file mode 100644 index 00000000000..7af64075bc2 --- /dev/null +++ b/lispintro/makefile.w32-in @@ -0,0 +1,73 @@ +#### Makefile for the Emacs Lisp Introduction manual + +# Copyright (C) 2003 Free Software Foundation, Inc. + +# This file is part of GNU Emacs. + +# GNU Emacs is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# GNU Emacs is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with GNU Emacs; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. + +srcdir = . + +infodir = $(srcdir)/../info + +INFO_SOURCES = $(srcdir)/emacs-lisp-intro.texi +# The file name eintr must fit within 5 characters, to allow for +# -NN extensions to fit into DOS 8+3 limits without clashing +INFO_TARGETS = $(infodir)/eintr +DVI_TARGETS = emacs-lisp-intro.dvi + +MAKEINFO = makeinfo +INSTALL_INFO = install-info +TEXI2DVI = texi2dvi +DVIPS = dvips +ENVADD = $(srcdir)\..\nt\envadd.bat "TEXINPUTS=$(srcdir);$(TEXINPUTS)" \ + "MAKEINFO=$(MAKEINFO) -I$(srcdir)" /C + +.SUFFIXES: .dvi .ps .texi + +info: $(INFO_TARGETS) + $(INSTALL_INFO) --info-dir=$(infodir) $(INFO_TARGETS) + +dvi: $(DVI_TARGETS) + +$(infodir)/eintr: $(INFO_SOURCES) + $(MAKEINFO) -o $@ $(srcdir)/emacs-lisp-intro.texi + +emacs-lisp-intro.dvi: $(INFO_SOURCES) + $(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-lisp-intro.texi + +emacs-lisp-intro.html: $(INFO_SOURCES) + $(MAKEINFO) --html -o $@ $(srcdir)/emacs-lisp-intro.texi + +.dvi.ps: + $(DVIPS) $< -o $@ + +mostlyclean: + - $(DEL) *.log *.cp *.fn *.ky *.pg *.vr *.tp + +clean: mostlyclean + - $(DEL) *.dvi $(infodir)/eintr* + +distclean: clean + +maintainer-clean: distclean + - $(DEL) *.aux *.cps *.fns *.kys *.pgs *.vrs *.toc + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: + +# arch-tag: d713164a-e683-4ce3-a39e-3bf82f2f82f4 diff --git a/lispintro/mkinstalldirs b/lispintro/mkinstalldirs index a01481be436..f945dbf2bce 100644 --- a/lispintro/mkinstalldirs +++ b/lispintro/mkinstalldirs @@ -4,8 +4,6 @@ # Created: 1993-05-16 # Public domain -# $Id: mkinstalldirs,v 1.10 1996/05/03 07:37:52 friedman Exp $ - errstatus=0 for file diff --git a/lispintro/texinfo.tex b/lispintro/texinfo.tex index 8ef3918f820..af648f19e17 100644 --- a/lispintro/texinfo.tex +++ b/lispintro/texinfo.tex @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2003-07-16.18} +\def\texinfoversion{2003-12-30.09} % % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. @@ -6771,3 +6771,7 @@ should work if nowhere else does.} @c time-stamp-format: "%:y-%02m-%02d.%02H" @c time-stamp-end: "}" @c End: + +@ignore + arch-tag: 53261dd3-7df7-4ec3-9d90-af7a955d3c87 +@end ignore |