Commit c73bd236 authored by Miles Bader's avatar Miles Bader

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 866-879)

   - Merge multi-tty branch
   - Update from CVS
   - Merge from emacs--rel--22

parents ecb21060 58ade22b
......@@ -5,22 +5,20 @@ Tasks needed before the next release.
** Check for widow and orphan lines in manuals;
make sure all the pages really look ok in the manual as formatted.
** Regenerate the postscript files of the reference cards in etc.
** Regenerate the pdf versions of the reference cards in etc/refcards/.
** Ask maintainers of refcard translations to update them.
Requests to have been sent out on 2006-05-23 (Reiner Steib).
Emacs 22 translators:
LANG Translator Status
cs Pavel Janík Can't work on it now.
de Sven Joachim Done
fr Eric Jacoboni Done
pl Włodek Bzyl Done
pt-br Rodrigo Real Done
ru Alex Ott Done
sk Miroslav Vaško No response
Reminders sent out on 2006-06-08.
cs Pavel Janík
de Sven Joachim
fr Eric Jacoboni
pl Włodek Bzyl
pt-br Rodrigo Real
ru Alex Ott
sk Miroslav Vaško
** Remove temporary +++/--- lines in NEWS.
......@@ -47,20 +45,45 @@ GNU/Linux system.
NB the definitive copy of this file for Emacs 22 is on the
EMACS_22_BASE branch. Any entries below are automatically copied from
that branch. Do not make manual changes to this file on the trunk.
** Document the changes introduced by multi-tty
** Does deleting frames run Lisp code? If so, can we get rid of that?
It is a dangerous design.
** Why were the calls to x_fully_uncatch_errors commented out in eval.c?
**, sep 7: Emacs 23.0.50: Segfaults in alloc.c (batch process)
** grep et al should use font-lock to do highlighting, so that they respect font-lock-mode.
"can't turn off font-lock"
**, Sep 18: erc causes emacs to hang with multi-tty
**, Sep 18: before-string property has no effect if display property is empty
**, Sep 24: TLS infinite loop.
**, 9 July: eshell and external commands
** find-func: can no longer find adviced subrs
This ought to work.
** Check all non-file-scope static vars to make sure they
won't lose on USG or HPUX systems.
** \\{...} produces duplicate entries
** menu indications of key bindings for remapped commands
Here we list any small fixes that arrived too late for Emacs 22.2, but
that should be installed on the release branch after 22.2 is released.
** two View-mode "quit" bugs
......@@ -68,8 +91,8 @@ that should be installed on the release branch after 22.2 is released.
The first line of every tutorial must begin with text ending in a
period (".", ASCII 0x2E) saying "Emacs Tutorial" in the respective
language. This should be followed by "See end for copying
conditions", likewise in the respective language.
language. This should be followed by "See end for copying conditions",
likewise in the respective language.
After each file name, on the same line or the following line, come the
names of the people who have checked it.
......@@ -10,7 +10,7 @@ For each step, check for possible errors.
make sure that the later tagged version will bootstrap, should it be
necessary to check it out.
3. Regenerate Emacs' AUTHORS file (M-x load-file RET
3. Regenerate Emacs' etc/AUTHORS file (M-x load-file RET
lisp/emacs-lisp/authors.el RET, then M-x authors RET, then save
the *Authors* buffer). This may require fixing syntactically
incorrect ChangeLog entries beforehand.
......@@ -21,7 +21,7 @@ For each step, check for possible errors.
5. rm configure; make bootstrap
6. Commit configure, README, AUTHORS, lisp/finder-inf.el,
6. Commit configure, README, etc/AUTHORS, lisp/finder-inf.el,
lisp/version.el, man/emacs.texi, lispref/elisp.texi,
mac/src/Emacs.r, nt/emacs.rc. Copy lisp/loaddefs.el to
There is no need to make change log entries for files such as NEWS,
The same applies for regenerating files like configure.
This diff is collapsed.
......@@ -60,9 +60,12 @@
file, plus temacs.exe and dump.bat, which are required if you want to
redump emacs without recompiling it.
Source code for libXpm-X11R7.2-3.5.6 modified to compile on Windows.
This corresponds to the libXpm.dll in
Source code required to compile libXpm-3.5.7 on Windows. Contains
a basic Makefile for compiling with mingw32 and a .def file for
generating a DLL with the appropriate exports in addition to the
source code to provide the subset of functionality Emacs uses from
libXpm. This corresponds to the libXpm.dll in
......@@ -93,7 +96,7 @@
the black and white versions of the toolbar icons.
XPM: a Windows port of the XPM library corresponding to the
release of X11R7.2 is included with the binary distribution, but
release of X11R7.3 is included with the binary distribution, but
can be replaced by other versions with the name xpm4.dll,
libxpm-nox4.dll or libxpm.dll.
2007-09-12 Robert J. Chassell <>
* emacs-lisp-intro.texi: Add email address to Thank You correctly
2007-09-06 Romain Francoise <>
* (maintainer-clean): Delete info files.
2007-09-06 Glenn Morris <>
* Move from lispintro/ to doc/lispintro/.
* (infodir): Go up one more level.
(usermanualdir): Change from ../man to ../emacs.
* makefile.w32-in (infodir, ENVADD): Go up one more level.
* emacs-lisp-intro.texi (setfilename): Go up one more level.
2007-07-30 Robert J. Chassell <>
* emacs-lisp-intro.texi: Fix typo on line 5173, change `thee' to
2007-07-25 Glenn Morris <>
* Relicense all FSF files to GPLv3 or later.
2007-06-02 Chong Yidong <>
* Version 22.1 released.
2007-01-30 Robert J. Chassell <>
* emacs-lisp-intro.texi (else): Rephrase message of first
if-then-else example so it is right both in itself and in the
"true" case of the expression, which asks whether 4 is greater
than 5.
2006-11-27 Andreas Schwab <>
* (usermanualdir): Define.
(emacs-lisp-intro.dvi): Pass -I options to texi2dvi instead of
* emacs-lisp-intro.texi: Input texinfo instead of ../man/texinfo
to fix building outside source directory.
2006-11-09 Robert J. Chassell <>
* emacs-lisp-intro.texi: Copy descriptions from detailed master
menu to menus within body.
* emacs-lisp-intro.texi (at the beginning): Add `other shell
commands' to produce additional output formats; total is now ten.
(A Loop with an Incrementing Counter, and others): Ensure Info
menus will appear in short windows.
(Disentangle beginning-of-buffer): Replace `version 21' with `more
recent versions'.
(Simple Extension): Show how to handle multiple versions by adding
an alternative with a test of `>= 21'
2006-11-06 Robert J. Chassell <>
* emacs-lisp-intro.texi: Finish minor changes seen from DVI output.
Replace 22.1.100 with 22.1.1.
(current-kill): Mention functions that directly or indirectly call
`kill-new', which sets `kill-ring-yank-pointer'.
(Understanding current-kill): Change `lasted' to `last'. Remove
extraneous parenthesis. Reword item about returning `car' of list.
(yank): Remove mention of `rotate-yank-pointer'.
(Y Axis Element): Add comment regarding replacement of blank space.
(print-Y-axis Penultimate): Explain that `print-graph' will pass
`height-of-top-line' so `print-Y-axis' does not have a bug.
2006-11-05 Robert J. Chassell <>
* emacs-lisp-intro.texi: Yet more minor changes:
(defcustom): Said that `:options' is usually for a hook. Remove
extraneous space in parenthetical remark concerning
`text-mode-hook-identify'. At end, mention other defines, too.
(Beginning a .emacs File): Reverse words about comments so they
parallel numbers of listed semi-colons.
(Text and Auto-fill): Remove extraneous blank line in example.
(Mail Aliases): Remove extraneous blank line in example.
(Keybindings): Reformat as needed with `key' rather than `kbd'.
(Keybindings, Miscellaneous, Mode Line): For small book format, start
section name on top of new page.
(Simple Extension): Replace longer expression with
`emacs-major-version'. Remove comment about `number-to-string'
(Miscellaneous): Add filename option, `-H', to `grep' example
(debug, debug-on-entry): Replace `GNU Emacs 22' with `a recent
GNU Emacs'.
(edebug): More properly state where to place point for 'M-x
* emacs-lisp-intro.texi: More minor changes.
Center images for TeX output.
(kill-new function): Remove indentation for sentence talking about
momentarily skipping code.
(cons & search-fwd Review): Document @code{funcall}. Document
@code{re-search-forward} with existing @code{search-forward}.
Reference chapter on regular expression searches.
(Recursion with list): Specify a more recent version as being Emacs.
(Recursion with list, Every, recursive-graph-body-print): Change
`if ... progn' expression to `when'.
(Recursive triangle function): For printing in small book, ensure
section name is not last on bottom of preceding page.
(Keep): Remove extraneous space in function definition example.
(sentence-end): Specify `in English' for glyphs that end a sentence.
Note that in GNU Emacs 22, the name refers to both a variable and a
(fwd-sentence while loops): Write a function as one, not as a form
(fwd-para let): Add `which' to sentence with `parstart' and `parsep'.
(etags): Move sentences involving `find-tag' and sources. State
location of Emacs `src' directory.
(Design count-words-region): Better explain two backslashes in a row.
(Find a File): Fix grammar; add a `to' and write `to visit'. Change
`named' to `selected'.
(lengths-list-file): Remove extraneous parenthesis from reference.
(lengths-list-many-files): Explain `expand-file-name' better.
(Files List): Rephrase sentence regarding Lisp sources directory
2006-11-04 Robert J. Chassell <>
* emacs-lisp-intro.texi: Replace 22.0.100 with 22.1.100.
(defcustom): Note that the value set by defconst is a variable.
(Buffer Size & Locations): Parenthetical remark about evaluation.
(Finding More): Change text to include C sources by inference.
* emacs-lisp-intro.texi: Minor fixes.
Replace all tabs with eight spaces each so printed text looks correct.
Remove extraneous comma in a printed node name produced by `ref'.
(insert-buffer): Add a missing beginning parenthesis.
(beginning-of-buffer): Add `beginning of' to note about accessible
(narrow Exercise): Write closing parenthesis at end of correct
(zap-to-char): Remove extraneous `a' from first sentence.
(Complete zap-to-char): Remove two extraneous sentences.
(zap-to-char body): Move sentences on documentation two nodes earlier.
(Lisp macro): Add definition of `unless' macro.
(last-command & this-command): Remove comment that `we have not yet
seen' the @code{eq} function.
(kill-append function): Reformat `kill-append' function definition so
it prints well.
(kill-new function): Indent the sentence beginning `notice'. Replace
`the same as' with `similar to'. Repair typo. Remove obsolete
references to `yank' and `yank-pop. End section with a note that `we
will digress into C.'
2006-11-02 Robert J. Chassell <>
* emacs-lisp-intro.texi (kill-ring-yank-pointer): Revert addition
of extraneous quotation mark to rotate-yank-pointer.
2006-11-01 Juri Linkov <>
* emacs-lisp-intro.texi: Fix unbalanced quotes.
2006-10-31 Robert J. Chassell <>
* emacs-lisp-intro.texi: Revised text for kill-region,
copy-region-as-kill, kill-append, kill-new, forward-sentence,
forward-paragraph, find-file, current-kill, yank, and yank-pop.
Removed INSTALL MANIFEST from the directory since those files are
now irrelevant. Updated Info file in ../info. Changed numbering
so is now Revised Third Edition and this instance's edition-number
is 3.00. Did not update ISBN number.
* 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.
2006-10-30 Robert J. Chassell <>
* emacs-lisp-intro.texi: Many changes since it turned out that
many `simple' functions were rewritten. Changes to the text
regarding zap-to-char, mark-whole-buffer, append-to-buffer,
copy-to-buffer, beginning-of-buffer, what-line, and possibly
others. (I have not reviewed all yet.) This instance does build
for Info and TeX.
2006-10-29 Chong Yidong <>
* Use relative paths to avoid advertising filesystem
contents during compilation.
2006-08-21 Robert J. Chassell <>
* emacs-lisp-intro.texi: deleted in directory copy of texinfo.tex
and pointed towards ../man/texinfo.tex so only one file
needs updating. Added comment of what to do when building on own.
* texinfo.tex: changed to version 2006-02-13.16
to enable a DVI build using the more recent versions of TeX.
2006-05-25 David Kastrup <>
* emacs-lisp-intro.texi (setcar): replace an antelope rather than
a giraffe with a hippopotamus.
2006-05-19 Thien-Thi Nguyen <>
* emacs-lisp-intro.texi (Digression concerning error): Fix typo.
2005-09-16 Romain Francoise <>
* emacs-lisp-intro.texi (GNU Free Documentation License):
Specify GFDL version 1.2.
2005-07-30 Eli Zaretskii <>
* makefile.w32-in (info): Don't run install-info.
($(infodir)/dir): New target, produced by running install-info.
2005-07-04 Lute Kamstra <>
Update FSF's address in GPL notices.
* emacs-lisp-intro.texi: Update FSF's address.
2004-04-23 Juanma Barranquero <>
* makefile.w32-in: Add "-*- makefile -*-" mode tag.
2004-02-29 Juanma Barranquero <>
* makefile.w32-in (mostlyclean, clean, maintainer-clean): Use
$(DEL) instead of rm, and ignore exit code.
2003-11-16 Kevin Ryde <>
* emacs-lisp-intro.texi: [CVS commitment by <>]
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 <>
* makefile.w32-in: New file.
2001-11-29 Eli Zaretskii <>
* emacs-lisp-intro.texi (Index): @ignore extraneous text.
Use @dircategory and @direntry to define the DIR entry.
2001-11-25 Robert J. Chassell <>
* emacs-lisp-intro.texi: Move @contents to the beginning of the
file. Set the size to @smallbook.
2001-11-24 Eli Zaretskii <>
* New file.
* README: Update.
* *.eps: Rename to avoid clashes in DOS 8+3 namespace.
;; Local Variables:
;; coding: iso-2022-7bit
;; add-log-time-zone-rule: t
;; End:
Copyright (C) 2001, 2002, 2003, 2004, 2005,
2006, 2007 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 3, 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
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., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
;;; arch-tag: ee4f8e1f-e14c-4d2e-86de-4dd697e6f1c3
AUTOMAKE_OPTIONS = foreign 1.2
info_TEXINFOS = emacs-lisp-intro.texi
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
#### Makefile for the Emacs Lisp Introduction manual
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
# 2003, 2004, 2005, 2006, 2007 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 3, or (at your option)