mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-25 10:47:00 +00:00
Code Issues Releases Activity

Merged from emacs@sv.gnu.org

Browse Source 
Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-650
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-651
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-652
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-653
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-654
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-655
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-656
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-657
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-658
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-659
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-203
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-204
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-205
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-599
This commit is contained in:
Karoly Lorentey 2007-04-22 11:42:03 +00:00
commit 81088e260b
135 changed files with 16737 additions and 10208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
AUTHORS
View File

@ -127,7 +127,7 @@ Andreas Schwab: changed Makefile.in files.el lisp.h xdisp.c configure.in
process.c and 449 other files
Andreas Seltenreich: changed nnweb.el gnus.texi nnslashdot.el mm-uu.el
battery.el easy-mmode.el gmm-utils.el gnus-art.el gnus-ml.el
battery.el comint.el easy-mmode.el gmm-utils.el gnus-art.el gnus-ml.el
gnus-srvr.el gnus-start.el gnus-sum.el gnus-util.el gnus.el mm-url.el
url-cookie.el url-http.el xterm.c
@ -335,7 +335,7 @@ Chong Yidong: changed cus-edit.el custom.el simple.el files.el
display.texi longlines.el text.texi custom.texi files.texi
image-mode.el info.el keyboard.c compile.el frames.texi mouse.el
startup.el wid-edit.el xdisp.c xterm.c cus-theme.el misc.texi
and 224 other files
and 225 other files
Chris Hanson: changed xscheme.el scheme.el xterm.c hpux.h x11term.c
hp9000s300.h keyboard.c process.c texinfmt.el emacsclient.c sort.el
@ -343,7 +343,8 @@ Chris Hanson: changed xscheme.el scheme.el xterm.c hpux.h x11term.c
indent.c info.el man.el and 17 other files
Chris Moore: changed dired.el hexl.el replace.el Makefile.in gnus-sum.el
isearch.el jka-cmpr-hook.el tutorial.el wdired.el
isearch.el jka-cmpr-hook.el pgg-gpg.el pgg-pgp.el pgg-pgp5.el
tutorial.el wdired.el
Chris Prince: changed w32term.c
@ -414,7 +415,7 @@ Dan Nicolaescu: wrote iris-ansi.el romanian.el
and changed term.el xterm.el hideshow.el isearch.el icon.el lisp.h
cus-edit.el faces.el font-lock.el sh-script.el eterm-color.ti grep.el
ibuffer.el rxvt.el vhdl-mode.el xterm.c bindings.el compile.el
dabbrev.el imenu.el outline.el and 161 other files
dabbrev.el imenu.el outline.el and 164 other files
Daniel Brockman: changed cus-start.el format-spec.el ibuffer.el rcirc.el
@ -544,8 +545,9 @@ and changed w32menu.c w32term.c close.png close.xpm empty.png empty.xpm
no-handle.xpm open.png open.xpm and 20 other files
David Reitter: wrote mailclient.el
and changed commands.h easy-mmode.el emacsbug.el emacsclient.c keymap.c
macterm.c menu-bar.el minibuf.c sendmail.el url-http.el
and changed commands.h cus-edit.el easy-mmode.el emacsbug.el
emacsclient.c keymap.c macterm.c menu-bar.el minibuf.c sendmail.el
url-http.el
David Robinson: changed menu-bar.el x-win.el
@ -643,7 +645,7 @@ Eli Zaretskii: wrote codepage.el rxvt.el tty-colors.el
and changed msdos.c Makefile.in makefile.w32-in files.el info.el fileio.c
startup.el mainmake.v2 config.bat menu-bar.el pc-win.el msdos.h
rmail.el simple.el internal.el xfaces.c frame.c dosfns.c emacs.c
faces.el frame.el and 525 other files
faces.el frame.el and 526 other files
Emanuele Giaquinta: changed rxvt.el configure.in etags.c frame.el
sh-script.el text.texi
@ -738,9 +740,9 @@ Francesc Rocher: changed cus-start.el macterm.c w32term.c xdisp.c xterm.c
Francesco Potort,Al(B: wrote cmacexp.el
and changed etags.c man.el delta.h undigest.el etags.1 comint.el
configure.in uniquify.el latin-post.el rmail.el etags.el latin-alt.el
maintaining.texi sgml-mode.el Makefile.in data.c european.el filelock.c
files.el generic-x.el gud.el and 42 other files
configure.in uniquify.el latin-post.el rmail.el Makefile.in etags.el
latin-alt.el maintaining.texi sgml-mode.el data.c european.el
filelock.c files.el generic-x.el gud.el and 42 other files
Francis J. Wright: wrote woman.el
and changed dired.el comint.el files.el
@ -847,10 +849,10 @@ Giorgos Keramidas: changed configure.in MACHINES amdx86-64.h apropos.el
Giuseppe Scrivano: changed buffer.c configure.in sysdep.c xsmfns.c
Glenn Morris: changed f90.el calendar.el diary-lib.el fortran.el
calendar.texi appt.el sh-script.el timeclock.el cal-menu.el Makefile.in
calendar.texi appt.el sh-script.el timeclock.el Makefile.in cal-menu.el
abbrevs.texi cal-hebrew.el cal-islam.el files.el holidays.el
orgcard.tex programs.texi scroll-all.el startup.el TUTORIAL.eo
cal-coptic.el and 93 other files
cal-coptic.el and 103 other files
Glynn Clements: wrote gamegrid.el snake.el tetris.el
@ -1173,7 +1175,7 @@ Johan Bockg,Ae(Brd: changed erc.el erc-backend.el cl-macs.el erc-match.el
erc-nickserv.el erc-ring.el erc-speak.el erc-track.el simple.el
align.el calendar.el cl.texi custom.el dired-aux.el display.texi
erc-bbdb.el erc-button.el erc-compat.el erc-dcc.el erc-list.el
erc-log.el and 11 other files
erc-log.el and 12 other files
Johan Vromans: wrote forms-d2.el forms.el iso-acc.el
and changed complete.el
@ -1199,10 +1201,10 @@ John J Foerch: changed erc-stamp.el
John Mongan: changed f90.el
John Paul Wallington: changed ibuffer.el ibuf-ext.el subr.el files.el
help-fns.el thumbs.el fns.c rmail.el bindings.el bytecomp.el
help-fns.el rmail.el thumbs.el fns.c bindings.el bytecomp.el
cus-theme.el info.el re-builder.el simple.el startup.el xfns.c
apropos.el arc-mode.el browse-url.el comint.el cus-start.el
and 115 other files
and 117 other files
John Robinson: wrote bg-mouse.el
@ -1446,7 +1448,7 @@ Kim F. Storm: wrote bindat.el cua-base.el cua-gmrk.el cua-rect.el ido.el
and changed xdisp.c dispextern.h simple.el window.c process.c keyboard.c
xterm.c w32term.c dispnew.c subr.el lisp.h fringe.c macterm.c
display.texi fns.c alloc.c xfaces.c keymap.c xfns.c xterm.h .gdbinit
and 248 other files
and 250 other files
Kim-Minh Kaplan: changed gnus-picon.el gnus-sum.el gnus-start.el
gnus-win.el gnus-xmas.el gnus.texi message.el nndraft.el nnml.el
@ -1538,8 +1540,8 @@ and changed fortran.el ispell.el sendmail.el cmuscheme.el comint.el
Leigh Stoller: changed emacsclient.c emacsserver.c server.el
Lennart Borgman: changed tutorial.el window.el ada-xref.el emacsclient.c
filesets.el flymake.el help-fns.el mouse.el recentf.el shell.el
texinfmt.el w32term.c w32term.h
filesets.el flymake.el help-fns.el isearch.el mouse.el recentf.el
replace.el shell.el texinfmt.el w32term.c w32term.h
Lennart Staflin: changed dired.el diary-ins.el diary-lib.el tq.el xdisp.c
@ -1560,14 +1562,14 @@ Lucid, Inc.: changed byte-opt.el byte-run.el bytecode.c bytecomp.el
delsel.el disass.el faces.el font-lock.el lmenu.el lselect.el
mailabbrev.el select.el xfaces.c xselect.c
$,1 a(Bukasz Demianiuk: changed erc.el
Lute Kamstra: changed modes.texi generic.el debug.el generic-x.el
font-lock.el subr.el Makefile.in debugging.texi easy-mmode.el
elisp.texi hl-line.el simple.el battery.el bindings.el calc.el
cmdargs.texi edebug.texi emacs.texi info.el make-tarball.txt
octave-inf.el and 216 other files
$,1 a(Bukasz Demianiuk: changed erc.el
Lynn Slater: wrote help-macro.el
L,Bu(Brentey K,Ba(Broly: changed spam.el gnus-sum.el
@ -1923,7 +1925,7 @@ Niall Mansfield: changed etags.c
Nick Roberts: wrote gdb-ui.el
and changed gud.el building.texi tooltip.el speedbar.el bindings.el
thumbs.el DEBUG cc-mode.el .gdbinit frames.texi subr.el xt-mouse.el
thumbs.el .gdbinit DEBUG cc-mode.el frames.texi subr.el xt-mouse.el
comint.el display.texi help-mode.el descr-text.el dired.el
gud-display.pbm speedbar.texi t-mouse.el tumme.el and 114 other files
@ -2259,7 +2261,7 @@ Romain Francoise: changed faq.texi dired-x.el ibuf-ext.el Makefile.in
comint.el compile.el message.el puresize.h replace.el subr.el
files.texi gnus-fun.el gnus.texi help-fns.el make-dist rcirc.el
antlr-mode.el bookmark.el buffer.c diary-lib.el dired.el
and 129 other files
and 130 other files
Roman Belenov: changed which-func.el
@ -2401,7 +2403,7 @@ Stefan Monnier: wrote bibtex.el cvs-status.el diff-mode.el log-edit.el
and changed vc.el font-lock.el pcvs.el newcomment.el subr.el lisp.h
keyboard.c keymap.c tex-mode.el fill.el alloc.c compile.el files.el
regex.c easy-mmode.el simple.el info.el syntax.c vc-hooks.el xdisp.c
sh-script.el and 514 other files
sh-script.el and 515 other files
Steinar Bang: changed imap.el
@ -2464,8 +2466,8 @@ Stewart M. Clamen: wrote cal-mayan.el
Stuart D. Herring: changed minibuf.c widget.texi
Stuart Herring: changed isearch.el align.el allout.el comint.el edebug.el
files.el
Stuart Herring: changed files.el isearch.el align.el allout.el comint.el
edebug.el find-lisp.el
Sudish Joseph: changed mac-win.el
@ -2522,9 +2524,9 @@ Theodore Jump: changed w32-win.el w32faces.c
Thien-Thi Nguyen: wrote hideshow.el make-mms-derivative.el
and changed ewoc.el info.el processes.texi zone.el Makefile.in vc.el
fileio.c lisp-mode.el scheme.el text.texi bindat.el dcl-mode.el
display.texi files.el pcvs.el sysdep.c MORE.STUFF TUTORIAL.it
TUTORIAL.ja diary-lib.el diff-mode.el and 124 other files
fileio.c lisp-mode.el scheme.el text.texi TUTORIAL.it bindat.el
dcl-mode.el display.texi files.el pcvs.el sysdep.c MORE.STUFF
TUTORIAL.ja diary-lib.el diff-mode.el and 125 other files
Thierry Emery: changed kinsoku.el timezone.el url-http.el wid-edit.el
@ -2647,7 +2649,7 @@ Vinicius Jose Latorre: wrote delim-col.el ebnf-abn.el ebnf-bnf.el
printing.el ps-mule.el
and changed ps-print.el ps-prin1.ps ps-bdf.el ps-prin0.ps ps-prin3.ps
ps-prin2.ps lpr.el ps-print.ps subr.el TUTORIAL.pt_BR easymenu.el
ps-print-def.el ps-print0.ps ps-vars.el
loading.texi ps-print-def.el ps-print0.ps ps-vars.el
Vivek Dasmohapatra: changed emacs.c sh-script.el xterm.c xterm.h

11
ChangeLog
View File

@ -1,3 +1,14 @@
2007-02-27 Glenn Morris <rgm@gnu.org>
* make-dist (oldXMenu): Remove Imakefile.
(etc/images): Add README.
2007-02-25 Dan Nicolaescu <dann@ics.uci.edu>
* configure.in (xtensa-*-linux-gnu*): New configuration.
* configure: Regenerate.
2007-02-22 Dan Nicolaescu <dann@ics.uci.edu>
* config.guess, config.sub: Updated from master source.

23
admin/FOR-RELEASE
View File

@ -1,20 +1,25 @@
Tasks needed before the next release.
* COPYRIGHTS
See the outstanding issues at the end of admin/notes/copyright.
* TO BE DONE SHORTLY BEFORE RELEASE
** Check for widow and orphan lines in manuals;
make sure all the pages really look ok in the manual as formatted.
** Check for text in manuals that assumes current version is 21.
** Update AUTHORS.
eshell.texi 'Known Problems' (does section need updating?)
cc-mode.texi 'Performance Issues': "21.3 as of this writing"
** Cleanup temporary +++/--- lines in etc/NEWS.
** Regenerate the postscript files of the reference cards in etc.
As of 2007/2/26, only ps files older than the associated tex files are:
cs-dired-ref.ps sk-dired-ref.ps
May need update for Emacs-22:
dired-ref.tex cs-dired-ref.tex fr-drdref.tex sk-dired-ref.tex
Fix overfull lines p3 fr-refcard.ps.
** Ask maintainers of refcard translations to update them.
@ -53,18 +58,14 @@ to the hack introduced on 2005-07-01 to fix some other Cleartype problem.
* BUGS
** Fix up copyright confusions.
See admin/notes/copyright.
See end of admin/notes/copyright.
** simon.marshall@misys.com, Jan 12:
Font-lock decides function call is function declaration in C++
** Fix needed for communication with gpg-agent
** md5i@cs.cmu.edu, Feb 20: move-end-of-line in comint buffers
** 2007-02-23 change to process.c is broken (2 reports so far).
** daniel@bigwalter.net, Feb 25: Echoing of keys and process I/O
* DOCUMENTATION

254
admin/notes/copyright
View File

@ -27,6 +27,9 @@ containing the image.
3. If you add a lot of text to a previously trivial file that had no
legal notices, consider if you should add a copyright statement.
4. Please don't just add an FSF copyright without checking that is the
right thing to do.
Every non-trivial file distributed through the Emacs CVS should be
self-explanatory in terms of copyright and license. This includes
@ -49,6 +52,9 @@ added. NB consequently, if you add a lot of text to a small file,
consider whether your changes have made the file worthy of a copyright
notice, and if so, please add one.
It can be helpful to put a reminder comment at the start of a trivial
file, eg: "add a license notice if this grows to > 10 lines of code".
The years in the copyright notice should be updated every year (see
file "years" in this directory). The PS versions of refcards etc
should display copyright notices (an exception to the rule about
@ -133,6 +139,12 @@ etc/edt-user.doc
etc/emacs.csh
- keep simple license for this simple file
etc/future-bug
- doesn't need a humourless disclaimer, because Karl Fogel says we
can consider it part of Emacs, and he has a blanker disclaimer for
Emacs changes. (email to rgm "[Emacs-commit] emacs/etc future-bug",
2007028)
etc/letter.pbm,letter.xpm
- trivial, no notice needed.
<http://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00324.html>
@ -158,14 +170,37 @@ SW.tit, TONEPY.tit, ZOZY.tit
leim/MISC-DIC/CTLau-b5.html, CTLau.html, cangjie-table.b5, cangjie-table.cns,
pinyin.map, ziranma.cin
- leave the copyright alone.
Note that pinyin.map, ziranma.cin (and hence the generated
leim/quail/PY.el, ZIRANMA.el) are under GPLv1 or later.
leim/SKK-DIC/SKK-JISYO.L
ja-dic/ja-dic.el
(the latter is auto-generated from the former). Leave the copyright alone.
lib-src/etags.c
- this has a copyright Ken Arnold. We are still deciding what should
be done here (see below).
Copyright information is duplicated in etc/ETAGS.README. Update that
file too.
Until 2007 etags.c was described as being copyright FSF and Ken Arnold.
After some investigation in Feb 2007, then to the best of our
knowledge we believe that the original 1984 Emacs version was based
on the version in BSD4.2. See for example this 1985 post from Ken Arnold:
<http://groups.google.com/group/mod.sources/browse_thread/thread/ffe5c55845a640a9>
I have received enough requests for the current source to ctags
to post it. Here is the latest version (what will go out with
4.3, modulo any bugs fixed during the beta period). It is the
4.2 ctags with recognition of yacc and lex tags added.
See also a 1984 version of ctags (no copyright) posted to net.sources:
<http://groups.google.com/group/net.sources/msg/a21b6c21be12a98d>
Version of etags.c in emacs-16.56 duplicates comment typos.
Accordingly, in Feb 2007 we added a 1984 copyright for the
University of California and a revised BSD license. The terms of
this require that the full license details be available in binary
distributions - hence the file etc/ETAGS.README. The fact that the
--version output just says "Copyright <year> FSF" is apparently OK
from a legal point of view.
lib-src/getopt1.c, getopt_int.h
- these are from the GNU C library. Leave the copyrights alone.
@ -184,14 +219,129 @@ man/doclicense.texi
lisp/net/tramp.el
- there are also copyrights in the body of the file. Update these too.
lwlib/
rms (2007/02/17): "lwlib is not assigned to the FSF; we don't consider
it part of Emacs. [...] Therefore non-FSF copyrights are ok in lwlib."
msdos/is_exec.c, sigaction.c
- these files are copyright DJ Delorie. Leave the copyrights alone.
Leave the Eli Zaretskii copyright in is_exec.c alone. See the
msdos/README file for the legal history of these files.
NB don't change the GPL version used for lwlib .c and .h files (see
below).
FSF copyrights should only appear in files which have undergone
non-trivial cumulative changes from the original versions in the Lucid
Widget Library. NB this means that if you make non-trivial changes to
a file with no FSF copyright, you should add one. Also, if changes are
reverted to the extent that a file becomes basically the same as the
original version, the FSF copyright should be removed.
In my (rgm) opinion, as of Feb 2007, all the non-trivial files differ
significantly from the original versions, with the exception of
lwlib-Xm.h. Most of the changes that were made to this file have
subsequently been reverted. Therefore I removed the FSF copyright from
this file (which is arguably too trivial to merit a notice anyway). I
added FSF copyright to the following files which did not have them
already: Makefile.in, lwlib-Xaw.c, lwlib-int.h (borderline),
lwlib-utils.c (borderline), lwlib.c, lwlib.h.
Copyright years before the advent of public CVS in 2001 were those
when I judged (from the CVS logs) that non-trivial amounts of change
had taken place. I also adjusted the existing FSF years in xlwmenu.c,
xlwmenu.h, and xlwmenuP.h on the same basis.
Note that until Feb 2007, the following files in lwlib were lacking
notices: lwlib-int.h, lwlib.h, lwlib-Xaw.h, lwlib-Xlw.h, lwlib-utils.h
The following files did not list a Lucid copyright: xlwmenu.h,
xlwmenuP.h.
To the best of our knowledge, all the code files in lwlib were
originally part of the Lucid Widget Library, even if they did not say
so explicitly. For example, they were all present in Lucid Emacs 19.1
in 1992. The exceptions are the two Xaw files, which did not appear
till Lucid Emacs 19.9 in 1994. The file lwlib-Xaw.h is too trivial to
merit a copyright notice, but would presumably have the same one as
lwlib-Xaw.c. We have been unable to find a true standalone version of
LWL, if there was such a thing, to check definitively.
To clarify the situation, in Feb 2007 we added Lucid copyrights and
GPL notices to those files lacking either that were non-trivial,
namely: lwlib-int.h, lwlib.h, xlwmenu.h, xlwmenuP.h. This represents
our best understanding of the legal status of these files. We also
clarified the notices in Makefile.in, which was originally the
Makefile auto-generated from Lucid's Imakefile.
As of Feb 2007, the following files are considered too trivial for
notices: lwlib-Xaw.h, lwlib-Xlw.h, lwlib-utils.h.
The version of lwlib/ first installed in Emacs seems to be the same as
that used in Lucid Emacs 19.8 (released 6-sep-93); except the two Xaw
files, which did not appear till Athena support was added in Lucid
Emacs 19.9. In Lucid Emacs 19.1, all files were under GPLv1 or later,
but by Lucid Emacs 19.8, lwlib.c and xlwmenu.c had been switched to v2
or later. These are the versions that were first installed in Emacs.
So in GNU Emacs, these two files have been under v2 or later since
1994.
It seems that it was the intention of Lucid to use v1 or later
(excepting the two files mentioned previously); so this is the license
we have used when adding notices to code that did not have notices
originally. Although we have the legal right to switch to v2 or later,
rms prefers that we do not do so.
msdos/is_exec.c, sigaction.c - these files are copyright DJ Delorie.
Leave the copyrights alone. Leave the Eli Zaretskii copyright in
is_exec.c alone. See the msdos/README file for the legal history of
these files.
oldXMenu/
Keep the "copyright.h" method used by X11, rather than moving the
licenses into the files. Note that the original X10.h did not use
copyright.h, but had an explicit notice, which we retain.
If you make non-trivial changes to a file which does not have an FSF
notice, add one and a GPL notice (as per Activate.c). If changes to a
file are reverted such that it becomes essentially the same as the
original X11 version, remove the FSF notice and GPL.
Only the files which differ significantly from the original X11
versions should have FSF copyright and GPL notices. At time of writing
(Feb 2007), this is: Activate.c, Create.c, Internal.c. I (rgm)
established this by diff'ing the current files against those in X11R1,
and when I found significant differences looking in the ChangeLog for
the years they originated (the CVS logs are truncated before 1999). I
therefore removed the FSF notices (added in 200x) from the other
files. There are some borderline cases IMO: AddSel.c, InsSel.c,
XMakeAssoc.c, XMenu.h. For these I erred on the side of NOT adding FSF
notices.
With regards to whether the files we have changed should have GPL
added or not, rms says (2007-02-25, "oldXmenu issues"):
It does not make much difference, because oldXmenu is obsolete
except for use in Emacs (and it is not normally used in Emacs any
more either).
So, to make things simple, please put our changes under the GPL.
insque.c had no copyright notice until 2005. The version of insque.c
added to Emacs 1992-01-27 is essentially the same as insremque.c added
to glic three days later by Roland McGrath, with an FSF copyright and
GPL, but no ChangeLog entry:
<http://sources.redhat.com/cgi-bin/cvsweb.cgi/~checkout~/libc/misc/insremque.c?\
rev=1.1&cvsroot=glibc>
To the best of his recollection, McGrath (who has a copyright
assignment) was the author of this file (email from roland at frob.com
to rms, 2007-02-23, "Where did insque.c come from?"). The FSF
copyright and GPL in this file are therefore correct as far as we
understand it.
Imakefile had no legal info in Feb 2007, but was obviously based on
the X11 version (which also had no explicit legal info). As it was
unused, I removed it. It would have the same MIT copyright as
Makefile.in does now.
src/gmalloc.c
- contains numerous copyrights from the GNU C library. Leave them alone.
@ -328,6 +478,9 @@ system)
Emacs 22 is released (though if they can be fixed before, that is
obviously good):
Maybe some relevant comments here?
<http://groups.google.com/group/linux.debian.legal/browse_thread/thread/123547ea95437a1f>
Is it OK to just `cvs remove' a file for legal reasons, or is
something more drastic needed? A removed file is still available from
@ -356,30 +509,6 @@ etc/images
contact image authors in regards to future switch to v3.
REMOVED src/unexhp9k800.c
- we would like to re-add this file if possible. Please let us know
if you can clarify its legal status.
http://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00138.html
*** These are copyright issues still to be addressed:
NB apart from switching the TUTORIALs to GPL, I think there is nothing
here that anyone can work on without further input from rms.
Maybe some relevant comments here?
<http://groups.google.com/group/linux.debian.legal/browse_thread/thread/123547ea95437a1f>
etc/gnus-logo.eps, gnus-booklet.ps, gnus-refcard.ps
just to be safe, papers are on the way for the "Gnus logo", even
though it is very similar to the already-assigned "Emacs logo".
etc/ms-kermit - no copyright, but ms-7bkermit has one
etc/TUTORIAL* (translations)
switch to GPL (see english TUTORIAL)
rms: "We can leave the TUTORIAL translations alone until their
@ -390,70 +519,19 @@ etc/TUTORIAL* (translations)
previous version.
Done: TUTORIAL.eo
[waiting for legal advice]
lib-src/etags.c
- was it ok to use Ken Arnold's code as a basis?
1984 version of ctags, with no copyright, posted to net.sources:
http://groups.google.com/group/net.sources/msg/a21b6c21be12a98d)
version of etags.c in emacs-16.56 seems to be derived from this
(duplicate typos in comments).
REMOVED src/unexhp9k800.c
- we would like to re-add this file if possible. Please let us know
if you can clarify its legal status.
http://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00138.html
[waiting for legal advice on lwlib/*]
lwlib/lwlib-Xaw.c
copyright Chuck Thompson; but under GPL, so OK?
lwlib/lwlib-Xlw.c, lwlib-Xm.c, lwlib-Xm.h, xlwmenu.c
copyright lucid and FSF, but under GPL, so OK?
FSF copyrights were added in 200x, was that right?
lwlib/lwlib-int.h, lwlib.h, lwlib-Xaw.h, lwlib-Xlw.h, lwlib-utils.h
no copyright. last three trivial?
suspect these must have been part of the "Lucid Widget Library",
which is under GPL. Can't find an original version of this to check.
lwlib/Makefile.in
"some parts" copyright Lucid, no license
lwlib/lwlib-utils.c, lwlib.c
copyright Lucid, Inc; but under GPL, so OK?
lwlib/xlwmenu.h, xlwmenuP.h
part of 'Lucid Widget Library', but only FSF copyright (when files
were first checked into RCS, there were no copyrights). Was it right
to add FSF copyright?
should we add a 1992 Lucid copyright?
lwlib/*
should we:
1) ensure all files that were originally in the "Lucid Widget
Library" have 1992 Lucid copyright?
2) add or remove FSF copyrights to any files we have made non-trivial
changes to since 1992?
*** These are copyright issues still to be addressed:
[waiting for legal advice]
oldXMenu/
- should there be any FSF copyrights at all in here? Some were added
in 2005, without licence notices. Was this right?
Eg don't think copyright.h should have FSF copyright!
Should add copyright details for X11R1 to the README file. (see
copyright.h). I suggest we remove copyright.h and add the notices
directly into the files.
etc/ms-kermit - no copyright, but ms-7bkermit has one
The general issue is, as with some of the Lucid code in lwlib, suppose
file foo.c is Copyright (C) 2000 John Smith, and released under the
GPL. We check it into Emacs CVS and make non-trivial changes to it.
Should we add a FSF copyright or not? Can we add such a notice as soon
as we check it check it in to CVS?
[waiting for legal advice]
oldXMenu/Makefile.in, Makefile, Imakefile, descrip.mms, insque.c
- issues described in mail to rms, 2006/12/17.
rms: "I have asked for lawyer's advice about these."
This file is part of GNU Emacs.

8
config.guess vendored
View File

@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation,
# Inc.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006, 2007
# Free Software Foundation, Inc.
timestamp='2007-01-15'
timestamp='2007-02-26'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by

8
config.sub vendored
View File

@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation,
# Inc.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006, 2007
# Free Software Foundation, Inc.
timestamp='2007-01-18'
timestamp='2007-02-26'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software

5
configure vendored
View File

@ -3100,6 +3100,11 @@ _ACEOF
machine=amdx86-64 opsys=gnu-linux
;;
## Tensilica Xtensa Linux-based GNU system
xtensa-*-linux-gnu* )
machine=xtensa opsys=gnu-linux
;;
* )
unported=yes
;;

5
configure.in
View File

@ -1134,6 +1134,11 @@ dnl see the `changequote' comment above.
machine=amdx86-64 opsys=gnu-linux
;;
## Tensilica Xtensa Linux-based GNU system
xtensa-*-linux-gnu* )
machine=xtensa opsys=gnu-linux
;;
* )
unported=yes
;;

61
etc/ChangeLog
View File

@ -1,3 +1,64 @@
2007-03-01 Kim F. Storm <storm@cua.dk>
* ORDERS: Reformat text.
* NEWS (About external Lisp packages): New section.
2007-02-28 Thien-Thi Nguyen <ttn@gnu.org>
* TUTORIAL.it: Fix typo.
2007-02-27 Glenn Morris <rgm@gnu.org>
* cs-dired-ref.tex: Increase in 2 column case to make room
for copyright notice.
(nopagenumbers): Call to turn off numbers in 1 page document.
(N,Aa(Bpov,Al(Bda, Modifikace Dired bufferu): Swap sections to
balance column length in presence of copyright notice.
(copyrightnotice): Uncomment so that notice is displayed.
* dired-ref.tex (vsize): Increase in 2 column case to make room
for copyright notice.
(nopagenumbers): Call to turn off numbers in 1 page document.
(Getting Help, Modifying the Dired Buffer): Swap sections to
balance column length in presence of copyright notice.
(copyrightnotice): Uncomment so that notice is displayed.
* fr-drdref.tex (vsize): Increase in 2 column case.
(\key): Tweak space for description.
(\overfullrule): Set to 0pt to hide small overflows.
(nopagenumbers): Call to turn off numbers in 1 page document.
(Obtenir de l'aide, Modifier le tampon Dired): Swap sections to
balance column length.
(Mettre un flag sur les fichiers \`a d\'etruire): Hack in a line
break to prevent overfull line.
(find-names-dired): Use \key rather than \metax as a hack fix for
overflow.
* sk-dired-ref.tex (vsize): Increase in 2 column case to make room
for copyright notice.
(nopagenumbers): Call to turn off numbers in 1 page document.
(N,Aa(Bpoveda, Modifik,Aa(Bcia Dired bufferu): Swap sections to
balance column length in presence of copyright notice.
(copyrightnotice): Uncomment so that notice is displayed.
2007-02-26 Carsten Dominik <dominik@science.uva.nl>
* orgcard.tex (section{Visibility Cycling}): Document key for
indirect buffer access.
(section{Archiving}): New keys for archiving.
(section{Tables}): Combine two lines for hline creation.
Named-field formula changed to Field formula.
(section{Links}): Document keys for finding links.
(section{Agenda Views}): New key for agenda file cycling.
Document keys for stuck projects. Typos fixed.
(section{Exporting and Publishing}): Export options no longer in
reference card.
2007-02-25 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* PROBLEMS: Gtk+ and cygwin doesn't work.
2007-02-23 Eli Zaretskii <eliz@gnu.org>
* MORE.STUFF: Add a pointer to Phil Sung's Emacs slides on MIT.

3
etc/DEVEL.HUMOR
View File

@ -2,6 +2,9 @@
-- --
-- Humor (sometimes unintended) on the Emacs developer's list --
-- --
-- The Free Software Foundation claims no copyright on this file, --
-- compiled from the public emacs-devel mailing list. --
-- --
----------------------------------------------------------------------
"Is it legal for a `struct interval' to have a total_length field of

49
etc/ETAGS.README Normal file
View File

@ -0,0 +1,49 @@
etags is distributed under the following conditions:
Copyright (C) 1984 The Regents of the University of California
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the
distribution.
3. Neither the name of the University nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Copyright (C) 1984, 1987, 1988, 1989, 1993, 1994, 1995, 1998, 1999,
2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
Free Software Foundation, Inc.
This file is not considered part of GNU Emacs.
This program 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 of the License, or
(at your option) any later version.
This program 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 this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

5
etc/JOKES
View File

@ -1,3 +1,8 @@
The Free Software Foundation claims no copyright on this file,
compiled largely from postings to public newsgroups and mailing lists,
and the GNU project email archives.
From: Don Chiasson <G.CHIASSON@DREA-XX.ARPA>
Subject: Some gnu jokes
To: jokes@DREA-XX.ARPA, gergely@DREA-XX.ARPA, broome@DREA-XX.ARPA

33
etc/NEWS
View File

@ -21,6 +21,25 @@ Temporary note:
When you add a new item, please add it without either +++ or ---
so we will look at it and add it to the manual.
* About external Lisp packages
When you upgrade to Emacs 22 from a previous version, some older
versions of external Lisp packages are known to behave badly.
So in general, it is recommended that you upgrade to the latest
versions of any external Lisp packages that you are using.
You should also be aware that many Lisp packages have been included
with Emacs 22 (see the extensive list below), and you should remove
any older versions of these packages to ensure that the Emacs 22
version is used. You can use M-x list-load-path-shadows to find such
older packages.
Some specific packages which are known to cause problems are:
** Semantic (used by CEDET, ECB, JDEE): upgrade to latest version.
** cua.el, cua-mode.el: remove old versions.
* Installation Changes in Emacs 22.1
@ -114,6 +133,9 @@ setting the variable `image-library-alist'.
---
** Support for GNU/Linux systems on S390 machines was added.
---
** Support for GNU/Linux systems on Tensilica Xtensa machines was added.
---
** Support for MacOS X was added.
See the files mac/README and mac/INSTALL for build instructions.
@ -1682,8 +1704,11 @@ on the mode line, header line and display margin, when run in an xterm.
When Emacs is running in an xterm more key bindings are available.
The following should work:
{C,S,C-S,A}-{right,left,up,down,prior,next,delete,insert,F1-12}.
These key bindings work on xterm from X.org 6.8, they might not work on
some older versions of xterm, or on some proprietary versions.
These key bindings work on xterm from X.org 6.8 (and later versions),
they might not work on some older versions of xterm, or on some
proprietary versions.
The various keys generated by xterm when the "modifyOtherKeys"
resource is set are also supported.
** Character terminal color support changes:
@ -1797,6 +1822,10 @@ keys (like pc-selection-mode) and typed text replaces the active
region (like delete-selection-mode). Do not enable these modes with
cua-mode. Customize the variable `cua-mode' to enable cua.
The cua-selection-mode enables the CUA keybindings for the region but
does not change the bindings for C-z/C-x/C-c/C-v. It can be used as a
replacement for pc-selection-mode.
In addition, cua provides unified rectangle support with visible
rectangle highlighting: Use C-return to start a rectangle, extend it
using the movement commands (or mouse-3), and cut or copy it using C-x

14
etc/ORDERS
View File

@ -1,9 +1,13 @@
Printed copies of the GNU Emacs Manual, the Emacs Lisp Reference
Manual, "Programming in Emacs Lisp: An Introduction", and other
materials can be ordered directly from the Free Software Foundation.
For more information, see the order form on the web at
<http://www.gnu.org/order/order.html>. Your purchases will help support
further development of Emacs and other free software programs. You
can also make tax-deductable donations to the Free Software Foundation,
a not-for-profit organization (assuming you pay US taxes) - see
<http://www.gnu.org/help/donate.html>.
<http://www.gnu.org/order/order.html>.
Your purchases will help support further development of Emacs and
other free software programs.
You can also make tax-deductable donations to the Free Software
Foundation, a not-for-profit organization (assuming you pay US taxes)
- see <http://www.gnu.org/help/donate.html>.

32
etc/PROBLEMS
View File

@ -213,6 +213,17 @@ configuring your compiler to use the native linker instead of GNU ld.
This happens because of bugs in Gtk+. Gtk+ 2.10 seems to be OK. See bug
http://bugzilla.gnome.org/show_bug.cgi?id=85715.
** Emacs compiled with Gtk+ crashes on startup on cygwin.
A typical error message is
***MEMORY-ERROR***: emacs[5172]: GSlice: failed to allocate 504 bytes
(alignment: 512): Function not implemented
Emacs supplies its own malloc, but glib (part of Gtk+) calls memalign and on
cygwin that becomes the cygwin supplied memalign. As malloc is not the
cygwin malloc, the cygwin memalign always returns ENOSYS. A fix for this
problem would be welcome.
* General runtime problems
** Lisp problems
@ -315,14 +326,6 @@ the macro MAIL_USE_FLOCK in config.h or the m- or s- file it includes.
IF YOU DON'T USE THE FORM OF INTERLOCKING THAT IS NORMAL ON YOUR
SYSTEM, YOU CAN LOSE MAIL!
If your system uses the lock file protocol, and fascist restrictions
prevent ordinary users from writing the lock files in /usr/spool/mail,
you may need to make `movemail' setgid to a suitable group such as
`mail'. You can use these commands (as root):
chgrp mail movemail
chmod 2755 movemail
If your system uses the lock file protocol, and fascist restrictions
prevent ordinary users from writing the lock files in /usr/spool/mail,
you may need to make `movemail' setgid to a suitable group such as
@ -2456,6 +2459,19 @@ patch to assert.h should solve this:
#else /* debugging enabled */
*** Building the MS-Windows port with Visual Studio 2005 fails.
Microsoft no longer ships the single threaded version of the C library
with their compiler, and the multithreaded static library is missing
some functions that Microsoft have deemed non-threadsafe. The
dynamically linked C library has all the functions, but there is a
conflict between the versions of malloc in the DLL and in Emacs, which
is not resolvable due to the way Windows does dynamic linking.
We recommend the use of the MingW port of GCC for compiling Emacs, as
not only does it not suffer these problems, but it is also Free
software like Emacs.
** Linking
*** Building Emacs with a system compiler fails to link because of an

2
etc/TUTORIAL.it
View File

@ -75,7 +75,7 @@ mostra le direzioni in cui operano questi quattro comandi:
schermo.
Le quattro lettere dei comandi sono mnemoniche in inglese: P per
precedente (previuos), N per successivo (next), B per indietro (backward)
precedente (previous), N per successivo (next), B per indietro (backward)
e F per avanti (forward). Questi sono tutti i comandi elementari per
posizionare il cursore, li userai IN CONTINUAZIONE e conviene perciò
impararli subito.

2
etc/calccard.tex
View File

@ -20,7 +20,7 @@
% 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 1, or (at your option)
% 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,

34
etc/cs-dired-ref.tex
View File

@ -103,7 +103,7 @@
\def\makefootline{\baselineskip10pt\hsize6.5in\line{\the\footline}}
\else %2 or 3 columns uses prereduced size
\hsize 3.4in
\vsize 7.95in
\vsize 9.2in
\hoffset -.75in
\voffset -.745in
\font\titlefont=csbx10 \scaledmag2
@ -334,10 +334,17 @@ \section{Zna
\key{zmìò znaèku na jiné písmeno}{* c}
\key{oznaè soubory, pro které elispový výraz vrací t}{* ( \dx}
\section{Nápověda}
\section{Modifikace Dired bufferu}
\key{zobraz nápovědu}{h}
\key{přehled příkazů dired}{?}
\key{vlož do tohoto bufferu podadresář}{i}
\key{odstraň označené soubory z bufferu}{k}
\key{odstraň z bufferu výpis podadresáře}{C-u k}
\key{znovu načti adresáře (značky se zachovají)}{g}
\key{přepni třídění adresáře podle jména/data}{s}
\key{uprav volby příkazu ls}{C-u s}
\key{obnov značky, skryté řádky apod.}{C-_}
\key{skryj všechny podadresáře}{M-\$}
\key{skryj nebo odkryj všechny podadresáře}{\$}
\section{Pøíkazy nad oznaèenými soubory}
@ -373,18 +380,6 @@ \section{Ozna
\key{proveï výmaz souborù oznaèených ke smazání}{x}
\key{oznaè soubory vyhovující regulárnímu výrazu}{\% d}
\section{Modifikace Dired bufferu}
\key{vlož do tohoto bufferu podadresář}{i}
\key{odstraň označené soubory z bufferu}{k}
\key{odstraň z bufferu výpis podadresáře}{C-u k}
\key{znovu načti adresáře (značky se zachovají)}{g}
\key{přepni třídění adresáře podle jména/data}{s}
\key{uprav volby příkazu ls}{C-u s}
\key{obnov značky, skryté řádky apod.}{C-_}
\key{skryj všechny podadresáře}{M-\$}
\key{skryj nebo odkryj všechny podadresáře}{\$}
\section{Pøíkazy s regulárními výrazy}
\key{oznaè soubory vyhovující regulárnímu výrazu}{\% m}
@ -400,7 +395,12 @@ \section{Dired a Find}
\metax{otevøi v dired soubory obsahující vzorek}{M-x find-grep-dired}
\metax{otevøi v dired soubory podle výstupu \kbd{find}}{M-x find-dired}
%\copyrightnotice
\section{Nápověda}
\key{zobraz nápovědu}{h}
\key{přehled příkazů dired}{?}
\copyrightnotice
\bye

2424
etc/dired-ref.ps
View File

File diff suppressed because it is too large Load Diff

36
etc/dired-ref.tex
View File

@ -95,7 +95,7 @@
\def\makefootline{\baselineskip10pt\hsize6.5in\line{\the\footline}}
\else %2 or 3 columns uses prereduced size
\hsize 3.4in
\vsize 7.95in
\vsize 9.2in
\hoffset -.75in
\voffset -.745in
\font\titlefont=cmbx10 \scaledmag2
@ -243,6 +243,8 @@
% commands fit on a page in two-column format
\def\dx{{\bf (DX)}}
\nopagenumbers
%**end of header
@ -326,10 +328,17 @@ \section{Marking and Unmarking Files}
\key{change the marks to a different character}{* c}
\key{mark files for which Elisp expression returns t}{* ( \dx}
\section{Getting Help}
\section{Modifying the Dired Buffer}
\key{dired help}{h}
\key{dired summary (short help) and error log}{?}
\key{insert a subdirectory into this buffer}{i}
\key{remove marked files from the listing}{k}
\key{remove a subdir listing}{C-u k}
\key{re-read all directories (retains all marks)}{g}
\key{toggle sorting of current subdir by name/date}{s}
\key{edit ls switches}{C-u s}
\key{recover marks, hidden lines, and such}{C-_}
\key{hide all subdirectories}{M-\$}
\key{hide or unhide subdirectory}{\$}
\section{Commands on Files Marked or Specified by the Prefix}
@ -365,18 +374,6 @@ \section{Flagging Files for Deletion}
\key{execute the deletions requested (flagged files)}{x}
\key{flag files matching a regular expression}{\% d}
\section{Modifying the Dired Buffer}
\key{insert a subdirectory into this buffer}{i}
\key{remove marked files from the listing}{k}
\key{remove a subdir listing}{C-u k}
\key{re-read all directories (retains all marks)}{g}
\key{toggle sorting of current subdir by name/date}{s}
\key{edit ls switches}{C-u s}
\key{recover marks, hidden lines, and such}{C-_}
\key{hide all subdirectories}{M-\$}
\key{hide or unhide subdirectory}{\$}
\section{Regular Expression Commands}
\key{mark filenames matching a regular expression}{\% m}
@ -392,7 +389,12 @@ \section{Dired and Find}
\metax{dired file(s) that contain pattern}{M-x find-grep-dired}
\metax{dired file(s) based on \kbd{find} output}{M-x find-dired}
%\copyrightnotice
\section{Getting Help}
\key{dired help}{h}
\key{dired summary (short help) and error log}{?}
\copyrightnotice
\bye

3
etc/echo.msg
View File

@ -1,3 +1,6 @@
The Free Software Foundation claims no copyright on this file, taken
from a posting to the public newsgroup net.sources.
Path: mit-amt!mit-eddie!think!harvard!seismo!gatech!akgua!whuxlm!whuxl!houxm!ihnp4!stolaf!umn-cs!herndon
From: herndon@umn-cs.UUCP
Newsgroups: net.sources

2695
etc/fr-drdref.ps
View File

File diff suppressed because it is too large Load Diff

48
etc/fr-drdref.tex
View File

@ -1,4 +1,3 @@
% Reference Card for Dired
% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
% 2006, 2007 Free Software Foundation, Inc.
@ -96,7 +95,7 @@
\def\makefootline{\baselineskip10pt\hsize6.5in\line{\the\footline}}
\else %2 or 3 columns uses prereduced size
\hsize 3.4in
\vsize 7.95in
\vsize 10in
\hoffset -.75in
\voffset -.745in
\font\titlefont=cmbx10 \scaledmag2
@ -217,8 +216,9 @@
% \key{description of key}{key-name}
% prints the description left-justified, and the key-name in a \kbd
% form near the right margin.
% First hfill tweaked from 0.75 to 0.8 to allow for longer descriptions.
\def\key#1#2{\leavevmode\hbox to \hsize{\vtop
{\hsize=.75\hsize\rightskip=1em
{\hsize=.8\hsize\rightskip=1em
\hskip\keyindent\relax#1}\kbd{#2}\hfil}}
\newbox\metaxbox
@ -244,6 +244,10 @@
% commands fit on a page in two-column format
\def\dx{\bf (DX)}
% Set to non-zero to check for layout problems.
\overfullrule 0pt
\nopagenumbers
%**end of header
@ -334,10 +338,17 @@ \section{Marquer et \^oter les marques des fichiers}
\key{modifier les marques par un caract\`ere diff\'erent}{* c}
\key{marquer les fichiers pour lesquels une expression Elisp renvoie t}{* (\dx}
\section{Obtenir de l'aide}
\section{Modifier le tampon Dired}
\key{aide sur dired}{h}
\key{r\'esum\'e de dired (aide succinte) et trace d'erreur}{?}
\key{ins\'erer un sous-r\'epertoire dans ce tampon}{i}
\key{supprimer les fichiers marqu\'es de la liste}{k}
\key{supprimer le listing d'un sous-r\'epertoire}{C-u k}
\key{relire tous les r\'epertoires (conserve toutes les marques)}{g}
\key{bascule le tri sur le nom/date du r\'epertoire courant}{s}
\key{\'edite les options de ls }{C-u s}
\key{r\'ecup\`ere les marques, les lignes cach\'ees, etc.}{C-_}
\key{cache tous les sous-r\'epertoires}{M-\$}
\key{cache ou fait appara\^\i{}tre le sous-r\'epertoire}{\$}
\section{Commandes sur les fichiers marqu\'es ou sp\'ecifi\'es par le pr\'efixe}
@ -363,8 +374,9 @@ \section{Commandes sur les fichiers marqu\'es ou sp\'ecifi\'es par le pr\'efixe}
\key{lancer une commande shell sur le(s) fichier(s)}{!}
\section{Mettre un flag sur les fichiers \`a d\'etruire}
\leftline{\bf Les commandes qui \^otent les marquent suppriment les
flags de suppression}
%% Hack for overfull line. Proper fix?
\leftline{\bf Les commandes qui \^otent les marquent suppriment les}
\leftline{\bf flags de suppression}
\key{placer un flag de suppression sur le fichier}{d}
\key{sauvegarder et supprimer le flag de suppression}{delete}
\key{placer un flag sur tous les fichiers de sauvegarde (dont les noms
@ -377,18 +389,6 @@ \section{Mettre un flag sur les fichiers \`a d\'etruire}
\key{placer un flag sur les fichiers correspondant \`a une expression
rationnelle }{\% d}
\section{Modifier le tampon Dired}
\key{ins\'erer un sous-r\'epertoire dans ce tampon}{i}
\key{supprimer les fichiers marqu\'es de la liste}{k}
\key{supprimer le listing d'un sous-r\'epertoire}{C-u k}
\key{relire tous les r\'epertoires (conserve toutes les marques)}{g}
\key{bascule le tri sur le nom/date du r\'epertoire courant}{s}
\key{\'edite les options de ls }{C-u s}
\key{r\'ecup\`ere les marques, les lignes cach\'ees, etc.}{C-_}
\key{cache tous les sous-r\'epertoires}{M-\$}
\key{cache ou fait appara\^\i{}tre le sous-r\'epertoire}{\$}
\section{Commandes sur les expressions rationnelles}
\key{marquer les noms de fichiers correspondant \`a une expression
@ -401,11 +401,17 @@ \section{Commandes sur les expressions rationnelles}
\key{marquer pour une suppression}{\% d}
\section{Dired et Find}
\metax{fichier(s) dired dont le nom correspond \`a un motif}{M-x
%% Hack for overfull line (should be \metax). Proper fix?
\key{fichier(s) dired dont le nom correspond \`a un motif}{M-x
find-names-dired}
\metax{fichier(s) dired contenant un motif}{M-x find-grep-dired}
\metax{fichier(s) dired bas\'es sur ce que produit \kbd{find}}{M-x find-dired}
\section{Obtenir de l'aide}
\key{aide sur dired}{h}
\key{r\'esum\'e de dired (aide succinte) et trace d'erreur}{?}
\copyrightnotice
\bye

1487
etc/orgcard.ps
View File

File diff suppressed because it is too large Load Diff

66
etc/orgcard.tex
View File

@ -1,6 +1,6 @@
% Reference Card for Org Mode
\def\orgversionnumber{4.56}
\def\versionyear{2006} % latest update
\def\orgversionnumber{4.67}
\def\versionyear{2007} % latest update
\def\year{2007} % latest copyright year
%
%**start of header
@ -21,7 +21,7 @@
\columnsperpage=3
% Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
% Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc
% 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
@ -286,6 +286,7 @@ \section{Visibility Cycling}
\key{rotate entire buffer between states}{S-TAB}
\key{show the whole file}{C-c C-a}
\key{reveal context around point}{C-c C-r}
\key{show subtree in indirect buffer, ded.\ frame}{C-c C-k}
%\key{show branches}{C-c C-k}
\section{Motion}
@ -317,8 +318,8 @@ \section{Archiving}
\key{toggle ARCHIVE tag}{C-c C-x C-a}
\metax{mark fully done children}{C-u C-c C-x C-a}
\key{force cycling of an ARCHIVEd tree}{C-TAB}
\key{move subtree to archive file}{C-c \$}
\key{move all fully done children}{C-u C-c \$}
\key{move subtree to archive file}{C-c C-x C-s}
\metax{move all fully done children}{C-u C-c C-x C-s}
To set archive location for current file, add a line like$^2$:
\vskip -1mm
\beginexample%
@ -367,8 +368,7 @@ \section{Tables}
\key{move the current row down}{M-DOWN}
\key{kill the current row or horizontal line}{M-S-UP}
\key{insert new row above the current row}{M-S-DOWN}
\key{insert horizontal line below the current row}{C-c -}
\key{insert horizontal line above the current row}{C-u C-c -}
\key{insert hline below (\kbd{C-u} : above) current row}{C-c -}
\key{sort lines in region}{C-c \^{}}
{\bf Regions}
@ -381,17 +381,18 @@ \section{Tables}
{\bf Calculations} (in combination with Emacs \kbd{calc} package)
\key{set and eval column formula}{C-c =}
\key{set and eval named-field formula}{C-u C-c =}
\key{set and eval field formula}{C-u C-c =}
\key{edit formulas in separate buffer}{C-c '}
\key{re-apply all stored equations to current line}{C-c *}
\key{re-apply all stored equations to entire table}{C-u C-c *}
\key{iterate table to stability}{C-u C-u C-c *}
%\kbd{TAB}, \kbd{RET} and \kbd{C-c C-c} trigger automatic recalculation
%in lines starting with: {\tt | \# |}.
\key{rotate calculation mark through \# * ! \^ \_ \$}{C-\#}
\key{display column number cursor is in}{C-c ?}
\key{show line, column, formula reference}{C-c ?}
\key{sum numbers in current column/rectangle}{C-c +}
\key{copy down with increment}{S-RET$^3$}
@ -402,7 +403,7 @@ \section{Tables}
\key{Example: Add Col1 and Col2}{=\$1+\$2}
\key{... with printf format specification}{=\$1+\$2;\%.2f}
\key{... with constants from constants.el}{=\$1/\$c/\$cm}
\key{sum from 3rd hline above to here}{:=vsum(\&III)}
\metax{sum from 2nd to 3rd hline}{:=vsum(@II..@III)}
\key{apply current column formula}{=}
{\bf Miscellaneous}
@ -432,6 +433,8 @@ \section{Links}
\key{...force open in emacs/other window}{mouse-3}
\key{record a position in mark ring}{C-c \%}
\key{jump back to last followed link(s)}{C-c \&}
\key{Find next link}{C-c C-x C-n}
\key{Find previous link}{C-c C-x C-p}
{\bf Internal Links}
@ -566,15 +569,17 @@ \section{Agenda Views}
\key{add/move current file to front of agenda}{C-c [}
\key{remove current file from your agenda}{C-c ]}
\key{cycle through agenda file list}{C-,}
\key{cycle through agenda file list}{C-'}
\key{compile agenda for the current week}{C-c a a$^1$}
\key{compile global TODO list}{C-c a t$^1$}
\key{compile TODO list for specific keyword}{C-c a T$^1$}
\key{match tags in agenda files}{C-c a m$^1$}
\key{match tags in TODO entries}{C-c a M$^1$}
\key{find stuck projects}{C-c a \#$^1$}
\key{show timeline of current org file}{C-c a L$^1$}
\key{configure custom commands}{C-c a C$^1$}
\key{configure stuck projects}{C-c a !$^1$}
\key{agenda for date at cursor}{C-c C-o}
\vskip 1mm
@ -594,6 +599,7 @@ \section{Agenda Views}
\key{goto original location in other window}{TAB/mouse-2}
%\key{... also available with}{mouse-2}
\key{goto original location, delete other windows}{RET}
\key{show subtree in indirect buffer, ded.\ frame}{b}
\key{toggle follow-mode}{f}
{\bf Change display}
@ -614,6 +620,7 @@ \section{Agenda Views}
\key{digit argument}{0-9}
\key{change state of current TODO item}{t}
\key{kill item and source}{C-k}
\key{archive the subtree}{\$}
\key{show tags of current headline}{T}
\key{set tags for current headline}{:}
\key{toggle ARCHIVE tag}{a}
@ -625,11 +632,15 @@ \section{Agenda Views}
\key{change timestamp to today}{>}
\key{insert new entry into diary}{i}
\key{Start the clock on current item (clock-in)}{I}
\key{Stop the clock (clock-out)}{O}
\key{Cancel current clock}{X}
\key{start the clock on current item (clock-in)}{I}
\key{stop the clock (clock-out)}{O}
\key{cancel current clock}{X}
{\bf Misc}
\key{Open link in current line}{C-c C-o}
\newcolumn
{\bf Calendar commands}
\key{find agenda cursor date in calendar}{c}
@ -675,20 +686,19 @@ \section{Exporting and Publishing}
\key{links become HTML links}{http:... etc}
\key{include html tags}{@<b>...@</b>}
{\bf Export options}
Include additional information for export by putting these anywhere in the
org file. Use {\tt M-TAB} completion to make sure to get the right
keywords. {\tt M-TAB} again just after keyword is complete inserts examples.
\key{the title to be shown}{\#+TITLE:}
\key{the author}{\#+AUTHOR:}
\key{authors email address}{\#+EMAIL:}
\key{language code for html}{\#+LANGUAGE:}
\key{free text description of file}{\#+TEXT:}
\key{... which can carry over multiple lines}{\#+TEXT:}
%\key{settings for the export process - see below}{\#+OPTIONS:}
\key{settings for the export process}{\#+OPTIONS:}
%{\bf Export options}
%
%Include additional information for export by putting these anywhere in the
%org file. Use {\tt M-TAB} completion to make sure to get the right
%keywords. {\tt M-TAB} again just after keyword is complete inserts examples.
%
%\key{the title to be shown}{\#+TITLE:}
%\key{the author}{\#+AUTHOR:}
%\key{authors email address}{\#+EMAIL:}
%\key{language code for html}{\#+LANGUAGE:}
%\key{free text description of file}{\#+TEXT:}
%\key{... which can carry over multiple lines}{\#+TEXT:}
%\key{settings for the export process}{\#+OPTIONS:}
%\key{set number of headline levels for export}{H:2}
%\key{turn on/off section numbers}{num:t}

36
etc/sk-dired-ref.tex
View File

@ -104,7 +104,7 @@
\def\makefootline{\baselineskip10pt\hsize6.5in\line{\the\footline}}
\else %2 or 3 columns uses prereduced size
\hsize 3.4in
\vsize 7.95in
\vsize 9.2in
\hoffset -.75in
\voffset -.745in
\font\titlefont=csbx10 \scaledmag2
@ -252,6 +252,8 @@
% commands fit on a page in two-column format
\def\dx{{\bf (DX)}}
\nopagenumbers
%**end of header
@ -335,10 +337,17 @@ \section{Ozna
\key{zmeò znaèku na iné písmeno}{* c}
\key{oznaè súbory, pre ktoré elispový výraz vrací t}{* ( \dx}
\section{Nápoveda}
\section{Modifikácia Dired bufferu}
\key{zobraz nápovedu}{h}
\key{prehµad príkazov dired}{?}
\key{vlo¾ do tohto bufferu podadresár}{i}
\key{odstráò oznaèené súbory z bufferu}{k}
\key{odstráò z bufferu výpis podadresára}{C-u k}
\key{znovu naèítaj adresár (znaèky sa zachovajú)}{g}
\key{prepni triedenie adresára podµa mena/dátumu}{s}
\key{uprav voµby príkazu ls}{C-u s}
\key{obnov znaèky, skryté riadky a~pod.}{C-_}
\key{skry v¹etky podadresáre}{M-\$}
\key{skry alebo odkry v¹etky podadresáre}{\$}
\section{Príkazy nad oznaèenými súbormi}
@ -375,18 +384,6 @@ \section{Ozna
\key{vyma¾ súbory oznaèené na zmazanie}{x}
\key{oznaè súbory vyhovujúce regulárnemu výrazu}{\% d}
\section{Modifikácia Dired bufferu}
\key{vlo¾ do tohto bufferu podadresár}{i}
\key{odstráò oznaèené súbory z bufferu}{k}
\key{odstráò z bufferu výpis podadresára}{C-u k}
\key{znovu naèítaj adresár (znaèky sa zachovajú)}{g}
\key{prepni triedenie adresára podµa mena/dátumu}{s}
\key{uprav voµby príkazu ls}{C-u s}
\key{obnov znaèky, skryté riadky a~pod.}{C-_}
\key{skry v¹etky podadresáre}{M-\$}
\key{skry alebo odkry v¹etky podadresáre}{\$}
\section{Príkazy s regulárnymi výrazmi}
\key{oznaè súbory vyhovujúce regulárnemu výrazu}{\% m}
@ -402,7 +399,12 @@ \section{Dired a Find}
\metax{otvor v dired súbory obsahujúce vzorku}{M-x find-grep-dired}
\metax{otvor v dired súbory podµa výstupu \kbd{find}}{M-x find-dired}
%\copyrightnotice
\section{Nápoveda}
\key{zobraz nápovedu}{h}
\key{prehµad príkazov dired}{?}
\copyrightnotice
\bye

7
lib-src/ChangeLog
View File

@ -1,3 +1,7 @@
2007-02-26 Francesco Potort,Al(B <pot@gnu.org>
* Makefile.in (etags, ctags): Define EMACS_NAME as "GNU Emacs".
2007-02-20 Ulrich Mueller <ulm@kph.uni-mainz.de> (tiny change)
* Makefile.in (EMACS, EMACSOPT): New variables.
@ -107,8 +111,7 @@
2006-11-27 Eli Zaretskii <eliz@gnu.org>
* makefile.w32-in ($(BLD)/emacsclient.$(O)): Depend on
makefile.w32-in.
* makefile.w32-in ($(BLD)/emacsclient.$(O)): Depend on makefile.w32-in.
2006-11-25 Juanma Barranquero <lekktu@gmail.com>

4
lib-src/Makefile.in
View File

@ -413,7 +413,7 @@ regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h ../src/config.h
${CC} -c ${BASE_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER ${srcdir}/../src/regex.c
etags${EXEEXT}: ${srcdir}/etags.c $(GETOPTDEPS) $(REGEXPDEPS) ../src/config.h
$(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o etags
$(CC) ${ALL_CFLAGS} -DEMACS_NAME="\"GNU Emacs"\" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o etags
ebrowse${EXEEXT}: ${srcdir}/ebrowse.c $(GETOPTDEPS) ../src/config.h
$(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" ${srcdir}/ebrowse.c $(GETOPTOBJS) $(LOADLIBES) -o ebrowse
@ -421,7 +421,7 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c $(GETOPTDEPS) ../src/config.h
/* We depend on etags to assure that parallel makes don\'t write two
etags.o files on top of each other. */
ctags${EXEEXT}: etags${EXEEXT}
$(CC) ${ALL_CFLAGS} -DCTAGS -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags
$(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs"\" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags
profile${EXEEXT}: ${srcdir}/profile.c ../src/config.h
$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile

49
lib-src/etags.c
View File

@ -1,7 +1,36 @@
/* Tags file maker to go with GNU Emacs -*- coding: latin-1 -*-
Copyright (C) 1984, 1987, 1988, 1989, 1993, 1994, 1995,
1998, 1999, 2000, 2001, 2002, 2003, 2004,
2005, 2006, 2007 Free Software Foundation, Inc. and Ken Arnold
Copyright (C) 1984 The Regents of the University of California
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the
distribution.
3. Neither the name of the University nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS''
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Copyright (C) 1984, 1987, 1988, 1989, 1993, 1994, 1995, 1998, 1999,
2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
Free Software Foundation, Inc.
This file is not considered part of GNU Emacs.
@ -19,6 +48,16 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
/* NB To comply with the above BSD license, copyright information is
reproduced in etc/ETAGS.README. That file should be updated when the
above notices are.
To the best of our knowledge, this code was originally based on the
ctags.c distributed with BSD4.2, which was copyrighted by the
University of California, as described above. */
/*
* Authors:
* Ctags originally by Ken Arnold.
@ -842,8 +881,8 @@ static void
print_version ()
{
printf ("%s (%s %s)\n", (CTAGS) ? "ctags" : "etags", EMACS_NAME, VERSION);
puts ("Copyright (C) 2007 Free Software Foundation, Inc. and Ken Arnold");
puts ("This program is distributed under the same terms as Emacs");
puts ("Copyright (C) 2007 Free Software Foundation, Inc.");
puts ("This program is distributed under the terms in ETAGS.README");
exit (EXIT_SUCCESS);
}

2
lib-src/makefile.w32-in
View File

@ -24,7 +24,7 @@ ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacs
.PHONY: $(ALL)
VERSION = 22.0.94
VERSION = 22.0.95
LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
-DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \

307
lisp/ChangeLog
View File

@ -1,3 +1,296 @@
2007-03-03 Christopher Allan Webber <cwebber@dustycloud.org> (tiny change)
* play/gamegrid.el (gamegrid-add-score-with-update-game-score-1):
Jump to the line where new score has been uploaded.
* play/tetris.el (tetris-move-bottom, tetris-move-left)
(tetris-move-right, tetris-rotate-prev, tetris-rotate-next):
Do nothing when the game is paused.
2007-03-03 Carsten Dominik <dominik@science.uva.nl>
* textmodes/org.el (org-set-tags): Prevent slipping of point
during completion.
2007-03-01 Lennart Borgman <lennart.borgman.073@student.lu.se>
* isearch.el (isearch-message-prefix):
Use minibuffer-prompt-properties.
2007-03-01 Vinicius Jose Latorre <viniciusjl@ig.com.br>
* ps-print.el: Replace (defvar VAR nil) by (defvar VAR).
(ps-setup): Print which Emacsen is running ps-print package.
2007-03-01 Stuart Herring <herring@lanl.gov> (tiny change)
* files.el (set-auto-mode-0): Use `indirect-function'.
(hack-one-local-variable): Don't reapply current major mode.
2007-03-01 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/python.el (python-quote-syntax): Don't bother with
syntax-ppss-context.
(python-fill-paragraph): Make sure that fenced-string delimiters that
stand on their own line stay there
2007-03-01 Lennart Borgman <lennart.borgman.073@student.lu.se>
* replace.el (perform-replace): Propertize message.
2007-03-01 Carsten Dominik <dominik@science.uva.nl>
* textmodes/org.el (org-prepare-agenda-buffers): Also check for
invisible heading.
2007-02-28 Chong Yidong <cyd@stupidchicken.com>
* net/tramp.el (tramp-file-name-handler): Revert last change.
2007-02-28 Nick Roberts <nickrob@snap.net.nz>
* progmodes/gdb-ui.el (gdb-mouse-until, gdb-mouse-jump):
Correct doc strings.
2007-02-28 Chong Yidong <cyd@stupidchicken.com>
* replace.el (perform-replace): Undo forward-char immediately if
non-adjacent search fails.
2007-02-28 Stefan Monnier <monnier@iro.umontreal.ca>
* version.el (emacs-major-version, emacs-minor-version):
string-to-int -> string-to-number.
2007-02-28 Juanma Barranquero <lekktu@gmail.com>
* help.el (where-is): Fail gracefully when not passed a command.
2007-02-28 Stuart Herring <herring@lanl.gov> (tiny change)
* find-lisp.el (find-lisp-default-directory-predicate):
Fix bug: Do symlink check on expanded filename.
2007-02-28 Carsten Dominik <dominik@science.uva.nl>
* textmodes/org.el (org-set-tags, org-table-get-field): Avoid case
changes during replacement.
(org-agenda-mode-map): Add default binding for `org-agenda-archive'.
2007-02-28 Lars Hansen <larsh@soem.dk>
* desktop.el: Delete header line listing me as maintainer.
2007-02-28 Glenn Morris <rgm@gnu.org>
* tutorial.el (tutorial--describe-nonstandard-key): Tweak text in
the menus case.
2007-02-28 Chong Yidong <cyd@stupidchicken.com>
* net/tramp.el (tramp-file-name-handler): Inhibit modification
hooks to avoid confusion when combining after-change calls.
2007-02-27 Ken Manheimer <ken.manheimer@gmail.com>
* allout.el (allout-encrypt-string): Remove inhibition of gpg-agent,
now that pgg-gpg-process-region correctly honors passed-in passphrase.
(allout-distinctive-bullets-string): Add info about bullet conventions.
(allout-mode): Add info about distinctive vs plain bullets.
2007-02-27 Carsten Dominik <dominik@science.uva.nl>
* textmodes/org.el (org-archive-subtree): Quote variable name.
(org-agenda-get-todos): Make sure skip properties are checked correctly.
2007-02-26 Nick Roberts <nickrob@snap.net.nz>
* progmodes/gud.el (gud-bashdb-history, gud-bashdb-marker-filter)
(gud-bashdb-command-name, bashdb): Remove.
(gud, gud-menu-map): Remove references to bash/bashdb.
2007-02-26 Andrey Zhdanov <susuman@hotmail.com> (tiny change)
(gud-pdb-marker-regexp): Add optional <module> keyword for Python 2.5.
2007-02-26 Romain Francoise <romain@orebokech.com>
* net/net-utils.el (whois-server-tld): Update server for .org.
(whois-server-list): Add whois.publicinterestregistry.net.
(whois-guess-server): Fix formatting in docstring.
2007-02-26 Kim F. Storm <storm@cua.dk>
* mouse.el (mouse-show-mark): Run hooks and perform command
remapping for mouse-region-delete-keys.
2007-02-26 Johan Bockg,Ae(Brd <bojohan@dd.chalmers.se>
* font-core.el (font-lock-mode): Doc fix.
2007-02-25 Kim F. Storm <storm@cua.dk>
* ido.el (ido-buffer-internal): Set this-command to fallback command.
Add selected buffer to buffer-name-history.
(ido-file-internal): Set this-command to fallback command.
Add file names to file-name-history.
* emacs-lisp/map-ynp.el (map-y-or-n-p):
Apply minibuffer-prompt-properties.
2007-02-25 Andreas Schwab <schwab@suse.de>
* files.el (hack-one-local-variable-eval-safep): Correct handling
of edebug-form-spec property value. Reported by Johan Bockg,Ae(Brd.
2007-02-25 Carsten Dominik <dominik@science.uva.nl>
* textmodes/org.el (org-table-overlay-coordinates)
(org-table-toggle-coordinate-overlays): New functions.
(org-table-overlay-coordinates, org-table-coordinate-overlays):
New variables.
(org-startup-with-deadline-check): Option removed.
(org-mode): Remove deadline check on startup.
(org-table-limit-column-width): Option removed.
(org-table-formula-numbers-only): Option removed.
(org-link-style, org-link-format): Options removed.
(org-select-agenda-window, org-fit-agenda-window): Options removed.
(org-export-ascii-show-new-buffer)
(org-export-html-show-new-buffer): Options removed.
(org-activate-links): Camel option removed.
(org-file-link-context-use-camel-case): Option removed.
(org-camel-regexp): Veriable removed.
(org-activate-camels): Function removed.
(org-store-link): Removed Camel stuff.
(org-make-org-heading-camel): Function removed.
(org-open-at-point): Removed camel stuff.
(org-link-search): Removed camel stuff.
(org-camel-to-words): Function removed.
(org-get-agenda-file-buffer): Make sure we prepare the base
buffers, not any indirect buffers.
(org-sort-entries): Sort top-level when not on a headline, and no
active region.
(org-in-regexp): New function.
(org-search-not-self): Renamed from `org-search-not-link'.
(org-open-link-marker): New variable.
(org-open-at-point): Set `org-open-link-marker'.
(org-print-icalendar-entries): Fixed bug with excluding DONE
entries from the exported list.
(org-edit-formula-lisp-indent): New command.
(orgtbl-to-texinfo, orgtbl-to-html): New functions.
(orgtbl-to-latex, orgtbl-insert-radio-table)
(orgtbl-toggle-comment, orgtbl-send-table): New functions.
(orgtbl-radio-table-templates): New option.
(org-store-link-props):
(org-remember-templates): More possibilities to insert info
into templates.
(org-remember-apply-template): Make use of the extended
template capabilities.
(org-remember-redo-template): New command.
(org-upgrade-old-links)
(org-table-modify-formulas, org-table-replace-in-formulas)
(org-table-find-dataline)
(org-table-get-vertical-vector): Functions removed.
(org-table-remove-rectangle-highlight)
(org-time-stamp-format, org-toggle-log-option)
(org-table-highlight-rectangle)
(org-table-iterate, org-table-make-reference):
(org-translate-time, org-tree-to-indirect-buffer)
(org-table-field-info, org-table-fix-formulas)
(org-table-force-dataline, org-table-get-descriptor-line)
(org-table-get-range)
(org-skip-comments, org-sort)
(org-sort-entries, org-sublist, org-table-add-rectangle-overlay)
(org-table-current-dline, org-table-current-field-formula)
(org-table-edit-backward-field)
(org-table-edit-formulas-post-command)
(org-table-edit-line-down, org-table-edit-line-up)
(org-agenda-archive)
(org-agenda-clock-cancel)
(org-agenda-clock-out, org-agenda-list-stuck-projects)
(org-agenda-open-link, org-agenda-show-new-time)
(org-agenda-skip-subtree-when-regexp-matches)
(org-agenda-tree-to-indirect-buffer, org-agenda-undo)
(org-at-regexp-p, org-auto-repeat-maybe, org-check-log-option)
(org-do-sort, org-file-image-p, org-find-overlays)
(org-find-row-type, org-get-indirect-buffer, org-get-repeat)
(org-highlight-until-next-command, org-isearch-end)
(org-match-any-p, org-next-link, org-previous-link):
(org-remove-subtree-entries-from-agenda, org-replace-escapes)
(org-rewrite-old-row-references)
(org-isearch-post-command)
(org-table-edit-move, org-table-edit-next-field)
(org-table-edit-scroll, org-table-edit-scroll-down)
(org-set-frame-title, org-show-reference)
(org-unhighlight-once, org-verify-change-for-undo): New functions.
(org-show-variable): Command removed.
(org-add-log-maybe): New arguments STATE, FINDPOS
(org-table-sort-lines): Rewritten from scratch.
(org-link-search): New argument AVOID-POS.
(org-print-icalendar-entries): Argument CATEGORY removed.
(org-run-agenda-series): Argument WONDOW removed.
(org-next-link, org-previous-link): New commands.
(org-agenda-date-format): New option.
(org-table-iterate): New command.
(org-table-modify-formulas)
(org-table-replace-in-formulas): Functions removed.
(org-table-fix-formulas): New function.
(org-table-insert-column, org-table-delete-column)
(org-table-move-column): Use `org-table-fix-formulas'.
(org-follow-gnus-link): Patch from Bastien/Leo.
(org-table-current-field-formula): New function.
(org-file-image-p): New function.
(org-agenda-show-new-time): New function.
(org-agenda-date-later): Call `org-agenda-show-new-time'.
(org-with-remote-undo): New macro.
(org-agenda-undo): New command.
(org-verify-change-for-undo): New function.
(org-time-stamp-format): New function.
(org-agenda-get-timestamps): Skip scheduled if DONE and requested
by user.
(org-match-any-p): New function.
(org-make-tags-matcher): Handle regular expressions for tag and
todo matches.
(org-read-date): Accept "+N" as input for a date relative to the
current date.
(org-remove-subtree-entries-from-agenda): New function.
(org-agenda-archive, org-agenda-kill): Use
`org-remove-subtree-entries-from-agenda'.
(org-do-sort, org-sort-entries): New functions.
(org-sort): New command.
(org-table-sort-lines): Use `org-do-sort'.
(org-fix-decoded-time): New function.
(org-table-number-regexp): Require 0x... to identify as number
in tables.
(org-startup-options): New keywords for note taking.
(org-upgrade-old-links): Function removed.
(org-get-repeat): New function.
(org-show-context): Also show siblings on current level.
(org-show-siblings): New function.
(org-isearch-end, org-isearch-post-command): New functions.
(org-show-siblings): New option.
(org-show-context): Use `org-show-siblings'.
(org-table-maybe-recalculate-line): No longer require `calc-eval'
to be bound, because user may just use elisp.
2007-02-24 Kim F. Storm <storm@cua.dk>
* emulation/cua-base.el (cua-paste): Handle x-clipboard-yank.
(cua--init-keymaps): Remap x-clipboard-yank to cua-paste.
2007-02-24 Dan Nicolaescu <dann@ics.uci.edu>
* startup.el (command-line): Also check if the abbrev file is readable.
2007-02-24 John Paul Wallington <jpw@pobox.com>
* net/tls.el (tls-certtool-program): Fix custom type.
* mail/feedmail.el (feedmail-message-id-generator)
(feedmail-date-generator): Fix custom types.
* mail/rmail.el (rmail-message-filter): Fix custom type.
2007-02-24 Eli Zaretskii <eliz@gnu.org>
* startup.el (command-line): If simple.el cannot be found, proceed
@ -41,16 +334,14 @@
* progmodes/idlw-shell.el (idlwave-shell-mode): Clean up pending
commands, for restart.
(idlwave-shell-current-module): Fix handling of module name by
type.
(idlwave-shell-current-module): Fix handling of module name by type.
(idlwave-shell-break-in): Update type handling.
(idlwave-shell-bp-get): Encode type in BP structure.
(idlwave-shell-set-bp): Fix setting condition/count on disabled
BPs.
(idlwave-shell-module-source-query): Query routine info based on
type. Fix path parsing for non-compiled files.
(idlwave-shell-module-source-filter): Don't signal error in
filter if no source found.
(idlwave-shell-set-bp): Fix setting condition/count on disabled BPs.
(idlwave-shell-module-source-query): Query routine info based on type.
Fix path parsing for non-compiled files.
(idlwave-shell-module-source-filter): Don't signal error in filter
if no source found.
(idlwave-shell-set-bp-in-module): Use fallback source to prevent
filter race.

68
lisp/allout.el
View File

@ -324,29 +324,42 @@ of this var to take effect."
(defcustom allout-distinctive-bullets-string "*+-=>()[{}&!?#%\"X@$~_\\:;^"
"*Persistent outline header bullets used to distinguish special topics.
These bullets are used to distinguish topics from the run-of-the-mill
ones. They are not used in the standard topic headers created by
the topic-opening, shifting, and rebulleting (eg, on topic shift,
topic paste, blanket rebulleting) routines, but are offered among the
choices for rebulleting. They are not altered by the above automatic
rebulleting, so they can be used to characterize topics, eg:
These bullets are distinguish topics with particular character.
They are not used by default in the topic creation routines, but
are offered as options when you modify topic creation with a
universal argument \(\\[universal-argument]), or during rebulleting \(\\[allout-rebullet-current-heading]).
`?' question topics
`(' parenthetic comment (with a matching close paren inside)
`[' meta-note (with a matching close ] inside)
`\"' a quotation
`=' value settings
`~' \"more or less\"
`^' see above
Distinctive bullets are not cycled when topics are shifted or
otherwise automatically rebulleted, so their marking is
persistent until deliberately changed. Their significance is
purely by convention, however. Some conventions suggest
themselves:
... for example. (`#' typically has a special meaning to the software,
according to the value of `allout-numbered-bullet'.)
`(' - open paren - an aside or incidental point
`?' - question mark - uncertain or outright question
`!' - exclamation point/bang - emphatic
`[' - open square bracket - meta-note, about item instead of item's subject
`\"' - double quote - a quotation or other citation
`=' - equal sign - an assignement, equating a name with some connotation
`^' - carat - relates to something above
See `allout-plain-bullets-string' for the selection of
alternating bullets.
Some are more elusive, but their rationale may be recognizable:
`+' - plus - pending consideration, completion
`_' - underscore - done, completed
`&' - ampersand - addendum, furthermore
\(Some other non-plain bullets have special meaning to the
software. By default:
`~' marks encryptable topics - see `allout-topic-encryption-bullet'
`#' marks auto-numbered bullets - see `allout-numbered-bullet'.)
See `allout-plain-bullets-string' for the standard, alternating
bullets.
You must run `set-allout-regexp' in order for outline mode to
reconcile to changes of this value.
adopt changes of this value.
DO NOT include the close-square-bracket, `]', on either of the bullet
strings."
@ -1878,11 +1891,14 @@ PREFIX-PADDING:
bullet, determining the ITEM's DEPTH.
BULLET: A character at the end of the ITEM PREFIX, it must be one of
the characters listed on `allout-plain-bullets-string' or
`allout-distinctive-bullets-string'. (See the documentation
for these variables for more details.) The default choice of
BULLET when generating ITEMs varies in a cycle with the DEPTH of
the ITEM.
`allout-distinctive-bullets-string'. When creating a TOPIC,
plain BULLETs are by default used, according to the DEPTH of the
TOPIC. Choice among the distinctive BULLETs is offered when you
provide a universal argugment \(\\[universal-argument]) to the
TOPIC creation command, or when explictly rebulleting a TOPIC. The
significance of the various distinctive bullets is purely by
convention. See the documentation for the above bullet strings for
more details.
EXPOSURE:
The state of a TOPIC which determines the on-screen visibility
of its OFFSPRING and contained ENTRY text.
@ -1994,6 +2010,7 @@ OPEN: A TOPIC that is not CLOSED, though its OFFSPRING or BODY may be."
minor-mode-map-alist)))
(add-to-invisibility-spec '(allout . t))
(allout-add-resumptions '(line-move-ignore-invisible t))
(add-hook 'pre-command-hook 'allout-pre-command-business nil t)
(add-hook 'post-command-hook 'allout-post-command-business nil t)
@ -5998,10 +6015,7 @@ Returns the resulting string, or nil if the transformation fails."
(rejections-left (- allout-encryption-ciphertext-rejection-ceiling
rejected))
result-text status
;; Inhibit gpg-agent use for symmetric keys in the scope of this let:
(pgg-gpg-use-agent (if (equal key-type 'keypair)
pgg-gpg-use-agent
nil)))
)
(if (and fetch-pass (not passphrase))
;; Force later fetch by evicting passphrase from the cache.

1
lisp/desktop.el
View File

@ -4,7 +4,6 @@
;; 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
;; Author: Morten Welinder <terra@diku.dk>
;; Maintainter: Lars Hansen <larsh@soem.dk>
;; Keywords: convenience
;; Favourite-brand-of-beer: None, I hate beer.

3
lisp/emacs-lisp/map-ynp.el
View File

@ -149,7 +149,8 @@ Returns the number of actions taken."
;; Prompt in the echo area.
(let ((cursor-in-echo-area (not no-cursor-in-echo-area))
(message-log-max nil))
(message "%s(y, n, !, ., q, %sor %s) "
(message (apply 'propertize "%s(y, n, !, ., q, %sor %s) "
minibuffer-prompt-properties)
prompt user-keys
(key-description (vector help-char)))
(if minibuffer-auto-raise

3
lisp/emulation/cua-base.el
View File

@ -930,6 +930,8 @@ If global mark is active, copy from register or one character."
(if arg (goto-char pt))))
((eq this-original-command 'clipboard-yank)
(clipboard-yank))
((eq this-original-command 'x-clipboard-yank)
(x-clipboard-yank))
(t (yank arg)))))))
@ -1406,6 +1408,7 @@ If ARG is the atom `-', scroll upward by nearly full screen."
;; replace region with rectangle or element on kill ring
(define-key cua-global-keymap [remap yank] 'cua-paste)
(define-key cua-global-keymap [remap clipboard-yank] 'cua-paste)
(define-key cua-global-keymap [remap x-clipboard-yank] 'cua-paste)
;; replace current yank with previous kill ring element
(define-key cua-global-keymap [remap yank-pop] 'cua-paste-pop)
;; set mark

23
lisp/files.el
View File

@ -2285,14 +2285,12 @@ only set the major mode, if that would change it."
If optional arg KEEP-MODE-IF-SAME is non-nil, MODE is chased of
any aliases and compared to current major mode. If they are the
same, do nothing and return nil."
(when keep-mode-if-same
(while (symbolp (symbol-function mode))
(setq mode (symbol-function mode)))
(if (eq mode major-mode)
(setq mode nil)))
(unless (and keep-mode-if-same
(eq (indirect-function mode)
(indirect-function major-mode)))
(when mode
(funcall mode)
mode))
mode)))
(defun set-auto-mode-1 ()
"Find the -*- spec in the buffer.
@ -2788,7 +2786,8 @@ It is dangerous if either of these conditions are met:
;; During bootstrapping, edebug-basic-spec might not be
;; defined yet.
(and (fboundp 'edebug-basic-spec)
(edebug-basic-spec val))))))
(hack-one-local-variable-quotep val)
(edebug-basic-spec (nth 1 val)))))))
;; Allow expressions that the user requested.
(member exp safe-local-eval-forms)
;; Certain functions can be allowed with safe arguments
@ -2811,9 +2810,15 @@ It is dangerous if either of these conditions are met:
ok)))))))
(defun hack-one-local-variable (var val)
"Set local variable VAR with value VAL."
"Set local variable VAR with value VAL.
If VAR is `mode', call `VAL-mode' as a function unless it's
already the major mode."
(cond ((eq var 'mode)
(funcall (intern (concat (downcase (symbol-name val)) "-mode"))))
(let ((mode (intern (concat (downcase (symbol-name val))
"-mode"))))
(unless (eq (indirect-function mode)
(indirect-function major-mode))
(funcall mode))))
((eq var 'eval)
(save-excursion (eval val)))
(t

2
lisp/find-lisp.el
View File

@ -95,7 +95,7 @@ PARENT is the parent directory of DIR."
(string= dir "..")
;; Skip directories which are symlinks
;; Easy way to circumvent recursive loops
(file-symlink-p dir))))
(file-symlink-p (expand-file-name dir parent)))))
(defun find-lisp-default-file-predicate (file dir)
"True if FILE matches `find-lisp-regexp'.

4
lisp/font-core.el
View File

@ -124,10 +124,6 @@ generally prefer. When you turn Font Lock mode on/off the buffer is
fontified/defontified, though fontification occurs only if the buffer is
less than `font-lock-maximum-size'.
For example, to use maximum levels of fontification, put in your ~/.emacs:
(setq font-lock-maximum-decoration t)
To add your own highlighting for some major mode, and modify the highlighting
selected automatically via the variable `font-lock-maximum-decoration', you can
use `font-lock-add-keywords'.

13
lisp/gnus/ChangeLog
View File

@ -1,3 +1,16 @@
2007-02-28 Katsumi Yamaoka <yamaoka@jpl.org>
* message.el (message-make-in-reply-to): Quote name containing
non-ASCII characters. It will make the RFC2047 encoder cause an error
if there are special characters. Reported by NAKAJI Hiroyuki
<nakaji@kankyo-u.ac.jp>.
2007-02-27 Katsumi Yamaoka <yamaoka@jpl.org>
* nntp.el (nntp-never-echoes-commands)
(nntp-open-connection-functions-never-echo-commands): New variables.
(nntp-send-command): Use them.
2007-02-15 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de>
* nnweb.el (nnweb-google-parse-1): Fix date parsing to also match on

23
lisp/gnus/message.el
View File

@ -4864,8 +4864,27 @@ If NOW, use that time instead."
(msg-id (mail-header-message-id message-reply-headers)))
(when from
(let ((name (mail-extract-address-components from)))
(concat msg-id (if msg-id " (")
(or (car name)
(concat
msg-id (if msg-id " (")
(if (car name)
(if (string-match "[^\000-\177]" (car name))
;; Quote a string containing non-ASCII characters.
;; It will make the RFC2047 encoder cause an error
;; if there are special characters.
(let ((default-enable-multibyte-characters t))
(with-temp-buffer
(insert (car name))
(goto-char (point-min))
(while (search-forward "\"" nil t)
(when (prog2
(backward-char)
(zerop (% (skip-chars-backward "\\\\") 2))
(goto-char (match-beginning 0)))
(insert "\\"))
(forward-char))
;; Those quotes will be removed by the RFC2047 encoder.
(concat "\"" (buffer-string) "\"")))
(car name))
(nth 1 name))
"'s message of \""
(if (or (not date) (string= date ""))

27
lisp/gnus/nntp.el
View File

@ -88,6 +88,21 @@ Indirect connections:
- `nntp-open-via-rlogin-and-telnet',
- `nntp-open-via-telnet-and-telnet'.")
(defvoo nntp-never-echoes-commands nil
"*Non-nil means the nntp server never echoes commands.
It is reported that some nntps server doesn't echo commands. So, you
may want to set this to non-nil in the method for such a server setting
`nntp-open-connection-function' to `nntp-open-ssl-stream' for example.
Note that the `nntp-open-connection-functions-never-echo-commands'
variable overrides the nil value of this variable.")
(defvoo nntp-open-connection-functions-never-echo-commands
'(nntp-open-network-stream)
"*List of functions that never echo commands.
Add or set a function which you set to `nntp-open-connection-function'
to this list if it does not echo commands. Note that a non-nil value
of the `nntp-never-echoes-commands' variable overrides this variable.")
(defvoo nntp-pre-command nil
"*Pre-command to use with the various nntp-open-via-* methods.
This is where you would put \"runsocks\" or stuff like that.")
@ -450,11 +465,15 @@ be restored and the command retried."
nntp-server-buffer
wait-for nnheader-callback-function)
;; If nothing to wait for, still remove possibly echo'ed commands.
;; We don't have echos if nntp-open-connection-function
;; is `nntp-open-network-stream', so we skip this in that case.
;; We don't have echoes if `nntp-never-echoes-commands' is non-nil
;; or the value of `nntp-open-connection-function' is in
;; `nntp-open-connection-functions-never-echo-commands', so we
;; skip this in that cases.
(unless (or wait-for
(equal nntp-open-connection-function
'nntp-open-network-stream))
nntp-never-echoes-commands
(memq
nntp-open-connection-function
nntp-open-connection-functions-never-echo-commands))
(nntp-accept-response)
(save-excursion
(set-buffer buffer)

1
lisp/help.el
View File

@ -491,6 +491,7 @@ If INSERT (the prefix arg) is non-nil, insert the message in the buffer."
"Where is command: ")
obarray 'commandp t))
(list (if (equal val "") fn (intern val)) current-prefix-arg)))
(unless definition (error "No command"))
(let ((func (indirect-function definition))
(defs nil)
(standard-output (if insert (current-buffer) t)))

22
lisp/ido.el
View File

@ -2163,9 +2163,9 @@ If cursor is not at the end of the user input, move to end of input."
((eq ido-exit 'fallback)
(let ((read-buffer-function nil))
(run-hook-with-args 'ido-before-fallback-functions
(or fallback 'switch-to-buffer))
(call-interactively (or fallback 'switch-to-buffer))))
(setq this-command (or fallback 'switch-to-buffer))
(run-hook-with-args 'ido-before-fallback-functions this-command)
(call-interactively this-command)))
;; Check buf is non-nil.
((not buf) nil)
@ -2173,6 +2173,7 @@ If cursor is not at the end of the user input, move to end of input."
;; View buffer if it exists
((get-buffer buf)
(add-to-history 'buffer-name-history buf)
(if (eq method 'insert)
(progn
(ido-record-command 'insert-buffer buf)
@ -2192,6 +2193,7 @@ If cursor is not at the end of the user input, move to end of input."
;; create a new buffer
(t
(add-to-history 'buffer-name-history buf)
(setq buf (get-buffer-create buf))
(if (fboundp 'set-buffer-major-mode)
(set-buffer-major-mode buf))
@ -2304,9 +2306,9 @@ If cursor is not at the end of the user input, move to end of input."
;; we don't want to change directory of current buffer.
(let ((default-directory ido-current-directory)
(read-file-name-function nil))
(run-hook-with-args 'ido-before-fallback-functions
(or fallback 'find-file))
(call-interactively (or fallback 'find-file))))
(setq this-command (or fallback 'find-file))
(run-hook-with-args 'ido-before-fallback-functions this-command)
(call-interactively this-command)))
((eq ido-exit 'switch-to-buffer)
(ido-buffer-internal ido-default-buffer-method nil nil nil ido-text))
@ -2363,9 +2365,11 @@ If cursor is not at the end of the user input, move to end of input."
((eq method 'write)
(ido-record-work-file filename)
(setq default-directory ido-current-directory)
(ido-record-command 'write-file (concat ido-current-directory filename))
(setq filename (concat ido-current-directory filename))
(ido-record-command 'write-file filename)
(add-to-history 'file-name-history filename)
(ido-record-work-directory)
(write-file (concat ido-current-directory filename)))
(write-file filename))
((eq method 'read-only)
(ido-record-work-file filename)
@ -2381,6 +2385,7 @@ If cursor is not at the end of the user input, move to end of input."
(ido-record-command
(if ido-find-literal 'insert-file-literally 'insert-file)
filename)
(add-to-history 'file-name-history filename)
(ido-record-work-directory)
(insert-file-1 filename
(if ido-find-literal
@ -2391,6 +2396,7 @@ If cursor is not at the end of the user input, move to end of input."
(ido-record-work-file filename)
(setq filename (concat ido-current-directory filename))
(ido-record-command 'find-file filename)
(add-to-history 'file-name-history filename)
(ido-record-work-directory)
(ido-visit-buffer (find-file-noselect filename nil ido-find-literal) method))))))

5
lisp/isearch.el
View File

@ -1957,8 +1957,9 @@ If there is no completion possible, say so and continue searching."
(concat " [" current-input-method-title "]: ")
": ")
)))
(propertize (concat (upcase (substring m 0 1)) (substring m 1))
'face 'minibuffer-prompt)))
(apply 'propertize
(concat (upcase (substring m 0 1)) (substring m 1))
minibuffer-prompt-properties)))
(defun isearch-message-suffix (&optional c-q-hack ellipsis)
(concat (if c-q-hack "^Q" "")

245
lisp/ldefs-boot.el
View File

@ -524,7 +524,7 @@ A replacement function for `newline-and-indent', aligning as it goes.
;;;***
;;;### (autoloads (outlineify-sticky allout-mode) "allout" "allout.el"
;;;;;; (17888 32278))
;;;;;; (17963 18444))
;;; Generated autoloads from allout.el
(put (quote allout-show-bodies) (quote safe-local-variable) (if (fboundp (quote booleanp)) (quote booleanp) (quote (lambda (x) (member x (quote (t nil)))))))
@ -796,11 +796,14 @@ PREFIX-PADDING:
bullet, determining the ITEM's DEPTH.
BULLET: A character at the end of the ITEM PREFIX, it must be one of
the characters listed on `allout-plain-bullets-string' or
`allout-distinctive-bullets-string'. (See the documentation
for these variables for more details.) The default choice of
BULLET when generating ITEMs varies in a cycle with the DEPTH of
the ITEM.
`allout-distinctive-bullets-string'. When creating a TOPIC,
plain BULLETs are by default used, according to the DEPTH of the
TOPIC. Choice among the distinctive BULLETs is offered when you
provide a universal argugment (\\[universal-argument]) to the
TOPIC creation command, or when explictly rebulleting a TOPIC. The
significance of the various distinctive bullets is purely by
convention. See the documentation for the above bullet strings for
more details.
EXPOSURE:
The state of a TOPIC which determines the on-screen visibility
of its OFFSPRING and contained ENTRY text.
@ -5542,7 +5545,7 @@ INHERIT-INPUT-METHOD.
;;;***
;;;### (autoloads (cua-selection-mode cua-mode) "cua-base" "emulation/cua-base.el"
;;;;;; (17888 32279))
;;;;;; (17963 18438))
;;; Generated autoloads from emulation/cua-base.el
(defvar cua-mode nil "\
@ -6520,7 +6523,7 @@ as well as widgets, buttons, overlays, and text properties.
;;;### (autoloads (desktop-revert desktop-save-in-desktop-dir desktop-change-dir
;;;;;; desktop-load-default desktop-read desktop-remove desktop-save
;;;;;; desktop-clear desktop-locals-to-save desktop-save-mode) "desktop"
;;;;;; "desktop.el" (17888 32279))
;;;;;; "desktop.el" (17963 18446))
;;; Generated autoloads from desktop.el
(defvar desktop-save-mode nil "\
@ -10732,7 +10735,7 @@ Unconditionally turn on Fast Lock mode.
;;;### (autoloads (feedmail-queue-reminder feedmail-run-the-queue
;;;;;; feedmail-run-the-queue-global-prompt feedmail-run-the-queue-no-prompts
;;;;;; feedmail-send-it) "feedmail" "mail/feedmail.el" (17888 32266))
;;;;;; feedmail-send-it) "feedmail" "mail/feedmail.el" (17963 18438))
;;; Generated autoloads from mail/feedmail.el
(autoload (quote feedmail-send-it) "feedmail" "\
@ -11233,7 +11236,7 @@ Define some key bindings for the find-function family of functions.
;;;***
;;;### (autoloads (find-lisp-find-dired-filter find-lisp-find-dired-subdirectories
;;;;;; find-lisp-find-dired) "find-lisp" "find-lisp.el" (17888 32279))
;;;;;; find-lisp-find-dired) "find-lisp" "find-lisp.el" (17963 18447))
;;; Generated autoloads from find-lisp.el
(autoload (quote find-lisp-find-dired) "find-lisp" "\
@ -11676,7 +11679,7 @@ and choose the directory as the fortune-file.
;;;***
;;;### (autoloads (gdb-enable-debug gdba) "gdb-ui" "progmodes/gdb-ui.el"
;;;;;; (17888 36650))
;;;;;; (17963 18447))
;;; Generated autoloads from progmodes/gdb-ui.el
(autoload (quote gdba) "gdb-ui" "\
@ -12820,8 +12823,8 @@ the form \"WINDOW-ID PIXMAP-ID\". Value is non-nil if successful.
;;;***
;;;### (autoloads (gdb-script-mode bashdb jdb pdb perldb xdb dbx
;;;;;; sdb gdb) "gud" "progmodes/gud.el" (17888 36930))
;;;### (autoloads (gdb-script-mode jdb pdb perldb xdb dbx sdb gdb)
;;;;;; "gud" "progmodes/gud.el" (17963 18441))
;;; Generated autoloads from progmodes/gud.el
(autoload (quote gdb) "gud" "\
@ -12892,13 +12895,6 @@ original source file access method.
For general information about commands available to control jdb from
gud, see `gud-mode'.
\(fn COMMAND-LINE)" t nil)
(autoload (quote bashdb) "gud" "\
Run bashdb on program FILE in buffer *gud-FILE*.
The directory containing FILE becomes the initial working directory
and source-file directory for your debugger.
\(fn COMMAND-LINE)" t nil)
(add-hook 'same-window-regexps "\\*gud-.*\\*\\(\\|<[0-9]+>\\)")
@ -14710,8 +14706,8 @@ The main features of this mode are
;;;;;; ido-find-alternate-file ido-find-file-other-window ido-find-file
;;;;;; ido-find-file-in-dir ido-switch-buffer-other-frame ido-insert-buffer
;;;;;; ido-kill-buffer ido-display-buffer ido-switch-buffer-other-window
;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (17888
;;;;;; 36648))
;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (17963
;;;;;; 18439))
;;; Generated autoloads from ido.el
(defvar ido-mode nil "\
@ -17682,7 +17678,7 @@ turn on menu bars; otherwise, turn off menu bars.
;;;;;; message-cite-function message-yank-prefix message-citation-line-function
;;;;;; message-send-mail-function message-user-organization-file
;;;;;; message-signature-separator message-from-style) "message"
;;;;;; "gnus/message.el" (17888 32279))
;;;;;; "gnus/message.el" (17963 18449))
;;; Generated autoloads from gnus/message.el
(defvar message-from-style (quote default) "\
@ -18884,7 +18880,7 @@ Enable mouse wheel support.
;;;### (autoloads (network-connection network-connection-to-service
;;;;;; whois-reverse-lookup whois finger ftp run-dig dns-lookup-host
;;;;;; nslookup nslookup-host route arp netstat ipconfig ping traceroute)
;;;;;; "net-utils" "net/net-utils.el" (17888 32280))
;;;;;; "net-utils" "net/net-utils.el" (17963 18441))
;;; Generated autoloads from net/net-utils.el
(autoload (quote traceroute) "net-utils" "\
@ -19506,12 +19502,12 @@ The Custom feature is intended to make this obsolete.
;;;***
;;;### (autoloads (org-export-icalendar-combine-agenda-files org-export-icalendar-all-agenda-files
;;;;;; org-export-icalendar-this-file orgtbl-mode turn-on-orgtbl
;;;;;; org-remember-handler org-remember-apply-template org-remember-annotation
;;;;;; org-store-link org-tags-view org-diary org-cycle-agenda-files
;;;;;; org-todo-list org-agenda-list org-batch-agenda org-agenda
;;;;;; org-export-icalendar-this-file org-diary org-tags-view org-todo-list
;;;;;; org-agenda-list org-cycle-agenda-files org-batch-agenda org-agenda
;;;;;; org-remember-handler org-remember org-remember-apply-template
;;;;;; org-remember-annotation org-store-link orgtbl-mode turn-on-orgtbl
;;;;;; org-global-cycle org-cycle org-mode) "org" "textmodes/org.el"
;;;;;; (17888 36930))
;;;;;; (17963 18455))
;;; Generated autoloads from textmodes/org.el
(autoload (quote org-mode) "org" "\
@ -19570,6 +19566,84 @@ Cycle the global visibility. For details see `org-cycle'.
\(fn &optional ARG)" t nil)
(autoload (quote turn-on-orgtbl) "org" "\
Unconditionally turn on `orgtbl-mode'.
\(fn)" nil nil)
(autoload (quote orgtbl-mode) "org" "\
The `org-mode' table editor as a minor mode for use in other modes.
\(fn &optional ARG)" t nil)
(autoload (quote org-store-link) "org" "\
\\<org-mode-map>Store an org-link to the current location.
This link can later be inserted into an org-buffer with
\\[org-insert-link].
For some link types, a prefix arg is interpreted:
For links to usenet articles, arg negates `org-usenet-links-prefer-google'.
For file links, arg negates `org-context-in-file-links'.
\(fn ARG)" t nil)
(autoload (quote org-remember-annotation) "org" "\
Return a link to the current location as an annotation for remember.el.
If you are using Org-mode files as target for data storage with
remember.el, then the annotations should include a link compatible with the
conventions in Org-mode. This function returns such a link.
\(fn)" nil nil)
(autoload (quote org-remember-apply-template) "org" "\
Initialize *remember* buffer with template, invoke `org-mode'.
This function should be placed into `remember-mode-hook' and in fact requires
to be run from that hook to fucntion properly.
\(fn &optional USE-CHAR SKIP-INTERACTIVE)" nil nil)
(autoload (quote org-remember) "org" "\
Call `remember'. If this is already a remember buffer, re-apply template.
If there is an active region, make sure remember uses it as initial content
of the remember buffer.
\(fn)" t nil)
(autoload (quote org-remember-handler) "org" "\
Store stuff from remember.el into an org file.
First prompts for an org file. If the user just presses return, the value
of `org-default-notes-file' is used.
Then the command offers the headings tree of the selected file in order to
file the text at a specific location.
You can either immediately press RET to get the note appended to the
file, or you can use vertical cursor motion and visibility cycling (TAB) to
find a better place. Then press RET or <left> or <right> in insert the note.
Key Cursor position Note gets inserted
-----------------------------------------------------------------------------
RET buffer-start as level 2 heading at end of file
RET on headline as sublevel of the heading at cursor
RET no heading at cursor position, level taken from context.
Or use prefix arg to specify level manually.
<left> on headline as same level, before current heading
<right> on headline as same level, after current heading
So the fastest way to store the note is to press RET RET to append it to
the default file. This way your current train of thought is not
interrupted, in accordance with the principles of remember.el. But with
little extra effort, you can push it directly to the correct location.
Before being stored away, the function ensures that the text has a
headline, i.e. a first line that starts with a \"*\". If not, a headline
is constructed from the current date and some additional data.
If the variable `org-adapt-indentation' is non-nil, the entire text is
also indented so that it starts in the same column as the headline
\(i.e. after the stars).
See also the variable `org-reverse-note-order'.
\(fn)" nil nil)
(autoload (quote org-agenda) "org" "\
Dispatch agenda commands to collect entries to the agenda buffer.
Prompts for a character to select a command. Any prefix arg will be passed
@ -19602,6 +19676,13 @@ before running the agenda command.
\(fn CMD-KEY &rest PARAMETERS)" nil (quote macro))
(autoload (quote org-cycle-agenda-files) "org" "\
Cycle through the files in `org-agenda-files'.
If the current buffer visits an agenda file, find the next one in the list.
If the current buffer does not, find the first agenda file.
\(fn)" t nil)
(autoload (quote org-agenda-list) "org" "\
Produce a weekly view from all files in variable `org-agenda-files'.
The view will be for the current week, but from the overview buffer you
@ -19626,12 +19707,11 @@ for a keyword. A numeric prefix directly selects the Nth keyword in
\(fn ARG)" t nil)
(autoload (quote org-cycle-agenda-files) "org" "\
Cycle through the files in `org-agenda-files'.
If the current buffer visits an agenda file, find the next one in the list.
If the current buffer does not, find the first agenda file.
(autoload (quote org-tags-view) "org" "\
Show all headlines for all `org-agenda-files' matching a TAGS criterion.
The prefix arg TODO-ONLY limits the search to TODO entries.
\(fn)" t nil)
\(fn &optional TODO-ONLY MATCH)" t nil)
(autoload (quote org-diary) "org" "\
Return diary information from org-files.
@ -19679,83 +19759,6 @@ function from a program - use `org-agenda-get-day-entries' instead.
\(fn &rest ARGS)" nil nil)
(autoload (quote org-tags-view) "org" "\
Show all headlines for all `org-agenda-files' matching a TAGS criterion.
The prefix arg TODO-ONLY limits the search to TODO entries.
\(fn &optional TODO-ONLY MATCH)" t nil)
(autoload (quote org-store-link) "org" "\
\\<org-mode-map>Store an org-link to the current location.
This link can later be inserted into an org-buffer with
\\[org-insert-link].
For some link types, a prefix arg is interpreted:
For links to usenet articles, arg negates `org-usenet-links-prefer-google'.
For file links, arg negates `org-context-in-file-links'.
\(fn ARG)" t nil)
(autoload (quote org-remember-annotation) "org" "\
Return a link to the current location as an annotation for remember.el.
If you are using Org-mode files as target for data storage with
remember.el, then the annotations should include a link compatible with the
conventions in Org-mode. This function returns such a link.
\(fn)" nil nil)
(autoload (quote org-remember-apply-template) "org" "\
Initialize *remember* buffer with template, invoke `org-mode'.
This function should be placed into `remember-mode-hook' and in fact requires
to be run from that hook to fucntion properly.
\(fn)" nil nil)
(autoload (quote org-remember-handler) "org" "\
Store stuff from remember.el into an org file.
First prompts for an org file. If the user just presses return, the value
of `org-default-notes-file' is used.
Then the command offers the headings tree of the selected file in order to
file the text at a specific location.
You can either immediately press RET to get the note appended to the
file, or you can use vertical cursor motion and visibility cycling (TAB) to
find a better place. Then press RET or <left> or <right> in insert the note.
Key Cursor position Note gets inserted
-----------------------------------------------------------------------------
RET buffer-start as level 2 heading at end of file
RET on headline as sublevel of the heading at cursor
RET no heading at cursor position, level taken from context.
Or use prefix arg to specify level manually.
<left> on headline as same level, before current heading
<right> on headline as same level, after current heading
So the fastest way to store the note is to press RET RET to append it to
the default file. This way your current train of thought is not
interrupted, in accordance with the principles of remember.el. But with
little extra effort, you can push it directly to the correct location.
Before being stored away, the function ensures that the text has a
headline, i.e. a first line that starts with a \"*\". If not, a headline
is constructed from the current date and some additional data.
If the variable `org-adapt-indentation' is non-nil, the entire text is
also indented so that it starts in the same column as the headline
\(i.e. after the stars).
See also the variable `org-reverse-note-order'.
\(fn)" nil nil)
(autoload (quote turn-on-orgtbl) "org" "\
Unconditionally turn on `orgtbl-mode'.
\(fn)" nil nil)
(autoload (quote orgtbl-mode) "org" "\
The `org-mode' table editor as a minor mode for use in other modes.
\(fn &optional ARG)" t nil)
(autoload (quote org-export-icalendar-this-file) "org" "\
Export current file as an iCalendar file.
The iCalendar file will be located in the same directory as the Org-mode
@ -21462,8 +21465,8 @@ Not documented
;;;;;; ps-spool-region ps-spool-buffer-with-faces ps-spool-buffer
;;;;;; ps-print-region-with-faces ps-print-region ps-print-buffer-with-faces
;;;;;; ps-print-buffer ps-print-customize ps-print-color-p ps-paper-type
;;;;;; ps-page-dimensions-database) "ps-print" "ps-print.el" (17888
;;;;;; 36936))
;;;;;; ps-page-dimensions-database) "ps-print" "ps-print.el" (17963
;;;;;; 18455))
;;; Generated autoloads from ps-print.el
(defvar ps-page-dimensions-database (list (list (quote a4) (/ (* 72 21.0) 2.54) (/ (* 72 29.7) 2.54) "A4") (list (quote a3) (/ (* 72 29.7) 2.54) (/ (* 72 42.0) 2.54) "A3") (list (quote letter) (* 72 8.5) (* 72 11.0) "Letter") (list (quote legal) (* 72 8.5) (* 72 14.0) "Legal") (list (quote letter-small) (* 72 7.68) (* 72 10.16) "LetterSmall") (list (quote tabloid) (* 72 11.0) (* 72 17.0) "Tabloid") (list (quote ledger) (* 72 17.0) (* 72 11.0) "Ledger") (list (quote statement) (* 72 5.5) (* 72 8.5) "Statement") (list (quote executive) (* 72 7.5) (* 72 10.0) "Executive") (list (quote a4small) (* 72 7.47) (* 72 10.85) "A4Small") (list (quote b4) (* 72 10.125) (* 72 14.33) "B4") (list (quote b5) (* 72 7.16) (* 72 10.125) "B5")) "\
@ -21660,7 +21663,7 @@ If EXTENSION is any other symbol, it is ignored.
;;;***
;;;### (autoloads (jython-mode python-mode run-python) "python" "progmodes/python.el"
;;;;;; (17888 32281))
;;;;;; (17963 18448))
;;; Generated autoloads from progmodes/python.el
(add-to-list (quote interpreter-mode-alist) (quote ("jython" . jython-mode)))
@ -22662,8 +22665,8 @@ variable.
;;;;;; rmail-mail-new-frame rmail-primary-inbox-list rmail-delete-after-output
;;;;;; rmail-highlight-face rmail-highlighted-headers rmail-retry-ignored-headers
;;;;;; rmail-displayed-headers rmail-ignored-headers rmail-dont-reply-to-names
;;;;;; rmail-movemail-variant-p) "rmail" "mail/rmail.el" (17888
;;;;;; 32280))
;;;;;; rmail-movemail-variant-p) "rmail" "mail/rmail.el" (17963
;;;;;; 18438))
;;; Generated autoloads from mail/rmail.el
(autoload (quote rmail-movemail-variant-p) "rmail" "\
@ -26598,7 +26601,7 @@ Start coverage on function under point.
;;;***
;;;### (autoloads (tetris) "tetris" "play/tetris.el" (17888 32281))
;;;### (autoloads (tetris) "tetris" "play/tetris.el" (17963 18455))
;;; Generated autoloads from play/tetris.el
(autoload (quote tetris) "tetris" "\
@ -27969,7 +27972,7 @@ BUFFER defaults to `trace-buffer'.
;;;### (autoloads (tramp-unload-tramp tramp-completion-handle-file-name-completion
;;;;;; tramp-completion-handle-file-name-all-completions tramp-unload-file-name-handlers
;;;;;; tramp-file-name-handler tramp-completion-file-name-regexp
;;;;;; tramp-file-name-regexp) "tramp" "net/tramp.el" (17888 36931))
;;;;;; tramp-file-name-regexp) "tramp" "net/tramp.el" (17963 18447))
;;; Generated autoloads from net/tramp.el
(defvar tramp-unified-filenames (not (featurep (quote xemacs))) "\
@ -28228,8 +28231,8 @@ easy-to-use form.
;;;***
;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (17888
;;;;;; 36587))
;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (17963
;;;;;; 18445))
;;; Generated autoloads from tutorial.el
(autoload (quote help-with-tutorial) "tutorial" "\
@ -31225,7 +31228,7 @@ Zone out, completely.
;;;;;; "url/url-vars.el" "url/vc-dav.el" "vc-hooks.el" "vcursor.el"
;;;;;; "version.el" "vms-patch.el" "vmsproc.el" "vt-control.el"
;;;;;; "vt100-led.el" "w32-fns.el" "w32-vars.el" "widget.el" "window.el"
;;;;;; "x-dnd.el") (17888 39099 529730))
;;;;;; "x-dnd.el") (17963 18741 697794))
;;;***

4
lisp/mail/feedmail.el
View File

@ -629,7 +629,7 @@ configurations of sendmail). Even if the latter case is true, it
probably won't hurt you to generate your own, and it will then show up
in the saved message if you use Fcc:."
:group 'feedmail-headers
:type '(choice (const nil) function)
:type '(choice (const t) (const nil) function)
)
@ -678,7 +678,7 @@ configurations of sendmail). Even if the latter case is true, it
probably won't hurt you to generate your own, and it will then show up
in the saved message if you use Fcc:."
:group 'feedmail-headers
:type '(choice (const nil) function)
:type '(choice (const t) (const nil) function)
)

2
lisp/mail/rmail.el
View File

@ -422,7 +422,7 @@ still the current message in the Rmail buffer.")
Called with region narrowed to the message, including headers,
before obeying `rmail-ignored-headers'."
:group 'rmail-headers
:type 'function)
:type '(choice (const nil) function))
(defcustom rmail-automatic-folder-directives nil
"List of directives specifying where to put a message.

12
lisp/mouse.el
View File

@ -1276,7 +1276,17 @@ If MODE is 2 then do the same for lines."
(unless ignore
;; For certain special keys, delete the region.
(if (member key mouse-region-delete-keys)
(delete-region (mark t) (point))
(progn
;; Since notionally this is a separate command,
;; run all the hooks that would be run if it were
;; executed separately.
(run-hooks 'post-command-hook)
(setq last-command this-command)
(setq this-original-command 'delete-region)
(setq this-command (or (command-remapping this-original-command)
this-original-command))
(run-hooks 'pre-command-hook)
(call-interactively this-command))
;; Otherwise, unread the key so it gets executed normally.
(setq unread-command-events
(nconc events unread-command-events))))

8
lisp/net/net-utils.el
View File

@ -674,6 +674,7 @@ queries of the form USER@HOST, and wants a query containing USER only."
(defcustom whois-server-list
'(("whois.arin.net") ; Networks, ASN's, and related POC's (numbers)
("rs.internic.net") ; domain related info
("whois.publicinterestregistry.net")
("whois.abuse.net")
("whois.apnic.net")
("nic.ddn.mil")
@ -684,9 +685,12 @@ queries of the form USER@HOST, and wants a query containing USER only."
:group 'net-utils
:type '(repeat (list string)))
;; FIXME: modern whois clients include a much better tld <-> whois server
;; list, Emacs should probably avoid specifying the server as the client
;; will DTRT anyway... -rfr
(defcustom whois-server-tld
'(("rs.internic.net" . "com")
("rs.internic.net" . "org")
("whois.publicinterestregistry.net" . "org")
("whois.ripe.net" . "be")
("whois.ripe.net" . "de")
("whois.ripe.net" . "dk")
@ -707,7 +711,7 @@ queries of the form USER@HOST, and wants a query containing USER only."
(defcustom whois-guess-server t
"If non-nil then whois will try to deduce the appropriate whois
server from the query. If the query doesn't look like a domain or hostname
then the server named by whois-server-name is used."
then the server named by `whois-server-name' is used."
:group 'net-utils
:type 'boolean)

2
lisp/net/tls.el
View File

@ -86,7 +86,7 @@ The default is what GNUTLS's \"gnutls-cli\" or OpenSSL's
"Name of GnuTLS certtool.
Used by `tls-certificate-information'."
:version "22.1"
:type '(repeat string)
:type 'string
:group 'tls)
(defun tls-certificate-information (der)

35
lisp/play/gamegrid.el
View File

@ -514,7 +514,17 @@ FILE is created there."
(defun gamegrid-add-score-with-update-game-score-1 (file target score)
(let ((default-directory "/")
(errbuf (generate-new-buffer " *update-game-score loss*")))
(errbuf (generate-new-buffer " *update-game-score loss*"))
(marker-string (concat
(user-full-name)
" <"
(cond ((fboundp 'user-mail-address)
(user-mail-address))
((boundp 'user-mail-address)
user-mail-address)
(t ""))
"> "
(current-time-string))))
;; This can be called from a timer, so enable local quits.
(with-local-quit
(apply
@ -529,28 +539,25 @@ FILE is created there."
(file-name-directory target))
file
(int-to-string score)
(concat
(user-full-name)
" <"
(cond ((fboundp 'user-mail-address)
(user-mail-address))
((boundp 'user-mail-address)
user-mail-address)
(t ""))
"> "
(current-time-string))))))
marker-string))))
(if (buffer-modified-p errbuf)
(progn
(display-buffer errbuf)
(error "Failed to update game score file"))
(kill-buffer errbuf))
(let ((buf (find-buffer-visiting target)))
(save-excursion
(if buf
(progn
(with-current-buffer buf
(revert-buffer nil t nil))
(switch-to-buffer buf)
(revert-buffer nil t nil)
(display-buffer buf))
(find-file-read-only-other-window target)))))
(find-file-read-only target))
(goto-char (point-min))
(search-forward (concat (int-to-string score)
" " (user-login-name) " "
marker-string))
(beginning-of-line)))))
(defun gamegrid-add-score-insecure (file score &optional directory)
(save-excursion

18
lisp/play/tetris.el
View File

@ -512,6 +512,7 @@ Drops the shape one square, testing for collision."
(defun tetris-move-bottom ()
"Drops the shape to the bottom of the playing area"
(interactive)
(if (not tetris-paused)
(let ((hit nil))
(tetris-erase-shape)
(while (not hit)
@ -519,12 +520,13 @@ Drops the shape one square, testing for collision."
(setq hit (tetris-test-shape)))
(setq tetris-pos-y (1- tetris-pos-y))
(tetris-draw-shape)
(tetris-shape-done)))
(tetris-shape-done))))
(defun tetris-move-left ()
"Moves the shape one square to the left"
(interactive)
(unless (= tetris-pos-x 0)
(unless (or (= tetris-pos-x 0)
tetris-paused)
(tetris-erase-shape)
(setq tetris-pos-x (1- tetris-pos-x))
(if (tetris-test-shape)
@ -534,8 +536,9 @@ Drops the shape one square, testing for collision."
(defun tetris-move-right ()
"Moves the shape one square to the right"
(interactive)
(unless (= (+ tetris-pos-x (tetris-shape-width))
(unless (or (= (+ tetris-pos-x (tetris-shape-width))
tetris-width)
tetris-paused)
(tetris-erase-shape)
(setq tetris-pos-x (1+ tetris-pos-x))
(if (tetris-test-shape)
@ -545,20 +548,23 @@ Drops the shape one square, testing for collision."
(defun tetris-rotate-prev ()
"Rotates the shape clockwise"
(interactive)
(tetris-erase-shape)
(if (not tetris-paused)
(progn (tetris-erase-shape)
(setq tetris-rot (% (+ 1 tetris-rot) 4))
(if (tetris-test-shape)
(setq tetris-rot (% (+ 3 tetris-rot) 4)))
(tetris-draw-shape))
(tetris-draw-shape))))
(defun tetris-rotate-next ()
"Rotates the shape anticlockwise"
(interactive)
(if (not tetris-paused)
(progn
(tetris-erase-shape)
(setq tetris-rot (% (+ 3 tetris-rot) 4))
(if (tetris-test-shape)
(setq tetris-rot (% (+ 1 tetris-rot) 4)))
(tetris-draw-shape))
(tetris-draw-shape))))
(defun tetris-end-game ()
"Terminates the current game"

9
lisp/progmodes/gdb-ui.el
View File

@ -618,8 +618,9 @@ With arg, use separate IO iff arg is positive."
(defun gdb-mouse-until (event)
"Continue running until a source line past the current line.
The destination source line can be selected either by clicking with mouse-2
on the fringe/margin or dragging the arrow with mouse-1 (default bindings)."
The destination source line can be selected either by clicking
with mouse-3 on the fringe/margin or dragging the arrow
with mouse-1 (default bindings)."
(interactive "e")
(let ((start (event-start event))
(end (event-end event)))
@ -634,8 +635,8 @@ on the fringe/margin or dragging the arrow with mouse-1 (default bindings)."
(defun gdb-mouse-jump (event)
"Set execution address/line.
The destination source line can be selected either by clicking with mouse-2
on the fringe/margin or dragging the arrow with mouse-1 (default bindings).
The destination source line can be selected either by clicking with C-mouse-3
on the fringe/margin or dragging the arrow with C-mouse-1 (default bindings).
Unlike gdb-mouse-until the destination address can be before the current
line, and no execution takes place."
(interactive "e")

133
lisp/progmodes/gud.el
View File

@ -58,7 +58,7 @@
(defgroup gud nil
"Grand Unified Debugger mode for gdb and other debuggers under Emacs.
Supported debuggers include gdb, sdb, dbx, xdb, perldb, pdb (Python), jdb, and bash."
Supported debuggers include gdb, sdb, dbx, xdb, perldb, pdb (Python), jdb."
:group 'unix
:group 'tools)
@ -166,18 +166,18 @@ Used to grey out relevant toolbar icons.")
([tbreak] menu-item "Temporary Breakpoint" gud-tbreak
:enable (not gud-running)
:visible (memq gud-minor-mode
'(gdbmi gdba gdb sdb xdb bashdb)))
'(gdbmi gdba gdb sdb xdb)))
([break] menu-item "Set Breakpoint" gud-break
:enable (not gud-running)
:visible (gud-tool-bar-item-visible-no-fringe))
([up] menu-item "Up Stack" gud-up
:enable (not gud-running)
:visible (memq gud-minor-mode
'(gdbmi gdba gdb dbx xdb jdb pdb bashdb)))
'(gdbmi gdba gdb dbx xdb jdb pdb)))
([down] menu-item "Down Stack" gud-down
:enable (not gud-running)
:visible (memq gud-minor-mode
'(gdbmi gdba gdb dbx xdb jdb pdb bashdb)))
'(gdbmi gdba gdb dbx xdb jdb pdb)))
([pp] menu-item "Print S-expression" gud-pp
:enable (and (not gud-running)
gdb-active-process)
@ -196,7 +196,7 @@ Used to grey out relevant toolbar icons.")
([finish] menu-item "Finish Function" gud-finish
:enable (not gud-running)
:visible (memq gud-minor-mode
'(gdbmi gdba gdb xdb jdb pdb bashdb)))
'(gdbmi gdba gdb xdb jdb pdb)))
([stepi] menu-item "Step Instruction" gud-stepi
:enable (not gud-running)
:visible (memq gud-minor-mode '(gdbmi gdba gdb dbx)))
@ -1520,7 +1520,7 @@ and source-file directory for your debugger."
;; Last group is for return value, e.g. "> test.py(2)foo()->None"
;; Either file or function name may be omitted: "> <string>(0)?()"
(defvar gud-pdb-marker-regexp
"^> \\([-a-zA-Z0-9_/.:\\]*\\|<string>\\)(\\([0-9]+\\))\\([a-zA-Z0-9_]*\\|\\?\\)()\\(->[^\n]*\\)?\n")
"^> \\([-a-zA-Z0-9_/.:\\]*\\|<string>\\)(\\([0-9]+\\))\\([a-zA-Z0-9_]*\\|\\?\\|<module>\\)()\\(->[^\n]*\\)?\n")
(defvar gud-pdb-marker-regexp-file-group 1)
(defvar gud-pdb-marker-regexp-line-group 2)
(defvar gud-pdb-marker-regexp-fnname-group 3)
@ -2286,127 +2286,6 @@ gud, see `gud-mode'."
(gud-jdb-build-source-files-list gud-jdb-directories
"\\.java$"))))
(fset 'gud-jdb-find-source 'gud-jdb-find-source-file)))
;; ======================================================================
;;
;; BASHDB support. See http://bashdb.sourceforge.net
;;
;; AUTHOR: Rocky Bernstein <rocky@panix.com>
;;
;; CREATED: Sun Nov 10 10:46:38 2002 Rocky Bernstein.
;;
;; INVOCATION NOTES:
;;
;; You invoke bashdb-mode with:
;;
;; M-x bashdb <enter>
;;
;; It responds with:
;;
;; Run bashdb (like this): bash
;;
;; History of argument lists passed to bashdb.
(defvar gud-bashdb-history nil)
;; Convert a command line as would be typed normally to run a script
;; into one that invokes an Emacs-enabled debugging session.
;; "--debugger" in inserted as the first switch.
;; There's no guarantee that Emacs will hand the filter the entire
;; marker at once; it could be broken up across several strings. We
;; might even receive a big chunk with several markers in it. If we
;; receive a chunk of text which looks like it might contain the
;; beginning of a marker, we save it here between calls to the
;; filter.
(defun gud-bashdb-marker-filter (string)
(setq gud-marker-acc (concat gud-marker-acc string))
(let ((output ""))
;; Process all the complete markers in this chunk.
;; Format of line looks like this:
;; (/etc/init.d/ntp.init:16):
;; but we also allow DOS drive letters
;; (d:/etc/init.d/ntp.init:16):
(while (string-match "\\(^\\|\n\\)(\\(\\([a-zA-Z]:\\)?[^:\n]*\\):\\([0-9]*\\)):.*\n"
gud-marker-acc)
(setq
;; Extract the frame position from the marker.
gud-last-frame
(cons (match-string 2 gud-marker-acc)
(string-to-number (match-string 4 gud-marker-acc)))
;; Append any text before the marker to the output we're going
;; to return - we don't include the marker in this text.
output (concat output
(substring gud-marker-acc 0 (match-beginning 0)))
;; Set the accumulator to the remaining text.
gud-marker-acc (substring gud-marker-acc (match-end 0))))
;; Does the remaining text look like it might end with the
;; beginning of another marker? If it does, then keep it in
;; gud-marker-acc until we receive the rest of it. Since we
;; know the full marker regexp above failed, it's pretty simple to
;; test for marker starts.
(if (string-match "\032.*\\'" gud-marker-acc)
(progn
;; Everything before the potential marker start can be output.
(setq output (concat output (substring gud-marker-acc
0 (match-beginning 0))))
;; Everything after, we save, to combine with later input.
(setq gud-marker-acc
(substring gud-marker-acc (match-beginning 0))))
(setq output (concat output gud-marker-acc)
gud-marker-acc ""))
output))
(defcustom gud-bashdb-command-name "bash --debugger"
"File name for executing bash debugger."
:type 'string
:group 'gud)
;;;###autoload
(defun bashdb (command-line)
"Run bashdb on program FILE in buffer *gud-FILE*.
The directory containing FILE becomes the initial working directory
and source-file directory for your debugger."
(interactive
(list (read-from-minibuffer "Run bashdb (like this): "
(if (consp gud-bashdb-history)
(car gud-bashdb-history)
(concat gud-bashdb-command-name
" "))
gud-minibuffer-local-map nil
'(gud-bashdb-history . 1))))
(gud-common-init command-line nil 'gud-bashdb-marker-filter)
(set (make-local-variable 'gud-minor-mode) 'bashdb)
(gud-def gud-break "break %l" "\C-b" "Set breakpoint at current line.")
(gud-def gud-tbreak "tbreak %l" "\C-t" "Set temporary breakpoint at current line.")
(gud-def gud-remove "clear %l" "\C-d" "Remove breakpoint at current line")
(gud-def gud-step "step" "\C-s" "Step one source line with display.")
(gud-def gud-next "next" "\C-n" "Step one line (skip functions).")
(gud-def gud-cont "continue" "\C-r" "Continue with display.")
(gud-def gud-finish "finish" "\C-f" "Finish executing current function.")
(gud-def gud-up "up %p" "<" "Up N stack frames (numeric arg).")
(gud-def gud-down "down %p" ">" "Down N stack frames (numeric arg).")
(gud-def gud-print "x %e" "\C-p" "Evaluate BASH expression at point.")
;; Is this right?
(gud-def gud-statement "eval %e" "\C-e" "Execute BASH statement at point.")
(setq comint-prompt-regexp "^bashdb<+(*[0-9]+)*>+ ")
(setq paragraph-start comint-prompt-regexp)
(run-hooks 'bashdb-mode-hook)
)
;;
;; End of debugger-specific information

17
lisp/progmodes/python.el
View File

@ -163,7 +163,7 @@ Used for syntactic keywords. N is the match number (1, 2 or 3)."
(= (match-beginning 1) (match-end 1))) ; prefix is null
(and (= n 1) ; prefix
(/= (match-beginning 1) (match-end 1)))) ; non-empty
(unless (eq 'string (syntax-ppss-context (syntax-ppss)))
(unless (nth 3 (syntax-ppss))
(eval-when-compile (string-to-syntax "|"))))
;; Otherwise (we're in a non-matching string) the property is
;; nil, which is OK.
@ -1745,10 +1745,9 @@ Otherwise, do nothing."
end)
(cond ((eq t (nth 3 syntax)) ; in fenced string
(goto-char (nth 8 syntax)) ; string start
(condition-case () ; for unbalanced quotes
(progn (forward-sexp)
(setq end (point)))
(error (setq end (point-max)))))
(setq end (condition-case () ; for unbalanced quotes
(progn (forward-sexp) (point))
(error (point-max)))))
((re-search-backward "\\s|\\s-*\\=" nil t) ; end of fenced
; string
(forward-char)
@ -1756,13 +1755,17 @@ Otherwise, do nothing."
(condition-case ()
(progn (backward-sexp)
(setq start (point)))
(error nil))))
(error (setq end nil)))))
(when end
(save-restriction
(narrow-to-region start end)
(goto-char orig)
(let ((paragraph-separate
;; Make sure that fenced-string delimiters that stand
;; on their own line stay there.
(concat "[ \t]*['\"]+[ \t]*$\\|" paragraph-separate)))
(fill-paragraph justify))))))
t)
t))
(defun python-shift-left (start end &optional count)
"Shift lines in region COUNT (the prefix arg) columns to the left.

86
lisp/ps-print.el
View File

@ -1515,6 +1515,7 @@ Please send all bug fixes and enhancements to
(defalias 'ps-frame-parameter
(if (fboundp 'frame-parameter) 'frame-parameter 'frame-property))
(defalias 'ps-mark-active-p
(if (fboundp 'region-active-p)
'region-active-p ; XEmacs
@ -3337,13 +3338,13 @@ It's like the very first character of buffer (or region) is ^L (\\014)."
(defcustom ps-postscript-code-directory
(or (if (featurep 'xemacs)
(cond ((fboundp 'locate-data-directory) ; xemacs
(cond ((fboundp 'locate-data-directory) ; XEmacs
(locate-data-directory "ps-print"))
((boundp 'data-directory) ; xemacs
((boundp 'data-directory) ; XEmacs
data-directory)
(t ; don't know what to do
nil))
data-directory) ; emacs
data-directory) ; Emacs
(error "`ps-postscript-code-directory' isn't set properly"))
"*Directory where it's located the PostScript prologue file used by ps-print.
By default, this directory is the same as in the variable `data-directory'."
@ -3585,7 +3586,8 @@ The table depends on the current ps-print setup."
(mapconcat
#'ps-print-quote
(list
(concat "\n;;; ps-print version " ps-print-version "\n")
(concat "\n;;; (" (if (featurep 'xemacs) "XEmacs" "Emacs")
") ps-print version " ps-print-version "\n")
";; internal vars"
(ps-comment-string "emacs-version " emacs-version)
(ps-comment-string "ps-windows-system " ps-windows-system)
@ -3964,7 +3966,7 @@ Note: No major/minor-mode is activated and no local variables are evaluated for
filename))))
(defvar ps-mark-code-directory nil)
(defvar ps-mark-code-directory)
(defvar ps-print-prologue-0 ""
"ps-print PostScript error handler.")
@ -3974,12 +3976,12 @@ Note: No major/minor-mode is activated and no local variables are evaluated for
;; Start Editing Here:
(defvar ps-source-buffer nil)
(defvar ps-source-buffer)
(defvar ps-spool-buffer-name "*PostScript*")
(defvar ps-spool-buffer nil)
(defvar ps-spool-buffer)
(defvar ps-output-head nil)
(defvar ps-output-tail nil)
(defvar ps-output-head)
(defvar ps-output-tail)
(defvar ps-page-postscript 0) ; page number
(defvar ps-page-order 0) ; PostScript page counter
@ -3989,29 +3991,29 @@ Note: No major/minor-mode is activated and no local variables are evaluated for
(defvar ps-page-n-up 0) ; n-up counter
(defvar ps-lines-printed 0) ; total lines printed
(defvar ps-showline-count 1) ; line number counter
(defvar ps-first-page nil)
(defvar ps-last-page nil)
(defvar ps-first-page)
(defvar ps-last-page)
(defvar ps-print-page-p t)
(defvar ps-control-or-escape-regexp nil)
(defvar ps-n-up-on nil)
(defvar ps-control-or-escape-regexp)
(defvar ps-n-up-on)
(defvar ps-background-pages nil)
(defvar ps-background-all-pages nil)
(defvar ps-background-pages)
(defvar ps-background-all-pages)
(defvar ps-background-text-count 0)
(defvar ps-background-image-count 0)
(defvar ps-current-font 0)
(defvar ps-default-foreground nil)
(defvar ps-default-background nil)
(defvar ps-default-color nil)
(defvar ps-current-color nil)
(defvar ps-current-bg nil)
(defvar ps-default-foreground)
(defvar ps-default-background)
(defvar ps-default-color)
(defvar ps-current-color)
(defvar ps-current-bg)
(defvar ps-zebra-stripe-full-p nil)
(defvar ps-zebra-stripe-full-p)
(defvar ps-razchunk 0)
(defvar ps-color-p nil)
(defvar ps-color-p)
(defvar ps-color-format
(if (featurep 'xemacs)
;; XEmacs will have to make do with %s (princ) for floats.
@ -4040,20 +4042,20 @@ This is in units of points (1/72 inch).")
(defmacro ps-page-dimensions-get-height (dims) `(nth 1 ,dims))
(defmacro ps-page-dimensions-get-media (dims) `(nth 2 ,dims))
(defvar ps-landscape-page-height nil)
(defvar ps-landscape-page-height)
(defvar ps-print-width nil)
(defvar ps-print-height nil)
(defvar ps-print-width)
(defvar ps-print-height)
(defvar ps-height-remaining nil)
(defvar ps-width-remaining nil)
(defvar ps-height-remaining)
(defvar ps-width-remaining)
(defvar ps-font-size-internal nil)
(defvar ps-header-font-size-internal nil)
(defvar ps-header-title-font-size-internal nil)
(defvar ps-footer-font-size-internal nil)
(defvar ps-line-spacing-internal nil)
(defvar ps-paragraph-spacing-internal nil)
(defvar ps-font-size-internal)
(defvar ps-header-font-size-internal)
(defvar ps-header-title-font-size-internal)
(defvar ps-footer-font-size-internal)
(defvar ps-line-spacing-internal)
(defvar ps-paragraph-spacing-internal)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -4250,10 +4252,10 @@ If EXTENSION is any other symbol, it is ignored."
message-log-max))
(defvar ps-print-hook nil)
(defvar ps-print-begin-sheet-hook nil)
(defvar ps-print-begin-page-hook nil)
(defvar ps-print-begin-column-hook nil)
(defvar ps-print-hook)
(defvar ps-print-begin-sheet-hook)
(defvar ps-print-begin-page-hook)
(defvar ps-print-begin-column-hook)
(defun ps-print-without-faces (from to &optional filename region-p)
@ -4830,10 +4832,10 @@ page-height == ((floor print-height ((th + ls) * zh)) * ((th + ls) * zh)) - th
content (cdr content)))
(nreverse str)))
(defvar ps-lh-cache nil)
(defvar ps-rh-cache nil)
(defvar ps-lf-cache nil)
(defvar ps-rf-cache nil)
(defvar ps-lh-cache)
(defvar ps-rh-cache)
(defvar ps-lf-cache)
(defvar ps-rf-cache)
(defun ps-header-footer-string ()
(and ps-print-header
@ -6126,7 +6128,7 @@ XSTART YSTART are the relative position for the first page in a sheet.")
(/ q-done (/ q-todo 100)))
))))))
(defvar ps-last-font nil)
(defvar ps-last-font)
(defun ps-set-font (font)
(setq ps-last-font (format "f%d" (setq ps-current-font font)))

56
lisp/replace.el
View File

@ -1423,8 +1423,10 @@ make, or the user didn't cancel the call."
(message
(if query-flag
(apply 'propertize
(substitute-command-keys
"Query replacing %s with %s: (\\<query-replace-map>\\[help] for help) "))))
"Query replacing %s with %s: (\\<query-replace-map>\\[help] for help) ")
minibuffer-prompt-properties))))
;; If region is active, in Transient Mark mode, operate on region.
(when start
@ -1466,27 +1468,35 @@ make, or the user didn't cancel the call."
;; otherwise, search for a match after moving forward
;; one char if progress is required.
(setq real-match-data
(if (consp match-again)
(progn (goto-char (nth 1 match-again))
(replace-match-data t
real-match-data
match-again))
(and (or match-again
;; MATCH-AGAIN non-nil means we
;; accept an adjacent match. If
;; we don't, move one char to the
;; right. This takes us a
;; character too far at the end,
;; but this is undone after the
;; while-loop.
(progn
(forward-char 1)
(not (or (eobp)
(and limit (>= (point) limit))))))
(funcall search-function search-string limit t)
(cond ((consp match-again)
(goto-char (nth 1 match-again))
(replace-match-data
t real-match-data match-again))
;; MATCH-AGAIN non-nil means accept an
;; adjacent match.
(match-again
(and
(funcall search-function search-string
limit t)
;; For speed, use only integers and
;; reuse the list used last time.
(replace-match-data t real-match-data)))))
(replace-match-data t real-match-data)))
((and (< (1+ (point)) (point-max))
(or (null limit)
(< (1+ (point)) limit)))
;; If not accepting adjacent matches,
;; move one char to the right before
;; searching again. Undo the motion
;; if the search fails.
(let ((opoint (point)))
(forward-char 1)
(if (funcall
search-function search-string
limit t)
(replace-match-data
t real-match-data)
(goto-char opoint)
nil))))))
;; Record whether the match is nonempty, to avoid an infinite loop
;; repeatedly matching the same empty string.
@ -1702,12 +1712,6 @@ make, or the user didn't cancel the call."
(match-data t)))
stack)))))
;; The code preventing adjacent regexp matches in the condition
;; of the while-loop above will haven taken us one character
;; beyond the last replacement. Undo that.
(when (and regexp-flag (not match-again) (> replace-count 0))
(backward-char 1))
(replace-dehighlight))
(or unread-command-events
(message "Replaced %d occurrence%s"

8
lisp/startup.el
View File

@ -653,6 +653,8 @@ opening the first frame (e.g. open a connection to an X server).")
;; Convert preloaded file names in load-history to absolute.
(let ((simple-file-name
;; Look for simple.el or simple.elc and use their directory
;; as the place where all Lisp files live.
(locate-file "simple" load-path (get-load-suffixes)))
lisp-dir)
;; Don't abort if simple.el cannot be found, but print a warning.
@ -960,7 +962,11 @@ opening the first frame (e.g. open a connection to an X server).")
(deactivate-mark)))
;; If the user has a file of abbrevs, read it.
(if (file-exists-p abbrev-file-name)
;; FIXME: after the 22.0 release this should be changed so
;; that it does not read the abbrev file when -batch is used
;; on the command line.
(when (and (file-exists-p abbrev-file-name)
(file-readable-p abbrev-file-name))
(quietly-read-abbrev-file abbrev-file-name))
;; If the abbrevs came entirely from the init file or the

14873
lisp/textmodes/org.el
View File

File diff suppressed because it is too large Load Diff

5
lisp/tutorial.el
View File

@ -154,7 +154,10 @@ options:
(format "%s" db)
" RET instead."))
(insert "\n\nWith your current key bindings"
" you can use the key "
" you can use "
(if (string-equal "the menus" where)
""
"the key ")
where
" to get the function `"
(format "%s" db)

6
lisp/version.el
View File

@ -32,13 +32,13 @@ Version numbers of this version of Emacs.")
(defconst emacs-major-version
(progn (string-match "^[0-9]+" emacs-version)
(string-to-int (match-string 0 emacs-version)))
(string-to-number (match-string 0 emacs-version)))
"Major version number of this version of Emacs.
This variable first existed in version 19.23.")
(defconst emacs-minor-version
(progn (string-match "^[0-9]+\\.\\([0-9]+\\)" emacs-version)
(string-to-int (match-string 1 emacs-version)))
(string-to-number (match-string 1 emacs-version)))
"Minor version number of this version of Emacs.
This variable first existed in version 19.23.")
@ -93,5 +93,5 @@ to the system configuration; look at `system-configuration' instead."
;;version-control: never
;;End:
;;; arch-tag: e60dc445-6218-4a4c-a7df-f15a818642a0
;; arch-tag: e60dc445-6218-4a4c-a7df-f15a818642a0
;;; version.el ends here

5
lispref/ChangeLog
View File

@ -1,3 +1,8 @@
2007-02-25 Vinicius Jose Latorre <viniciusjl@ig.com.br>
* loading.texi (How Programs Do Loading): Fix anchor position at
load-read-function definition doc. (tiny change)
2007-02-21 Kim F. Storm <storm@cua.dk>
* strings.texi (Text Comparison): Mention that assoc-string

2
lispref/elisp.texi
View File

@ -7,7 +7,7 @@
@c Version of the manual and of Emacs.
@c Please remember to update the edition number in README as well.
@set VERSION 2.9
@set EMACSVER 22.0.94
@set EMACSVER 22.0.95
@dircategory Emacs
@direntry

3
lispref/loading.texi
View File

@ -155,10 +155,9 @@ file, and it is @code{nil} otherwise.
@end defvar
@defvar load-read-function
This
@anchor{Definition of load-read-function}
@c do not allow page break at anchor; work around Texinfo deficiency.
variable specifies an alternate expression-reading function for
This variable specifies an alternate expression-reading function for
@code{load} and @code{eval-region} to use instead of @code{read}.
The function should accept one argument, just as @code{read} does.

5
lwlib/ChangeLog
View File

@ -1,3 +1,8 @@
2007-02-28 Glenn Morris <rgm@gnu.org>
* Makefile.in (distclean): Delete Makefile.
(maintainer-clean): Delete TAGS.
2007-01-01 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* xlwmenu.c (xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.

27
lwlib/Makefile.in
View File

@ -1,6 +1,27 @@
# This was taken from the output of Imake
# Copyright (C) 1992, 1993 Lucid, Inc.
# Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006,
# 2007 Free Software Foundation, Inc.
#
# This file is part of the Lucid Widget Library.
#
# The Lucid Widget Library 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 1, or (at your option)
# any later version.
#
# The Lucid Widget Library 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., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
# This was taken from the output of Imake using Lucid's Imakefile.
# and set up to be configured by ../configure.
# Some parts Copyright (c) 1992, 1993 Lucid, Inc.
srcdir=@srcdir@
VPATH=@srcdir@
@ -61,7 +82,9 @@ mostlyclean:
clean: mostlyclean
distclean: clean
$(RM) Makefile
maintainer-clean: distclean
$(RM) TAGS
TAGS:
../lib-src/etags $(srcdir)/*.[ch]

14
lwlib/README
View File

@ -1,5 +1,9 @@
This subdirectory contains the lwlib library which provides a uniform
interface to a few different X toolkits. The library was written by
Lucid, and is not part of GNU Emacs. This version has changes in the
makefile to fit in with Emacs's configure script, and some source
files have been renamed to fit in 14 characters.
This subdirectory contains the Lucid Widget Library (lwlib), which
provides a uniform interface to a few different X toolkits. The
library was written by Lucid, Inc and released under the terms of the
GPL version 1 (or later). It is not considered part of GNU Emacs.
This version of the library differs from the original as described in
the ChangeLog file. For example, the file "lwlib-int.h" was renamed
from "lwlib-internal.h" in order to fit in 14 characters, and the
makefile adjusted to fit in with Emacs's configure script.

2
lwlib/lwlib-Xaw.c
View File

@ -1,5 +1,7 @@
/* The lwlib interface to Athena widgets.
Copyright (C) 1993 Chuck Thompson <cthomp@cs.uiuc.edu>
Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006,
2007 Free Software Foundation, Inc.
This file is part of the Lucid Widget Library.

2
lwlib/lwlib-Xm.c
View File

@ -7,7 +7,7 @@ This file is part of the Lucid Widget Library.
The Lucid Widget Library 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)
the Free Software Foundation; either version 1, or (at your option)
any later version.
The Lucid Widget Library is distributed in the hope that it will be useful,

4
lwlib/lwlib-Xm.h
View File

@ -1,13 +1,11 @@
/* The lwlib interface to Motif widgets.
Copyright (C) 1994, 2000, 2001, 2002, 2003, 2004,
2005, 2006, 2007 Free Software Foundation, Inc.
Copyright (C) 1992 Lucid, Inc.
This file is part of the Lucid Widget Library.
The Lucid Widget Library 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)
the Free Software Foundation; either version 1, or (at your option)
any later version.
The Lucid Widget Library is distributed in the hope that it will be useful,

23
lwlib/lwlib-int.h
View File

@ -1,3 +1,26 @@
/*
Copyright (C) 1992 Lucid, Inc.
Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006,
2007 Free Software Foundation, Inc.
This file is part of the Lucid Widget Library.
The Lucid Widget Library 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 1, or (at your option)
any later version.
The Lucid Widget Library 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., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */
#ifndef LWLIB_INTERNAL_H
#define LWLIB_INTERNAL_H

2
lwlib/lwlib-utils.c
View File

@ -1,5 +1,7 @@
/* Defines some widget utility functions.
Copyright (C) 1992 Lucid, Inc.
Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006,
2007 Free Software Foundation, Inc.
This file is part of the Lucid Widget Library.

2
lwlib/lwlib.c
View File

@ -1,5 +1,7 @@
/* A general interface to the widgets of different toolkits.
Copyright (C) 1992, 1993 Lucid, Inc.
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, 2004,
2005, 2006, 2007 Free Software Foundation, Inc.
This file is part of the Lucid Widget Library.

23
lwlib/lwlib.h
View File

@ -1,3 +1,26 @@
/*
Copyright (C) 1992, 1993 Lucid, Inc.
Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
2007 Free Software Foundation, Inc.
This file is part of the Lucid Widget Library.
The Lucid Widget Library 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 1, or (at your option)
any later version.
The Lucid Widget Library 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., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */
#ifndef LWLIB_H
#define LWLIB_H

3
lwlib/xlwmenu.c
View File

@ -1,6 +1,7 @@
/* Implements a lightweight menubar widget.
Copyright (C) 1992 Lucid, Inc.
Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
Copyright (C) 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
2005, 2006, 2007 Free Software Foundation, Inc.
This file is part of the Lucid Widget Library.

7
lwlib/xlwmenu.h
View File

@ -1,12 +1,13 @@
/* Interface of a lightweight menubar widget.
Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
2006, 2007 Free Software Foundation, Inc.
Copyright (C) 1992 Lucid, Inc.
Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
Free Software Foundation, Inc.
This file is part of the Lucid Widget Library.
The Lucid Widget Library 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)
the Free Software Foundation; either version 1, or (at your option)
any later version.
The Lucid Widget Library is distributed in the hope that it will be useful,

7
lwlib/xlwmenuP.h
View File

@ -1,12 +1,13 @@
/* Internals of a lightweight menubar widget.
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
2005, 2006, 2007 Free Software Foundation, Inc.
Copyright (C) 1992 Lucid, Inc.
Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
Free Software Foundation, Inc.
This file is part of the Lucid Widget Library.
The Lucid Widget Library 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)
the Free Software Foundation; either version 1, or (at your option)
any later version.
The Lucid Widget Library is distributed in the hope that it will be useful,

4
mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
View File

@ -1,5 +1,5 @@
/* Localized versions of Info.plist keys */
CFBundleName = "Emacs";
CFBundleShortVersionString = "22.0.94";
CFBundleGetInfoString = "22.0.94, Copyright (C) 2007 Free Software Foundation, Inc.";
CFBundleShortVersionString = "22.0.95";
CFBundleGetInfoString = "22.0.95, Copyright (C) 2007 Free Software Foundation, Inc.";

6
mac/src/Emacs.r
View File

@ -221,10 +221,10 @@ resource 'vers' (1) {
0x22, /* Major revision in BCD */
0x0, /* Minor revision in BCD */
alpha, /* development, alpha, beta, or final (release) */
94, /* Non-final release # */
95, /* Non-final release # */
0, /* Region code */
"22.0.94", /* Short version number */
"22.0.94, Copyright \0xa9 2007 "
"22.0.95", /* Short version number */
"22.0.95, Copyright \0xa9 2007 "
"Free Software Foundation, Inc." /* Long version number */
};

4
make-dist
View File

@ -558,7 +558,7 @@ echo "Making links to \`msdos'"
echo "Making links to \`oldXMenu'"
(cd oldXMenu
ln *.c *.h *.in ../${tempdir}/oldXMenu
ln README Imakefile ChangeLog ../${tempdir}/oldXMenu
ln README ChangeLog ../${tempdir}/oldXMenu
ln compile.com descrip.mms ../${tempdir}/oldXMenu)
echo "Making links to \`lwlib'"
@ -603,7 +603,7 @@ echo "Making links to \`etc/e'"
echo "Making links to \`etc/images'"
(cd etc/images
for img in [a-zA-Z]*.xpm [a-zA-Z]*.xbm [a-zA-Z]*.pbm; do
for img in README [a-zA-Z]*.xpm [a-zA-Z]*.xbm [a-zA-Z]*.pbm; do
if [ -f $img ]; then
ln $img ../../${tempdir}/etc/images
fi

42
man/ChangeLog
View File

@ -1,3 +1,45 @@
2007-02-27 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus.texi (NNTP): Mention nntp-never-echoes-commands and
nntp-open-connection-functions-never-echo-commands.
2007-02-28 Thien-Thi Nguyen <ttn@gnu.org>
* rmail.texi (Movemail): Add internal ref.
Don't indent the intro for the PROTO table.
Format PROTO table items with @code.
2007-02-27 Chong Yidong <cyd@stupidchicken.com>
* pgg.texi (Caching passphrase): Document gpg-agent usage, gpg-agent
problems on the console, and security risk in not using gpg-agent.
2007-02-26 Nick Roberts <nickrob@snap.net.nz>
* building.texi: Remove references to bashdb.
2007-02-25 Carsten Dominik <dominik@science.uva.nl>
* org.texi (The spreadsheet): Renamed from "Table calculations".
Completely reorganized and rewritten.
(CamelCase links): Section removed.
(Repeating items): New section.
(Tracking TODO state changes): New section.
(Agenda views): Chapter reorganized and rewritten.
(HTML export): Section rewritten.
(Tables in arbitrary syntax): New section.
(Summary): Better feature summary.
(Activation): Document problem with cut-and-paste of Lisp code
from PDF files.
(Visibility cycling): Document indirect buffer use.
(Structure editing): Document sorting.
(Remember): Section rewritten.
(Time stamps): Better description of time stamp types.
(Tag searches): Document regular expression search for tags.
(Stuck projects): New section.
(In-buffer settings): New keywords.
(History and Acknowledgments): Updated description.
2007-02-24 Alan Mackenzie <acm@muc.de>
* cc-mode.texi (Movement Commands): Insert two missing command names.

11
man/building.texi
View File

@ -446,7 +446,6 @@ Flymake, flymake, The Flymake Manual}.
@cindex SDB
@cindex XDB
@cindex Perldb
@cindex bashdb
@cindex JDB
@cindex PDB
@ -455,7 +454,7 @@ The GUD (Grand Unified Debugger) library provides an interface to
various symbolic debuggers from within Emacs. We recommend the
debugger GDB, which is free software, but GUD can also run DBX, SDB or
XDB. GUD can also serve as an interface to Perl's debugging mode, the
Python debugger PDB, the Bash debugger, and to JDB, the Java Debugger.
Python debugger PDB, and to JDB, the Java Debugger.
@xref{Debugging,, The Lisp Debugger, elisp, the Emacs Lisp Reference
Manual}, for information on debugging Emacs Lisp programs.
@ -508,10 +507,6 @@ of the functions, you get a message saying @samp{The sdb support
requires a valid tags table to work}. If this happens, generate a valid
tags table in the working directory and try again.
@item M-x bashdb @key{RET} @var{file} @key{RET}
@findex bashdb
Run the bash debugger to debug @var{file}, a shell script.
@item M-x perldb @key{RET} @var{file} @key{RET}
@findex perldb
Run the Perl interpreter in debug mode to debug @var{file}, a Perl program.
@ -746,13 +741,11 @@ Instead, type @kbd{C-q @key{TAB}} to enter a tab.
@vindex perldb-mode-hook
@vindex pdb-mode-hook
@vindex jdb-mode-hook
@vindex bashdb-mode-hook
On startup, GUD runs one of the following hooks: @code{gdb-mode-hook},
if you are using GDB; @code{dbx-mode-hook}, if you are using DBX;
@code{sdb-mode-hook}, if you are using SDB; @code{xdb-mode-hook}, if you
are using XDB; @code{perldb-mode-hook}, for Perl debugging mode;
@code{pdb-mode-hook}, for PDB; @code{jdb-mode-hook}, for JDB;
@code{bashdb-mode-hook}, for the Bash debugger. You can
@code{pdb-mode-hook}, for PDB; @code{jdb-mode-hook}, for JDB. You can
use these hooks to define custom key bindings for the debugger
interaction buffer. @xref{Hooks}.

2
man/emacs.texi
View File

@ -5,7 +5,7 @@
@c The edition number appears in several places in this file
@set EDITION Sixteenth
@set EMACSVER 22.0.94
@set EMACSVER 22.0.95
@copying
This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},

18
man/gnus.texi
View File

@ -12942,6 +12942,24 @@ Six pre-made functions are supplied. These functions can be grouped in
two categories: direct connection functions (four pre-made), and
indirect ones (two pre-made).
@item nntp-never-echoes-commands
@vindex nntp-never-echoes-commands
Non-@code{nil} means the nntp server never echoes commands. It is
reported that some nntps server doesn't echo commands. So, you may want
to set this to non-@code{nil} in the method for such a server setting
@code{nntp-open-connection-function} to @code{nntp-open-ssl-stream} for
example. The default value is @code{nil}. Note that the
@code{nntp-open-connection-functions-never-echo-commands} variable
overrides the @code{nil} value of this variable.
@item nntp-open-connection-functions-never-echo-commands
@vindex nntp-open-connection-functions-never-echo-commands
List of functions that never echo commands. Add or set a function which
you set to @code{nntp-open-connection-function} to this list if it does
not echo commands. Note that a non-@code{nil} value of the
@code{nntp-never-echoes-commands} variable overrides this variable. The
default value is @code{(nntp-open-network-stream)}.
@item nntp-prepare-post-hook
@vindex nntp-prepare-post-hook
A hook run just before posting an article. If there is no

1905
man/org.texi
View File

File diff suppressed because it is too large Load Diff

65
man/pgg.texi
View File

@ -229,8 +229,61 @@ The default scheme of PGP implementation. The value should be one of
@node Caching passphrase
@section Caching passphrase
PGG provides a simple passphrase caching mechanism. If you want to
arrange the interaction, set the variable @code{pgg-read-passphrase}.
When using GnuPG (gpg) as the PGP scheme, we recommend using a program
called @code{gpg-agent} for entering and caching
passphrases@footnote{Actually, @code{gpg-agent} does not cache
passphrases but private keys. On the other hand, from a user's point
of view, this technical difference isn't visible.}.
@defvar pgg-gpg-use-agent
If non-@code{nil}, attempt to use @code{gpg-agent} whenever possible.
The default is @code{t}. If @code{gpg-agent} is not running, or GnuPG
is not the current PGP scheme, PGG's own passphrase-caching mechanism
is used (see below).
@end defvar
To use @code{gpg-agent} with PGG, you must first ensure that
@code{gpg-agent} is running. For example, if you are running in the X
Window System, you can do this by putting the following line in your
@file{.xsession} file:
@smallexample
eval "$(gpg-agent --daemon)"
@end smallexample
For more details on invoking @code{gpg-agent}, @xref{Invoking
GPG-AGENT,,,gnupg,Using the GNU Privacy Guard}.
Whenever you perform a PGG operation that requires a GnuPG passphrase,
GnuPG will contact @code{gpg-agent}, which prompts you for the
passphrase. Furthermore, @code{gpg-agent} ``caches'' the result, so
that subsequent uses will not require you to enter the passphrase
again. (This cache usually expires after a certain time has passed;
you can change this using the @code{--default-cache-ttl} option when
invoking @code{gpg-agent}.)
If you are running in a X Window System environment, @code{gpg-agent}
prompts for a passphrase by opening a graphical window. However, if
you are running Emacs on a text terminal, @code{gpg-agent} has trouble
receiving input from the terminal, since it is being sent to Emacs.
One workaround for this problem is to run @code{gpg-agent} on a
different terminal from Emacs, with the @code{--keep-tty} option; this
tells @code{gpg-agent} use its own terminal to prompt for passphrases.
When @code{gpg-agent} is not being used, PGG prompts for a passphrase
through Emacs. It also has its own passphrase caching mechanism,
which is controlled by the variable @code{pgg-read-passphrase} (see
below).
There is a security risk in handling passphrases through PGG rather
than @code{gpg-agent}. When you enter your passphrase into an Emacs
prompt, it is temporarily stored as a cleartext string in the memory
of the Emacs executable. If the executable memory is swapped to disk,
the root user can, in theory, extract the passphrase from the
swapfile. Furthermore, the swapfile containing the cleartext
passphrase might remain on the disk after the system is discarded or
stolen. @code{gpg-agent} avoids this problem by using certain tricks,
such as memory locking, which have not been implemented in Emacs.
@defvar pgg-cache-passphrase
If non-@code{nil}, store passphrases. The default value of this
@ -243,14 +296,6 @@ variable to @code{nil}.
Elapsed time for expiration in seconds.
@end defvar
@defvar pgg-gpg-use-agent
When using GnuPG (gpg) as PGP scheme you can use @code{gpg-agent} for
caching@footnote{Actually @code{gpg-agent} does not cache passphrases
but private keys. On the other hand, from a users point of view this
technical difference isn't visible.}. It defaults to @code{t}.
Setting this to @code{nil} is not recommended.
@end defvar
@node Default user identity
@section Default user identity

5
man/rmail.texi
View File

@ -1240,7 +1240,7 @@ where square brackets denote optional elements.
@item proto
Specifies the @dfn{mailbox protocol}, or @dfn{format} to
use. The exact semantics of the rest of @acronym{URL} elements depends
on the actual value of @var{proto}.
on the actual value of @var{proto} (see below).
@item user
User name to access the remote mailbox.
@ -1253,9 +1253,10 @@ Hostname of the remote server for remote mailboxes or file name of a
local mailbox.
@end table
@noindent
@var{Proto} can be one of:
@table @asis
@table @code
@item mbox
Usual UNIX mailbox format. In this case, neither @var{user} nor
@var{pass} are used, and @var{host-or-file-name} denotes the file name of

5
nt/ChangeLog
View File

@ -1,3 +1,8 @@
2007-03-03 Eli Zaretskii <eliz@gnu.org>
* INSTALL: Add URL of another site with detailed build
instructions.
2007-02-16 Glenn Morris <rgm@gnu.org>
* icons/gnu2a32.ico, icons/gnu2a32t.ico, icons/gnu2b48.ico:

28
nt/INSTALL
View File

@ -26,7 +26,8 @@
command.com /c configure.bat
3. Run the Make utility suitable for your environment. If you build
with the Microsoft's Visual C compiler:
with the Microsoft's Visual C compiler (but see notes about using
VC++ 8.0 and later below):
nmake
@ -99,15 +100,17 @@
* Supported development environments
To compile Emacs, you will need either Microsoft Visual C++ 2.0 or
later and nmake, or a Windows port of GCC 2.95 or later with MinGW
and W32 API support and a port of GNU Make. You can use the Cygwin
ports of GCC, but Emacs requires the MinGW headers and libraries to
build (latest versions of the Cygwin toolkit, at least since v1.3.3,
include the MinGW headers and libraries as an integral part).
To compile Emacs, you will need either Microsoft Visual C++ 2.0, or
later up to 7.0, and nmake, or a Windows port of GCC 2.95 or later
with MinGW and W32 API support and a port of GNU Make. You can use
the Cygwin ports of GCC, but Emacs requires the MinGW headers and
libraries to build (latest versions of the Cygwin toolkit, at least
since v1.3.3, include the MinGW headers and libraries as an integral
part).
Note that building Emacs with Visual Studio 2005 is not supported at
this time.
Note that building Emacs with Visual Studio 2005 (VC++ 8.0) is not
supported at this time, due to changes introduced by Microsoft into
the libraries shipped with the compiler.
The rest of this file assumes you have a working development
environment. If you just installed such an environment, try
@ -191,9 +194,14 @@
http://www.emacswiki.org/cgi-bin/wiki/WThirtyTwoInstallationKit
and at this URL:
and on these URLs:
http://ourcomments.org/Emacs/w32-build-emacs.html
http://derekslager.com/blog/posts/2007/01/emacs-hack-3-compile-emacs-from-cvs-on-windows.ashx
The second URL above includes instructions for building with MSVC,
as well as with MinGW, while the first URL covers only MinGW, but
has more details about it.
* Configuring

8
nt/emacs.rc
View File

@ -6,8 +6,8 @@ Emacs ICON icons\emacs.ico
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION 22,0,94,0
PRODUCTVERSION 22,0,94,0
FILEVERSION 22,0,95,0
PRODUCTVERSION 22,0,95,0
FILEFLAGSMASK 0x3FL
#ifdef EMACSDEBUG
FILEFLAGS 0x1L
@ -24,12 +24,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Free Software Foundation\0"
VALUE "FileDescription", "GNU Emacs for Windows NT/95/98/2000/ME/XP\0"
VALUE "FileVersion", "22, 0, 94, 0\0"
VALUE "FileVersion", "22, 0, 95, 0\0"
VALUE "InternalName", "Emacs\0"
VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007\0"
VALUE "OriginalFilename", "emacs.exe"
VALUE "ProductName", "Emacs: The extensible self-documenting text editor\0"
VALUE "ProductVersion", "22, 0, 94, 0\0"
VALUE "ProductVersion", "22, 0, 95, 0\0"
VALUE "OLESelfRegister", "\0"
END
END

22
oldXMenu/Activate.c
View File

@ -1,9 +1,27 @@
/* Copyright Massachusetts Institute of Technology 1985 */
/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
2006, 2007 Free Software Foundation, Inc. */
#include "copyright.h"
/*
Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
Free Software Foundation, Inc.
This program 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.
This program 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 this program; see the file COPYING. If not, write to the
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */
/*
* XMenu: MIT Project Athena, X Window system menu package
*

6
oldXMenu/AddPane.c
View File

@ -1,8 +1,6 @@
#include "copyright.h"
/* Copyright Massachusetts Institute of Technology 1985 */
/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
2006, 2007 Free Software Foundation, Inc. */
#include "copyright.h"
/*
* XMenu: MIT Project Athena, X Window system menu package

5
oldXMenu/AddSel.c
View File

@ -1,8 +1,7 @@
/* Copyright Massachusetts Institute of Technology 1985 */
#include "copyright.h"
/* Copyright Massachusetts Institute of Technology 1985 */
/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
2006, 2007 Free Software Foundation, Inc. */
/*
* XMenu: MIT Project Athena, X Window system menu package

11
oldXMenu/ChangeLog
View File

@ -1,3 +1,14 @@
2007-02-27 Glenn Morris <rgm@gnu.org>
* Imakefile: Remove unused file with no explicit legal info.
* Makefile.in (distclean): Remove Makefile.
2007-02-25 Glenn Morris <rgm@gnu.org>
* XCrAssoc.c, XDelAssoc.c, XDestAssoc.c, XLookAssoc.c:
* XMakeAssoc.c: Remove license text in favour of including
copyright.h, as was done in original X11 source.
2004-12-27 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* Activate.c (XMenuActivate): Return XM_NO_SELECT if Escape or C-g

5
oldXMenu/ChgPane.c
View File

@ -1,8 +1,7 @@
/* Copyright Massachusetts Institute of Technology 1985 */
#include "copyright.h"
/* Copyright Massachusetts Institute of Technology 1985 */
/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
2006, 2007 Free Software Foundation, Inc. */
/*
* XMenu: MIT Project Athena, X Window system menu package

5
oldXMenu/ChgSel.c
View File

@ -1,8 +1,7 @@
/* Copyright Massachusetts Institute of Technology 1985 */
#include "copyright.h"
/* Copyright Massachusetts Institute of Technology 1985 */
/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
2006, 2007 Free Software Foundation, Inc. */
/*
* XMenu: MIT Project Athena, X Window system menu package

22
oldXMenu/Create.c
View File

@ -1,9 +1,27 @@
/* Copyright Massachusetts Institute of Technology 1985 */
/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
2006, 2007 Free Software Foundation, Inc. */
#include "copyright.h"
/*
Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006,
2007 Free Software Foundation, Inc.
This program 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.
This program 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 this program; see the file COPYING. If not, write to the
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */
/*
* XMenu: MIT Project Athena, X Window system menu package
*

5
oldXMenu/DelPane.c
View File

@ -1,8 +1,7 @@
/* Copyright Massachusetts Institute of Technology 1985 */
#include "copyright.h"
/* Copyright Massachusetts Institute of Technology 1985 */
/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
2006, 2007 Free Software Foundation, Inc. */
/*
* XMenu: MIT Project Athena, X Window system menu package

5
oldXMenu/DelSel.c
View File

@ -1,8 +1,7 @@
/* Copyright Massachusetts Institute of Technology 1985 */
#include "copyright.h"
/* Copyright Massachusetts Institute of Technology 1985 */
/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
2006, 2007 Free Software Foundation, Inc. */
/*
* XMenu: MIT Project Athena, X Window system menu package

5
oldXMenu/Destroy.c
View File

@ -1,8 +1,7 @@
/* Copyright Massachusetts Institute of Technology 1985 */
#include "copyright.h"
/* Copyright Massachusetts Institute of Technology 1985 */
/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
2006, 2007 Free Software Foundation, Inc. */
/*
* XMenu: MIT Project Athena, X Window system menu package

Some files were not shown because too many files have changed in this diff Show More