mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-01 11:14:55 +00:00
Code Issues Releases Activity

Merged from miles@gnu.org--gnu-2005 (patch 83-87, 449-468)

Browse Source 
Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-449
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-450
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-451
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-452
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-453
   Update from CVS: lisp/subr.el (add-to-ordered-list): Doc fix.

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-454
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-455
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-456
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-457
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-458
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-459
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-460
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-461
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-462
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-463
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-464
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-465
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-466
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-467
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-468
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-83
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-84
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-85
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-86
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-87
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-371
This commit is contained in:
Karoly Lorentey 2005-07-05 22:12:55 +00:00
commit 41be4f66fd
187 changed files with 8753 additions and 2759 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
COPYING
View File

@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
@ -313,7 +313,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) year name of author
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.

15
admin/FOR-RELEASE
View File

@ -23,20 +23,15 @@ face name prefixes should be in it for good results.
gracefully if something isn't supported over Tramp.
To be done by Andre Spiegel <spiegel@gnu.org>.
** define-minor-mode should not put :require into defcustom.
See msg from rms to emacs-devel on 21 Dec.
** Update Speedbar.
** Update vhdl-mode.el based on changes in
http://opensource.ethz.ch/emacs/vhdl-mode.html.
** Debug custom themes.
* FATAL ERRORS
** Make unexec handle memory mapping policy of the latest versions of Linux.
This includes exec_shield and a memory-layout randomization feature.
** Investigate reported crashes in compact_small_strings.
** Investigate reported crashes related to using an
@ -45,6 +40,8 @@ invalid pointer from string_free_list.
* BUGS
** Fix those modes that still use compile-internal, to not use it.
** Bug in ebrowse
Date: Fri, 27 May 2005 17:35:48 +0200
@ -102,6 +99,12 @@ I think in the near future we will see more of this problem, so it might be
time to make anfe-ftp more intelligent.
* FSF's ADDRESS
** Update the FSF's address in all files.
Lute Kamstra is working on this.
* DOCUMENTATION
** Document Custom Themes.

6
etc/COPYING
View File

@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
@ -313,7 +313,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) year name of author
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.

56
etc/ChangeLog
View File

@ -1,3 +1,17 @@
2005-07-03 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* PROBLEMS (Fedora Core 4 GNU/Linux: Segfault during dumping):
Added it again.
2005-06-29 Carsten Dominik <dominik@science.uva.nl>
* NEWS: Added an entry for Org-mode, and a change entry for
reftex-mode.
2005-06-28 Richard M. Stallman <rms@gnu.org>
* PROBLEMS (Fedora Core 4 GNU/Linux: Segfault during dumping): New.
2005-06-11 Eli Zaretskii <eliz@gnu.org>
* DEBUG: Mention emacs-buffer.gdb.
@ -58,7 +72,7 @@
2005-05-05 Slawomir Nowaczyk <slawek@cs.lth.se> (tiny change)
* TUTORIAL.pl: Updated header.
* TUTORIAL.pl: Updated header.
2005-05-02 Richard M. Stallman <rms@gnu.org>
@ -101,8 +115,8 @@
2005-04-10 Masatake YAMATO <jet@gyve.org>
* compilation.txt (symbol): Added gcov-file
gcov-bb-file gcov-never-called-line gcov-called-line .
* compilation.txt (symbol): Add gcov-file
gcov-bb-file gcov-never-called-line gcov-called-line.
2005-04-08 Kenichi Handa <handa@m17n.org>
@ -119,7 +133,7 @@
2005-04-05 Marcelo Toledo <marcelo@gnu.org>
* TUTORIAL.translators: Added the field Maintainer.
* TUTORIAL.translators: Added the field Maintainer.
2005-04-04 Thien-Thi Nguyen <ttn@gnu.org>
@ -140,22 +154,21 @@
2005-04-01 Marcelo Toledo <marcelo@gnu.org>
* TUTORIAL.pt_BR, TUTORIAL.cn, TUTORIAL.cs, TUTORIAL.de,
* TUTORIAL.es, TUTORIAL.fr, TUTORIAL.it, TUTORIAL.ja, TUTORIAL.ko,
* TUTORIAL.pl, TUTORIAL.pt_BR, TUTORIAL.ro, TUTORIAL.ru,
* TUTORIAL.sk, TUTORIAL.sl, TUTORIAL.th, TUTORIAL.zh: Fix title
line.
* TUTORIAL.pt_BR, TUTORIAL.cn, TUTORIAL.cs, TUTORIAL.de,
* TUTORIAL.es, TUTORIAL.fr, TUTORIAL.it, TUTORIAL.ja, TUTORIAL.ko,
* TUTORIAL.pl, TUTORIAL.pt_BR, TUTORIAL.ro, TUTORIAL.ru,
* TUTORIAL.sk, TUTORIAL.sl, TUTORIAL.th, TUTORIAL.zh: Fix title line.
2005-04-01 Ognyan Kulev <ogi@fmi.uni-sofia.bg>
* TUTORIAL.bg: Fix title line; Applied TUTORIAL changes in
2005-02-08T14:20:54Z!lute@gnu.org, "Emacs" is not transliterated to cyrillic anymore;
Minor fixes.
* TUTORIAL.bg: Fix title line; Applied TUTORIAL changes in
2005-02-08T14:20:54Z!lute@gnu.org, "Emacs" is not transliterated to cyrillic anymore;
Minor fixes.
2005-04-01 Mats Lidell <matsl@contactor.se>
* TUTORIAL.sv: Sync some other changes with the TUTORIAL version
2005-04-01T00:31:25Z!rms@gnu.org.
* TUTORIAL.sv: Sync some other changes with the TUTORIAL version
2005-04-01T00:31:25Z!rms@gnu.org.
2005-04-01 Lute Kamstra <lute@gnu.org>
@ -289,7 +302,7 @@
* e/eterm.ti: Comment out smcup, rmcup. Add kbs, kdch1, rc, sc.
Reformat.
* e/eterm: Regenerate.
* e/eterm: Regenerate.
2004-09-25 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
@ -298,7 +311,7 @@
2004-09-16 Dan Nicolaescu <dann@ics.uci.edu>
* e/eterm.ti: Change the strings for smso and rmso.
e/eterm: Regenerate.
e/eterm: Regenerate.
2004-09-09 Thien-Thi Nguyen <ttn@gnu.org>
@ -307,7 +320,7 @@
2004-09-07 Dan Nicolaescu <dann@ics.uci.edu>
* e/eterm.ti: Add `op' entry to enable colors in term.
* e/eterm: Regenerate.
* e/eterm: Regenerate.
2004-09-04 Eric S. Raymond <esr@thyrsus.com>
@ -379,7 +392,7 @@
2004-07-08 David Kastrup <dak@gnu.org>
* NEWS (Lisp changes in 21.4): document (match-data t) change.
* NEWS (Lisp changes in 21.4): Document (match-data t) change.
2002-06-26 Eli Zaretskii <eliz@is.elta.co.il>
@ -389,8 +402,8 @@
* NEWS: Move description from new paragraph-start and
indent-line-function defaults to general news instead of new
packages. Same for query-replace-skip-read-only. Add
description of new `\,' and `\?' replacement string features.
packages. Same for query-replace-skip-read-only.
Add description of new `\,' and `\?' replacement string features.
2004-06-23 Luc Teirlinck <teirllm@auburn.edu>
@ -417,8 +430,7 @@
2004-05-14 David Ponce <david@dponce.com>
* tree-widget: New directory containing tree-widget themes and
images.
* tree-widget: New directory containing tree-widget themes and images.
2004-04-13 Marcelo Toledo <marcelo@gnu.org>

89
etc/NEWS
View File

@ -1547,6 +1547,21 @@ versions of cua.el and cua-mode.el. To ensure proper operation, you
must remove older versions of cua.el or cua-mode.el as well as the
loading and customization of those packages from the .emacs file.
+++
** Org mode is now part of the Emacs distribution
Org mode is a mode for keeping notes, maintaining ToDo lists, and
doing project planning with a fast and effective plain-text system.
It also contains a plain-text table editor with spreadsheet-like
capabilities.
The Org mode table editor can be integrated into any major mode by
activating the minor Orgtbl-mode.
The documentation for org-mode is in a separate manual; within Emacs,
type "C-h i m org RET" to read that manual. A reference card is
available in `etc/orgcard.tex' and `etc/orgcard.ps'.
+++
** The new package dns-mode.el add syntax highlight of DNS master files.
The key binding C-c C-s (`dns-mode-soa-increment-serial') can be used
@ -2202,6 +2217,80 @@ majority.
the syntax of backslashes in F90 buffers.
---
** Reftex mode changes
+++
*** Changes to RefTeX's table of contents
The new command keys "<" and ">" in the TOC buffer promote/demote the
section at point or all sections in the current region, with full
support for multifile documents.
The new command `reftex-toc-recenter' (`C-c -') shows the current
section in the TOC buffer without selecting the TOC window.
Recentering can happen automatically in idle time when the option
`reftex-auto-recenter-toc' is turned on. The highlight in the TOC
buffer stays when the focus moves to a different window. A dedicated
frame can show the TOC with the current section always automatically
highlighted. The frame is created and deleted from the toc buffer
with the `d' key.
The toc window can be split off horizontally instead of vertically.
See new option `reftex-toc-split-windows-horizontally'.
Labels can be renamed globally from the table of contents using the
key `M-%'.
The new command `reftex-goto-label' jumps directly to a label
location.
+++
*** Changes related to citations and BibTeX database files
Commands that insert a citation now prompt for optional arguments when
called with a prefix argument. Related new options are
`reftex-cite-prompt-optional-args' and `reftex-cite-cleanup-optional-args'.
The new command `reftex-create-bibtex-file' creates a BibTeX database
with all entries referenced in the current document. The keys "e" and
"E" allow to produce a BibTeX database file from entries marked in a
citation selection buffer.
The command `reftex-citation' uses the word in the buffer before the
cursor as a default search string.
The support for chapterbib has been improved. Different chapters can
now use BibTeX or an explicit `thebibliography' environment.
The macros which specify the bibliography file (like \bibliography)
can be configured with the new option `reftex-bibliography-commands'.
Support for jurabib has been added.
+++
*** Global index matched may be verified with a user function
During global indexing, a user function can verify an index match.
See new option `reftex-index-verify-function'.
+++
*** Parsing documents with many labels can be sped up.
Operating in a document with thousands of labels can be sped up
considerably by allowing RefTeX to derive the type of a label directly
from the label prefix like `eq:' or `fig:'. The option
`reftex-trust-label-prefix' needs to be configured in order to enable
this feature. While the speed-up is significant, this may reduce the
quality of the context offered by RefTeX to describe a label.
+++
*** Miscellaneous changes
The macros which input a file in LaTeX (like \input, \include) can be
configured in the new option `reftex-include-file-commands'.
RefTeX supports global incremental search.
+++
** Prolog mode has a new variable `prolog-font-lock-keywords'
to support use of font-lock.

23
etc/PROBLEMS
View File

@ -2376,8 +2376,12 @@ The fix is to install a newer version of ncurses, such as version 4.2.
*** Linux: Segfault during `make bootstrap' under certain recent versions of the Linux kernel.
With certain recent Linux kernels (like the one of Redhat Fedora Core
1 and 2), the new "Exec-shield" functionality is enabled by default, which
creates a different memory layout that breaks the emacs dumper.
1 and newer), the new "Exec-shield" functionality is enabled by default, which
creates a different memory layout that breaks the emacs dumper. Emacs tries
to handle this at build time, but if the workaround used fails, these
instructions can be useful.
The work-around explained here is not enough on Fedora Core 4 (and possible
newer). Read the next item.
Configure can overcome the problem of exec-shield if the architecture is
x86 and the program setarch is present. On other architectures no
@ -2404,6 +2408,21 @@ command when running temacs like this:
setarch i386 ./temacs --batch --load loadup [dump|bootstrap]
*** Fedora Core 4 GNU/Linux: Segfault during dumping.
In addition to exec-shield explained above "Linux: Segfault during
`make bootstrap' under certain recent versions of the Linux kernel"
item, Linux kernel shipped with Fedora Core 4 randomizes the virtual
address space of a process. As the result dumping may fail even if
you turn off exec-shield. In this case, use the -R option to the setarch
command:
setarch -R i386 ./temacs --batch --load loadup [dump|bootstrap]
or
setarch -R i386 make bootstrap
*** Fatal signal in the command temacs -l loadup inc dump.

3
etc/TUTORIAL.translators
View File

@ -48,8 +48,7 @@ Maintainer: Pieter Schoenmakers <tiggr@tiggr.net>
* TUTORIAL.pl:
Author: Beatę Wierzchołowską <beataw@orient.uw.edu.pl>
Janusz S. Bien <jsbien@mail.uw.edu.pl>
Maintainer: Beatę Wierzchołowską <beataw@orient.uw.edu.pl>
Janusz S. Bien <jsbien@mail.uw.edu.pl>
Maintainer: Radoslaw Moszczynski <rm@banita.pl>
* TUTORIAL.pt_BR:
Author: Marcelo Toledo <marcelo@gnu.org>

2752
etc/orgcard.ps Normal file
View File

File diff suppressed because it is too large Load Diff

737
etc/orgcard.tex Normal file
View File

@ -0,0 +1,737 @@
% Reference Card for Org Mode 3.13
%
%**start of header
\newcount\columnsperpage
% This file can be printed with 1, 2, or 3 columns per page (see below).
% At the moment this card works quite nicely in 3 column format and
% currently takes most of 2 pages. It is thus suited to producing one
% double-side page when printed.
% There are a couple of tweaks in the format of this card which make it work
% slightly better on A4 paper. The changes due, I think, to Stephen Eglen,
% are commented below. Revert the changes if you want letter sized paper.
% Try running something like
% tex org-mode-ref.tex; dvips -t landscape org-mode-ref.dvi
% to print the card
\columnsperpage=3
% Copyright (c) 2004 Philip Rooke, 2005 Free Software Foundation
% GNU Emacs is free software; you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
% the Free Software Foundation; either version 2, or (at your option)
% any later version.
% GNU Emacs is distributed in the hope that it will be useful,
% but WITHOUT ANY WARRANTY; without even the implied warranty of
% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
% GNU General Public License for more details.
% You should have received a copy of the GNU General Public License
% along with GNU Emacs; see the file COPYING. If not, write to
% the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
% Boston, MA 02111-1307, USA.
% This file is intended to be processed by plain TeX (TeX82).
%
% The final reference card has six columns, three on each side.
% This file can be used to produce it in any of three ways:
% 1 column per page
% produces six separate pages, each of which needs to be reduced to 80%.
% This gives the best resolution.
% 2 columns per page
% produces three already-reduced pages.
% You will still need to cut and paste.
% 3 columns per page
% produces two pages which must be printed sideways to make a
% ready-to-use 8.5 x 11 inch reference card.
% For this you need a dvi device driver that can print sideways.
% Which mode to use is controlled by setting \columnsperpage above.
%
% Author:
% Stephen Gildea
% Internet: gildea@stop.mail-abuse.org
%
% Thanks to Paul Rubin, Bob Chassell, Len Tower, and Richard Mlynarik
% for their many good ideas.
\def\orgversionnumber{3.13}
\def\year{2005}
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill
\centerline{\small \copyright\ 2004, 2005\ Free Software Foundation, Inc.
Permissions on back. v\orgversionnumber}}
\def\copyrightnotice{
\vskip 1ex plus 100 fill\begingroup\small
\centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
\centerline{v\orgversionnumber{} for Org-Mode \orgversionnumber{}, \year}
\centerline{Author: Philip Rooke}
\centerline{based on refcard design and format by Stephen Gildea}
Permission is granted to make and distribute copies of
this card provided the copyright notice and this permission notice
are preserved on all copies.
\endgroup}
% make \bye not \outer so that the \def\bye in the \else clause below
% can be scanned without complaint.
\def\bye{\par\vfill\supereject\end}
\newdimen\intercolumnskip %horizontal space between columns
\newbox\columna %boxes to hold columns already built
\newbox\columnb
\def\ncolumns{\the\columnsperpage}
\message{[\ncolumns\space
column\if 1\ncolumns\else s\fi\space per page]}
\def\scaledmag#1{ scaled \magstep #1}
% This multi-way format was designed by Stephen Gildea October 1986.
% Note that the 1-column format is fontfamily-independent.
\if 1\ncolumns %one-column format uses normal size
\hsize 4in
\vsize 10in
\voffset -.7in
\font\titlefont=\fontname\tenbf \scaledmag3
\font\headingfont=\fontname\tenbf \scaledmag2
\font\smallfont=\fontname\sevenrm
\font\smallsy=\fontname\sevensy
\footline{\hss\folio}
\def\makefootline{\baselineskip10pt\hsize6.5in\line{\the\footline}}
\else %2 or 3 columns uses prereduced size
\hsize 3.2in
% FIXME - Try to make things more A4 friendly
% \vsize 7.95in
\vsize 7.65in
% \hoffset -.75in
\hoffset -.25in
\voffset -.745in
\font\titlefont=cmbx10 \scaledmag2
\font\headingfont=cmbx10 \scaledmag1
\font\smallfont=cmr6
\font\smallsy=cmsy6
\font\eightrm=cmr8
\font\eightbf=cmbx8
\font\eightit=cmti8
\font\eighttt=cmtt8
\font\eightmi=cmmi8
\font\eightsy=cmsy8
\textfont0=\eightrm
\textfont1=\eightmi
\textfont2=\eightsy
\def\rm{\eightrm}
\def\bf{\eightbf}
\def\it{\eightit}
\def\tt{\eighttt}
% FIXME - Try to make things more A4 friendly
% \normalbaselineskip=.8\normalbaselineskip
\normalbaselineskip=.7\normalbaselineskip
\normallineskip=.8\normallineskip
\normallineskiplimit=.8\normallineskiplimit
\normalbaselines\rm %make definitions take effect
\if 2\ncolumns
\let\maxcolumn=b
\footline{\hss\rm\folio\hss}
\def\makefootline{\vskip 2in \hsize=6.86in\line{\the\footline}}
\else \if 3\ncolumns
\let\maxcolumn=c
\nopagenumbers
\else
\errhelp{You must set \columnsperpage equal to 1, 2, or 3.}
\errmessage{Illegal number of columns per page}
\fi\fi
\intercolumnskip=.46in
\def\abc{a}
\output={% %see The TeXbook page 257
% This next line is useful when designing the layout.
%\immediate\write16{Column \folio\abc\space starts with \firstmark}
\if \maxcolumn\abc \multicolumnformat \global\def\abc{a}
\else\if a\abc
\global\setbox\columna\columnbox \global\def\abc{b}
%% in case we never use \columnb (two-column mode)
\global\setbox\columnb\hbox to -\intercolumnskip{}
\else
\global\setbox\columnb\columnbox \global\def\abc{c}\fi\fi}
\def\multicolumnformat{\shipout\vbox{\makeheadline
\hbox{\box\columna\hskip\intercolumnskip
\box\columnb\hskip\intercolumnskip\columnbox}
\makefootline}\advancepageno}
\def\columnbox{\leftline{\pagebody}}
\def\bye{\par\vfill\supereject
\if a\abc \else\null\vfill\eject\fi
\if a\abc \else\null\vfill\eject\fi
\end}
\fi
% we won't be using math mode much, so redefine some of the characters
% we might want to talk about
%\catcode`\^=12
\catcode`\_=12
% we also need the tilde, for file names.
\catcode`\~=12
\chardef\\=`\\
\chardef\{=`\{
\chardef\}=`\}
\hyphenation{mini-buf-fer}
\parindent 0pt
\parskip 1ex plus .5ex minus .5ex
\def\small{\smallfont\textfont2=\smallsy\baselineskip=.8\baselineskip}
% newcolumn - force a new column. Use sparingly, probably only for
% the first column of a page, which should have a title anyway.
\outer\def\newcolumn{\vfill\eject}
% title - page title. Argument is title text.
\outer\def\title#1{{\titlefont\centerline{#1}}\vskip 1ex plus .5ex}
% section - new major section. Argument is section name.
\outer\def\section#1{\par\filbreak
\vskip 3ex plus 2ex minus 2ex {\headingfont #1}\mark{#1}%
\vskip 2ex plus 1ex minus 1.5ex}
\newdimen\keyindent
% beginindentedkeys...endindentedkeys - key definitions will be
% indented, but running text, typically used as headings to group
% definitions, will not.
\def\beginindentedkeys{\keyindent=1em}
\def\endindentedkeys{\keyindent=0em}
\endindentedkeys
% paralign - begin paragraph containing an alignment.
% If an \halign is entered while in vertical mode, a parskip is never
% inserted. Using \paralign instead of \halign solves this problem.
\def\paralign{\vskip\parskip\halign}
% \<...> - surrounds a variable name in a code example
\def\<#1>{{\it #1\/}}
% kbd - argument is characters typed literally. Like the Texinfo command.
\def\kbd#1{{\tt#1}\null} %\null so not an abbrev even if period follows
% beginexample...endexample - surrounds literal text, such a code example.
% typeset in a typewriter font with line breaks preserved
\def\beginexample{\par\leavevmode\begingroup
\obeylines\obeyspaces\parskip0pt\tt}
{\obeyspaces\global\let =\ }
\def\endexample{\endgroup}
% key - definition of a key.
% \key{description of key}{key-name}
% prints the description left-justified, and the key-name in a \kbd
% form near the right margin.
\def\key#1#2{\leavevmode\hbox to \hsize{\vtop
{\hsize=.75\hsize\rightskip=1em
\hskip\keyindent\relax#1}\kbd{#2}\hfil}}
\newbox\metaxbox
\setbox\metaxbox\hbox{\kbd{M-x }}
\newdimen\metaxwidth
\metaxwidth=\wd\metaxbox
% metax - definition of a M-x command.
% \metax{description of command}{M-x command-name}
% Tries to justify the beginning of the command name at the same place
% as \key starts the key name. (The "M-x " sticks out to the left.)
\def\metax#1#2{\leavevmode\hbox to \hsize{\hbox to .75\hsize
{\hskip\keyindent\relax#1\hfil}%
\hskip -\metaxwidth minus 1fil
\kbd{#2}\hfil}}
% threecol - like "key" but with two key names.
% for example, one for doing the action backward, and one for forward.
\def\threecol#1#2#3{\hskip\keyindent\relax#1\hfil&\kbd{#2}\hfil\quad
&\kbd{#3}\hfil\quad\cr}
%**end of header
\title{Org-Mode Reference Card (1/2)}
\centerline{(for version \orgversionnumber)}
\section{Getting Started}
%
Put the following in your \kbd{~/.emacs}$^1$
\vskip -1mm
\beginexample%
(autoload 'org-mode "org" "Org mode" t)
(autoload 'org-diary "org" "Org mode diary entries")
(autoload 'org-agenda "org" "Agenda from Org files" t)
(autoload 'org-store-link "org" "Store org link" t)
(autoload 'orgtbl-mode "org" "Orgtbl minor mode" t)
(autoload 'turn-on-orgtbl "org" "Orgtbl minor mode")
(add-to-list 'auto-mode-alist '("\\\\.org\$" . org-mode))
(define-key global-map "\\C-cl" 'org-store-link)$^2$
(define-key global-map "\\C-ca" 'org-agenda)$^2$
\endexample
%
\metax{For the many customization options try}{M-x org-customize}
\metax{To read the on-line documentation try}{M-x org-info}
\section{Visibility Cycling}
\key{rotate current subtree between states}{TAB}
\key{rotate entire buffer between states}{S-TAB}
\key{show the whole file}{C-c C-a}
%\key{show branches}{C-c C-k}
\section{Motion}
\key{next heading}{C-c C-n}
\key{previous heading}{C-c C-p}
\key{next heading, same level}{C-c C-f}
\key{previous heading, same level}{C-c C-b}
\key{backward to higher level heading}{C-c C-u}
\key{jump to another place in document}{C-c C-j}
\section{Structure Editing}
\key{insert new heading at same level as current}{M-RET}
\key{insert new TODO entry}{M-S-RET}
\key{promote current heading up one level}{M-LEFT}
\key{demote current heading down one level}{M-RIGHT}
\key{promote current subtree up one level}{M-S-LEFT}
\key{demote current subtree down one level}{M-S-RIGHT}
\key{move subtree up}{M-S-UP}
\key{move subtree down}{M-S-DOWN}
\key{kill subtree}{C-c C-h C-w}
\key{copy subtree}{C-c C-h M-w}
\key{yank subtree}{C-c C-h C-y}
\key{archive subtree}{C-c \$}
To set archive location for current file, add a line like$^3$:
\vskip -1mm
\beginexample%
\#+ARCHIVE: archfile::* Archived Tasks
\endexample
\section{Filtering and Sparse Trees}
\key{show sparse tree for all matches of a regexp}{C-c /}
\key{view TODO's in sparse tree}{C-c C-v}
\key{create sparse tree with all deadlines due}{C-c C-w}
\key{time sorted view of current org file}{C-c C-r}
\key{agenda for the week}{C-c a$1$}
\key{agenda for date at cursor}{C-c C-o}
\section{TODO Items}
\key{rotate the state of the current item}{C-c C-t}
\key{view TODO items in a sparse tree}{C-c C-v}
\key{set the priority of the current item}{C-c , [ABC]}
\key{remove priority cookie from current item}{C-c , SPC}
\key{raise priority of current item}{S-UP$^4$}
\key{lower priority of current item}{S-DOWN$^4$}
\vskip 1mm
per-file TODO workflow states: add line(s) like$^3$:
\vskip -1mm
\beginexample%
\#+SEQ_TODO: TODO PROCRASTINATE BLUFF DONE
\endexample
\vskip -1mm
per-file TODO keywords: add line(s) like$^3$:
\vskip -1mm
\beginexample%
\#+TYP_TODO: Phil home work DONE
\endexample
\section{Timestamps}
\key{prompt for date and insert timestamp}{C-c .}
\key{like \kbd{C-c} . but insert date and time format}{C-u C-c .}
\key{insert DEADLINE timestamp}{C-c C-d}
\key{insert SCHEDULED timestamp}{C-c C-s}
\key{create sparse tree with all deadlines due}{C-c C-w}
\key{the time between 2 dates in a time range}{C-c C-y}
\key{change timestamp at cursor by $-1$ day}{S-LEFT$^4$}
\key{change timestamp at cursor by $+1$ day}{S-RIGHT$^4$}
\key{change year/month/day at cursor by $-1$}{S-DOWN$^4$}
\key{change year/month/day at cursor by $+1$}{S-UP$^4$}
\key{access the calendar for the current date}{C-c >}
\key{insert timestamp matching date in calendar}{C-c <}
\key{access agenda for current date}{C-c C-o}
\key{While prompted for a date:}{}
\key{... select date in calendar}{mouse-1/RET}
\key{... scroll calendar back/forward one month}{< / >}
\key{... forward/backward one day}{S-LEFT/RIGHT}
\key{... forward/backward one week}{S-UP/DOWN}
\key{... forward/backward one month}{M-S-LEFT/RIGT}
\section{Links}
\key{globally store link to the current location}{C-c l$^2$}
\key{insert a link (TAB completes stored links)}{C-c C-l}
\key{insert file link with file name completion}{C-u C-c C-l}
\key{open link at point}{C-c C-o}
\key{open file links in emacs}{C-u C-c C-o}
\key{open link at point}{mouse-2}
\key{open file links in emacs}{mouse-3}
{\bf Link types}
\key{\kbd{<http://www.astro.uva.nl/~dominik>}}{\rm on the web}
\key{\kbd{<mailto:adent@galaxy.net>}}{\rm EMail address}
\key{\kbd{<news:comp.emacs>}}{\rm Usenet group}
\key{\kbd{<file:/home/dominik/img/mars.jpg>}}{\rm file, absolute}
\key{\kbd{<file:papers/last.pdf>}}{\rm file, relative}
\key{\kbd{<file:~/code/main.c:255>}}{\rm file with line nr.}
\key{\kbd{<bbdb:Richard Stallman>}}{\rm BBDB person}
\key{\kbd{<shell:ls *.org>}}{\rm shell command}
\key{\kbd{<gnus:group>}}{\rm GNUS group}
\key{\kbd{<gnus:group\#id>}}{\rm GNUS message}
\key{\kbd{<vm:folder>}}{\rm VM folder}
\key{\kbd{<vm:folder\#id>}}{\rm VM message}
\key{\kbd{<vm://myself@some.where.org/folder\#id>}}{\rm VM remote}
Wanderlust \kbd{<wl:...>} and RMAIL \kbd{<rmail:...>} like VM
%\key{\kbd{<wl:folder>}}{\rm Wanderlust f.}
%\key{\kbd{<wl:folder\#id>}}{\rm Wanderlust m.}
%\key{\kbd{<rmail:folder>}}{\rm RMAIL folder}
%\key{\kbd{<rmail:folder\#id>}}{\rm RMAIL msg}
\section{Tables}
%Org-mode has its own built-in intuitive table editor with unique
%capabilities.
{\bf Creating a table}
\metax{insert a new Org-mode table}{M-x org-table-create}
\metax{... or just start typing, e.g.}{|Name|Phone|Age RET |- TAB}
\key{convert region to table}{C-c C-c}
\key{... separator at least 3 spaces}{C-3 C-c C-c}
%\key{... prompt for separator regexp}{C-u C-c C-c}
{\bf Commands available inside tables}
The following commands work when the cursor is {\it inside a table}.
Outside of tables, the same keys may have other functionality.
{\bf Re-aligning and field motion}
\key{re-align the table without moving the cursor}{C-c C-c}
\key{re-align the table, move to next field}{TAB}
\key{move to previous field}{S-TAB}
\key{re-align the table, move to next row}{RET}
{\bf Row and column editing}
\key{move the current column left}{M-LEFT}
\key{move the current column right}{M-RIGHT}
\key{kill the current column}{M-S-LEFT}
\key{insert new column to left of cursor position}{M-S-RIGHT}
\key{move the current row up}{M-UP}
\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 -}
{\bf Regions}
\key{cut rectangular region}{C-c C-h C-w}
\key{copy rectangular region}{C-c C-h M-w}
\key{paste rectangular region}{C-c C-h C-y}
\key{fill paragraph across selected cells}{C-c C-q}
{\bf Calculations}
Except for the summation commands, these need the Emacs calc package
installed.
\key{replace current field with result of formula}{C-c =}
\key{... same calculation for rest of column}{C-u 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 *}
\kbd{TAB}, \kbd{RET} and \kbd{C-c C-c} trigger automatic recalculation
in lines starting with: {\tt | \# |}.
\key{rotate recalculation mark through \# * ! \^ \_ \$}{C-\#}
\key{display column number cursor is in}{C-c ?}
\key{sum numbers in current column/rectangle}{C-c +}
\key{copy down with increment}{S-RET$^4$}
A formula can also be typed directly into into a field. It will be
executed by \kbd{TAB}, \kbd{RET} and \kbd{C-c C-c}:
\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{Apply current (for this column) formula}{=}
\key{Sum all numbers above/left of cursor}{=sum / =sumh}
\key{Sum just the 3 fields closest to cursor}{=sum3/=sumh3}
{\bf Miscellaneous}
\key{toggle visibility of vertical lines}{C-c |}
\metax{export as tab-separated file}{M-x org-table-export}
\metax{import tab-separated file}{M-x org-table-import}
{\bf Tables created with the \kbd{table.el} package}
\key{insert a new \kbd{table.el} table}{C-c ~}
\key{recognize existing table.el table}{C-c C-c}
\key{convert table (Org-mode $\leftrightarrow$ table.el)}{C-c ~}
\newcolumn
\title{Org-Mode Reference Card (2/2)}
\centerline{(for version \orgversionnumber)}
\section{Timeline and Agenda}
\key{show timeline of current org file}{C-c C-r}
\key{... include past dates}{C-u C-c C-r}
\key{add current file to your agenda}{C-c [}
\key{remove current file from your agenda}{C-c ]}
\key{compile agenda for the current week}{C-c a$^2$}
\key{agenda for date at cursor}{C-c C-o}
\vskip 1mm
To set category for current file, add line$^3$:
\vskip -1mm
\beginexample%
\#+CATEGORY: MyCateg
\endexample
{\bf Commands available in an agenda buffer}
The agenda buffer is electric: single key presses execute commands.
{\bf View org file}
\key{show original location of item}{SPC}
\key{... also available with}{mouse-3}
\key{show and recenter window}{l}
\key{goto original location in other window}{TAB}
\key{... also available with}{mouse-2}
\key{goto original location, delete other windows}{RET}
\key{toggle follow-mode}{f}
{\bf Change display}
\key{delete other windows}{o}
\key{switch to weekly view}{w}
\key{switch to daily view}{d}
\key{toggle inclusion of diary entries}{D}
\key{toggle time grid for daily schedule}{g}
\key{refresh agenda buffer with any changes}{r}
\key{display the following \kbd{org-agenda-ndays}}{RIGHT}
\key{display the previous \kbd{org-agenda-ndays}}{LEFT}
\key{goto today}{.}
{\bf Remote editing}
\key{digit argument}{0-9}
\key{change state of current TODO item}{t}
\key{set priority of current item}{p}
\key{raise priority of current item}{S-UP$^4$}
\key{lower priority of current item}{S-DOWN$^4$}
\key{display weighted priority of current item}{P}
\key{change timestamp to one day earlier}{S-LEFT$^4$}
\key{change timestamp to one day later}{S-RIGHT$^4$}
\key{change timestamp to today}{>}
\key{insert new entry into diary}{i}
{\bf Calendar commands}
\key{find agenda cursor date in calendar}{c}
\key{compute agenda for calendar cursor date}{c}
\key{show phases of the moon}{M}
\key{show sunrise/sunset times}{S}
\key{show holidays}{H}
\key{convert date to other calendars}{C}
{\bf Quit and Exit}
\key{quit agenda, remove agenda buffer}{q}
\key{exit agenda, remove all agenda buffers}{x}
\section{Exporting}
Exporting creates files with extensions {\it .txt\/} and {\it .html\/}
in the current directory.
\key{export as ASCII file}{C-c C-x a}
\key{export visible text only (e.g. for printing)}{C-c C-x v}
\key{export as HTML file}{C-c C-x h}
\key{export as HTML and open in browser}{C-c C-x C-h}
\key{prefix arg sets nb. of headline levels, e.g.}{C-3 C-c C-x h}
\key{insert template of export options}{C-c C-x t}
\key{toggle fixed width for line or region}{C-c :}
{\bf HTML formatting}
\key{make words {\bf bold}}{*bold*}
\key{make words {\it italic}}{/italic/}
\key{make words \underbar{underlined}}{_underlined_}
\key{sub- and superscripts}{x\^{}3, J_dust}
\key{\TeX{}-like macros}{\\alpha, \\to}
\key{typeset lines in fixed width font}{start with :}
\key{tables are exported as HTML tables}{start with |}
\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:}
{\bf Settings for the OPTIONS line}
\key{set number of headline levels for export}{H:2}
\key{turn on/off section numbers}{num:t}
\key{turn on/off table of contents}{toc:t}
\key{turn on/off linebreak preservation}{\\n:nil}
\key{turn on/off quoted html tags}{@:t}
\key{turn on/off fixed width sections}{::t}
\key{turn on/off tables}{|:t}
\key{turn on/off \TeX\ syntax for sub/super-scripts}{\^{}:t}
\key{turn on/off emphasised text}{*:nil}
\key{turn on/off \TeX\ macros}{TeX:t}
{\bf Comments: Text not being exported}
Text before the first headline is not considered part of the document
and is therefore never exported.
Lines starting with \kbd{\#} are comments and are not exported.
Subtrees whose header starts with COMMENT are never exported.
\key{toggle COMMENT keyword on entry}{C-c ;}
\section{Completion}
In-buffer completion completes TODO keywords at headline start, TeX
macros after ``{\tt \\}'', option keywords after ``{\tt \#-}'',
keyword formulas after ``{\tt =}'', and dictionary words elsewhere.
\key{Complete word at point}{M-TAB}
\newcolumn
\section{Calendar and Diary Integration}
To include entries from the Emacs diary in your Org-mode agenda:
\beginexample%
(setq org-agenda-include-diary t)
\endexample
To include your Org-mode agenda in your normal diary, make sure you're
using the fancy diary display
%
%\beginexample%
%(add-hook 'diary-display-hook 'fancy-diary-display)
%\endexample
%
and in your \kbd{~/diary} file add
\beginexample%
\&\%\%(org-diary)
\endexample
to include all the files listed in \kbd{org-agenda-files}. For more
selective file inclusion use a line for each file:
\beginexample%
\&\%\%(org-diary) ~/path/to/some/org-file.org
\endexample
\section{Remember-mode Integration}
See the manual for how to make remember.el use Org-mode links and
files. The note-finishing command \kbd{C-c C-c} will first prompt for
an org file. In the file, find a location with:
\key{rotate subtree visibility}{TAB}
\key{next heading}{DOWN}
\key{previous heading}{UP}
Insert the note with one of the following:
\key{as sublevel of heading at cursor}{RET}
\key{right here (cursor not on heading)}{RET}
\key{before current heading}{LEFT}
\key{after current heading}{RIGHT}
\key{shortcut to end of buffer (cursor at buf-start)}{RET}
\key{Abort}{q}
\section{CUA and pc-select compatibility}
Configure the variable {\tt org-CUA-compatibility} to make Org-mode
avoid the \kbd{S-<cursor>} bindings used by these modes. When set,
Org-mode will change the following keybindings (also in the agenda
buffer, but not during date selection). See note mark four$^4$
throughout the reference card.
%\vskip-mm
\beginexample
S-UP $\to$ M-p S-DOWN $\to$ M-n
S-LEFT $\to$ M-- S-RIGHT $\to$ M-+
S-RET $\to$ C-S-RET
\endexample
\section{Notes}
$^1$ The six autoload forms are only needed if Org-mode is not part of
Emacs, or an XEmacs package.
$^2$ This is only a suggestion for a binding of this command. Choose
you own key as shown under INSTALLATION.
$^3$ After changing a \kbd{\#+KEYWORD} line, press \kbd{C-c C-c} with
the cursor still in a line to make Org-mode notice the change.
$^4$ Keybinding affected by {\tt org-CUA-compatibility}.
\copyrightnotice
\bye
% Local variables:
% compile-command: "tex ord-mode-ref"
% TeX-master: t
% End:
% arch-tag: 139f6750-5cfc-49ca-92b5-237fe5795290

6
leim/COPYING
View File

@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
@ -313,7 +313,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) year name of author
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.

5
leim/ChangeLog
View File

@ -1,3 +1,8 @@
2005-06-28 Kenichi Handa <handa@m17n.org>
* leim-ext.el: Add rules for inserting full-width space for
quail/Punct and quail/Punct-b5.
2005-06-04 Eli Zaretskii <eliz@gnu.org>
* makefile.w32-in (distclean): Fix a typo (colon was after

6
leim/leim-ext.el
View File

@ -34,6 +34,12 @@
(eval-after-load "quail/PY-b5"
'(quail-defrule "ling2" ?$(0!r(B nil t))
;; Enable inputting full-width space (U+3000).
(eval-after-load "quail/Punct"
'(quail-defrule " " ?$A!!(B nil t))
(eval-after-load "quail/Punct-b5"
'(quail-defrule " " ?$(0!!(B nil t))
(autoload 'ucs-input-activate "quail/uni-input"
"Activate UCS input method.
With arg, activate UCS input method if and only if arg is positive.

6
lib-src/COPYING
View File

@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
@ -313,7 +313,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) year name of author
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.

6
lisp/COPYING
View File

@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
@ -313,7 +313,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) year name of author
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.

656
lisp/ChangeLog
View File

@ -1,5 +1,641 @@
2005-07-04 Carsten Dominik <dominik@science.uva.nl>
* textmodes/org.el: Leading space replaced by TABS.
(org-recalc-marks, org-table-rotate-recalc-marks)
(org-table-get-specials): Treat "^" and "_" marks.
(org-table-justify-field-maybe): Optional argument NEW.
(org-table-eval-formula): Parsing of the format simplified. New
modes C,I. Honor the %= parameter in the current table. Avoid
unnecessary re-align by using the NEW argument to
`org-table-justify-field-maybe'.
(org-calc-default-modes): Default for date-format mimicks
org-mode.
(org-agenda, org-timeline): Quote argument in
`org-agenda-redo-command'.
2005-07-03 Luc Teirlinck <teirllm@auburn.edu>
* cus-face.el (custom-theme-set-faces): Make it handle face
aliases whose alias declarations are pre- or autoloaded.
2005-07-04 Juri Linkov <juri@jurta.org>
* faces.el (read-face-name): Put the code for getting a face name
from the buffer before adding the faces from the `face' property.
Use `completing-read-multiple' instead of `completing-read'.
Require `crm'. Add default value and post-process the returned
list of faces.
* emacs-lisp/crm.el (crm-find-current-element)
(crm-minibuffer-complete-and-exit): Handle minibuffer prompt.
* emacs-lisp/lisp-mode.el (eval-defun-1):
* emacs-lisp/edebug.el (edebug-eval-defun):
Remove unnecessary quotes.
2005-07-04 Juanma Barranquero <lekktu@gmail.com>
* add-log.el (add-change-log-entry):
* comint.el (comint-dynamic-list-input-ring)
(comint-dynamic-list-completions):
* dabbrev.el (dabbrev-expand):
* delim-col.el (delimit-columns-rectangle-line):
* diff-mode.el (diff-context->unified, diff-reverse-direction)
(diff-unified->context):
* ediff-init.el (ediff-abbrev-jobname):
* ediff-mult.el (ediff-replace-session-status-in-meta-buffer)
(ediff-replace-session-activity-marker-in-meta-buffer):
* info.el (Info-summary):
* lpr.el (printify-region):
* printing.el (pr-create-interface):
* ps-print.el (ps-print-quote):
* ses.el (ses-column-widths, ses-print-cell)
(ses-adjust-print-width, ses-center):
* shell.el (shell-file-name-quote-list):
* strokes.el (strokes-read-stroke, strokes-read-complex-stroke)
(strokes-fill-current-buffer-with-whitespace)
(strokes-xpm-for-stroke, strokes-list-strokes)
(strokes-xpm-char-bit-p, strokes-xpm-for-compressed-string):
* term.el (term-dynamic-list-input-ring)
(term-dynamic-list-completions):
* calc/calc.el (math-format-stack-value):
* emacs-lisp/edebug.el (edebug-display-freq-count):
* progmodes/delphi.el (delphi-indent-line, delphi-fill-comment)
(delphi-new-comment-line):
* progmodes/ebnf2ps.el (ebnf-eps-filename, ebnf-trim-right):
* progmodes/executable.el (executable-set-magic):
* progmodes/python.el (inferior-python-mode):
* progmodes/scheme.el (scheme-mode-syntax-table):
* progmodes/sh-script.el (sh-maybe-here-document):
* progmodes/sql.el (sql-copy-column):
* progmodes/tcl.el (tcl-comment-indent, tcl-quote):
* textmodes/bibtex.el (bibtex-mode):
* textmodes/sgml-mode.el (html-imenu-index, sgml-attributes)
(sgml-auto-attributes):
* textmodes/table.el (table-insert, table-shorten-cell)
(table--generate-source-scan-lines, table-delete-row)
(*table--cell-delete-char, table--spacify-frame)
(table--horizontally-shift-above-and-below)
(table--cell-insert-char, table--cell-blank-str)
(table--fill-region-strictly):
* textmodes/tex-mode.el (tex-insert-quote, latex-find-indent):
* textmodes/texinfo.el (texinfo-insert-quote): "?\ " -> "?\s".
* add-log.el (change-log):
* apropos.el (apropos):
* comint.el (comint-completion, comint-source):
* dabbrev.el (dabbrev):
* delim-col.el (columns):
* diff-mode.el (diff-mode):
* ediff.el (ediff):
* ediff-diff.el (ediff-diff):
* ediff-init.el (ediff-highlighting, ediff-merge, ediff-hook):
* ediff-mult.el (ediff-mult):
* ediff-ptch.el (ediff-ptch):
* ediff-wind.el (ediff-window):
* facemenu.el (facemenu):
* indent.el (indent):
* info.el (info):
* jka-cmpr-hook.el (compression, jka-compr):
* lpr.el (lpr):
* outline.el (outlines):
* pcmpl-cvs.el (pcmpl-cvs):
* pcmpl-rpm.el (pcmpl-rpm):
* printing.el (printing):
* ps-print.el (postscript, ps-print, ps-print-horizontal)
(ps-print-vertical, ps-print-headers, ps-print-font)
(ps-print-color, ps-print-face, ps-print-n-up, ps-print-zebra)
(ps-print-background, ps-print-printer, ps-print-page)
(ps-print-miscellany):
* ses.el (ses):
* shell.el (shell, shell-directories, shell-faces):
* startup.el (initialization):
* strokes.el (strokes):
* term.el (term):
* uniquify.el (uniquify):
* w32-vars.el (w32):
* calc/calc.el (calc):
* emacs-lisp/bytecomp.el (bytecomp):
* emacs-lisp/cl-indent.el (lisp-indent):
* emacs-lisp/edebug.el (edebug):
* emacs-lisp/elp.el (elp):
* emacs-lisp/testcover.el (testcover):
* emacs-lisp/trace.el (trace):
* emulation/viper-ex.el (viper-ex):
* emulation/viper-mous.el (viper-mouse):
* mail/mailalias.el (mailalias):
* mail/supercite.el (supercite, supercite-frames)
(supercite-attr, supercite-cite, supercite-hooks):
* net/rcompile.el (remote-compile):
* net/rlogin.el (rlogin):
* obsolete/ooutline.el (outlines):
* progmodes/delphi.el (delphi):
* progmodes/ebnf2ps.el (postscript, ebnf2ps, ebnf-special)
(ebnf-except, ebnf-repeat, ebnf-terminal, ebnf-non-terminal)
(ebnf-production, ebnf-shape, ebnf-displacement, ebnf-syntactic)
(ebnf-optimization):
* progmodes/etags.el (etags):
* progmodes/executable.el (executable):
* progmodes/idlwave.el (idlwave):
* progmodes/pascal.el (pascal):
* progmodes/prolog.el (prolog):
* progmodes/python.el (python):
* progmodes/scheme.el (scheme):
* progmodes/sh-script.el (sh, sh-script):
* progmodes/sql.el (SQL):
* progmodes/tcl.el (tcl):
* textmodes/bibtex.el (bibtex, bibtex-autokey):
* textmodes/enriched.el (enriched):
* textmodes/makeinfo.el (makeinfo):
* textmodes/sgml-mode.el (sgml):
* textmodes/table.el (table-hooks):
* textmodes/tex-mode.el (tex-file, tex-run, tex-view):
* textmodes/texinfo.el (texinfo):
* textmodes/two-column.el (two-column):
Finish `defgroup' description with period.
* emacs-lisp/cl-indent.el (lisp-indent-maximum-backtracking):
* eshell/esh-var.el (eshell-var):
* progmodes/vhdl-mode.el (vhdl-testbench):
* textmodes/org.el (org): Fix typos in docstrings.
* emacs-lisp/timer.el (with-timeout): Improve argument/docstring
consistency.
* progmodes/flymake.el (flymake-find-file): Remove.
(flymake-float-time): Use `with-no-warnings'.
(flymake-check-start-time, flymake-check-was-interrupted)
(flymake-err-info, flymake-is-running, flymake-last-change-time)
(flymake-new-err-info): `defvar' at compile time.
2005-07-03 Juanma Barranquero <lekktu@gmail.com>
* replace.el (occur-hook): Doc fix.
(occur-1): Don't call `occur-hook' if there are no matches.
2005-07-03 Richard M. Stallman <rms@gnu.org>
* emulation/tpu-edt.el (tpu-original-global-map): Don't copy
global-map, save the same map.
(global-map): Don't alter it at top level.
(tpu-edt-on): Save global map in tpu-original-global-map, then copy.
Then alter it here instead.
(tpu-edt-off): Set global-map to the saved one.
* emulation/tpu-edt.el (tpu-emacs19-p): Var deleted.
All references simplified.
(tpu-lucid-emacs-p): Renamed from tpu-lucid-emacs19-p. Uses changed.
(zmacs-regions): Add defvar.
(repeat-complex-command-map): Everything about that deleted.
* textmodes/artist.el (artist-key-is-drawing)
(artist-key-endpoint1, artist-key-poly-point-list)
(artist-key-shape, artist-key-draw-how, artist-popup-menu-table)
(artist-key-compl-table, artist-rb-save-data)
(artist-arrow-point-1, artist-arrow-point-2): Move defvars up.
Don't put them in eval-when-compile.
(artist-set-arrow-points-for-poly): Use `last', not `artist-last'.
* progmodes/ebrowse.el (ebrowse-revert-tree-buffer-from-file):
Use with-no-warnings.
* net/browse-url.el (dos-windows-version): Add defvar.
* mail/supercite.el (filladapt-prefix-table): Add defvar.
* mail/rmailsum.el (rmail-summary-redo): Add defvar.
(rmail-summary-mode-map, rmail-summary-overlay): Defvars moved up.
(rmail-new-summary-line-count): Renamed from new-summary-line-count.
Add defvar.
(rmail-summary-beginning-of-message): Use with-no-warnings.
(rmail-summary-first-message, rmail-summary-last-message): Likewise.
* emulation/vip.el (vip-replace-string, ex-map, ex-read):
Use with-no-warnings.
* emulation/vi.el (vi-mark-region): Use c-mark-function.
(c-mark-function): Add point-moving-unit property.
(vi-goto-line): Use with-no-warnings.
* emulation/edt.el (edt-last-copied-word): Add defvar.
(zmacs-region-stays): Likewise.
(edt-mark-section-wisely): Use c-mark-function for C.
Use makr-defun for Fortran.
(time-string): defvar deleted.
(edt-display-the-time): Don't set time-string.
* emacs-lisp/macroexp.el (macroexp-accumulate): Rename arg to var+list.
* emacs-lisp/bytecomp.el (byte-compile-nogroup-warn):
Don't warn when name is not constant
or for defining the group `emacs'.
* tooltip.el (gud-tooltip-mode): Add defvar.
* startup.el (default-frame-background-mode): Add defvar.
* smerge-mode.el (smerge-mode): Add duplicate defvar near top.
* info.el (tool-bar-map): Add defvar.
* dired.el (dnd-protocol-alist): Add defvar.
* dired-aux.el (dired-query): Display question with answer, when
the user answers.
* custom.el (custom-add-option): Doc fix.
* bookmark.el (Info-current-node, Info-suffix-list): Add defvars.
2005-07-03 Eli Zaretskii <eliz@gnu.org>
* font-lock.el (font-lock-regexp-grouping-construct): Fix the
bogus name from the last change.
2005-07-02 Luc Teirlinck <teirllm@auburn.edu>
* custom.el (custom-declare-variable): Fix typos in comment.
(custom-known-themes): Doc fix.
(custom-theme-directory): New defcustom.
(require-theme): Make it check `custom-theme-directory'.
* cus-theme.el (custom-new-theme-mode): New function.
(custom-theme-name, custom-theme-variables, custom-theme-faces)
(custom-theme-description): Add compiler defvars.
(customize-create-theme): Add doc to the "*New Custom Theme*"
buffer. Use `custom-new-theme-mode'.
(custom-theme-write): Put the created buffer in emacs-lisp-mode
and save it to the `custom-theme-directory'. Make this the
default directory of the buffer.
2005-07-02 David Hunter <hunterd_42@comcast.net> (tiny change)
* progmodes/flymake.el (flymake-mode, flymake-mode-off):
Fix unbalanced parentheses.
2005-07-02 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/flymake.el (flymake-mode-on, flymake-mode-off): Move body
into flymake-mode and delegate to flymake-mode.
* find-file.el (ff-which-function-are-we-in): Clean up.
2005-07-02 Juanma Barranquero <lekktu@gmail.com>
* replace.el (occur-rename-buffer): Fix docstring.
* emulation/edt.el (*EDT-keys*, edt-default-global-map)
(edt-last-copied-word, edt-learn-macro-count)
(edt-orig-page-delimiter, edt-orig-transient-mark-mode)
(edt-rect-start-point, edt-user-global-map, rect-start-point)
(time-string, zmacs-region-stays):
* emulation/edt-mapper.el (edt-save-function-key-map)
(EDT-key-name): `defvar' to silence the byte-compiler.
2005-07-02 Martin Rudalics <rudalics@gmx.at> (tiny change)
* font-lock.el (font-lock-regexp-grouping-backslash): Rename from
font-lock-regexp-backslash. Doc fix.
(font-lock-regexp-backslash-grouping-construct): Rename from
font-lock-regexp-backslash-construct. Doc fix.
(lisp-font-lock-keywords-2): Fix highlighting of ELisp regexp
grouping constructs.
2005-07-02 Eli Zaretskii <eliz@gnu.org>
* makefile.w32-in (bootstrap): Remove the $(EMACS) binary after
updating all the prerequisites.
2005-07-01 Juanma Barranquero <lekktu@gmail.com>
* textmodes/org.el (org-agenda-start-on-weekday)
(org-calendar-to-agenda-key, org-agenda-sorting-strategy)
(org-agenda-use-time-grid, org-archive-location)
(org-allow-space-in-links, org-usenet-links-prefer-google)
(org-enable-table-editor, org-export-default-language)
(org-export-html-show-new-buffer, org-fill-paragraph)
(org-cycle, org-goto-ret, org-goto-left, org-goto-right)
(org-goto-quit, org-occur, org-eval-in-calendar)
(org-agenda-cleanup-fancy-diary, org-agenda-no-heading-message)
(org-agenda-diary-entry, org-remember-help)
(org-table-convert-region, org-at-table-p)
(org-table-move-row-down, org-table-move-row-up)
(org-table-copy-region, org-table-toggle-vline-visibility)
(org-table-get-stored-formulas, org-table-get-specials)
(org-recalc-commands, org-table-eval-formula)
(org-table-formula-substitute-names, orgtbl-make-binding)
(org-format-org-table-html, org-format-table-table-html)
(org-format-table-table-html-using-table-generate-source)
(org-customize): Fix typos in docstrings.
(org-level-2, org-at-timestamp-p, org-agenda-day-view)
(org-agenda-toggle-diary, org-agenda-toggle-time-grid)
(org-back-to-heading): Doc fixes.
(org-agenda-toggle-time-grid, org-cmp-category, org-cmp-time)
(org-agenda-change-all-lines, org-get-header):
Improve argument/docstring consistency.
(orgtbl-error): Fix error message.
* progmodes/flymake.el (flymake-find-possible-master-files)
(flymake-master-file-compare, flymake-get-line-err-count)
(flymake-highlight-line, flymake-gui-warnings-enabled):
Fix typos in docstrings.
(flymake-parse-line, flymake-get-project-include-dirs-function)
(flymake-get-prev-err-line-no, flymake-goto-prev-error):
Doc fixes.
(flymake-get-project-include-dirs-function)
(flymake-make-err-menu-data):
Improve argument/docstring consistency.
2005-07-01 Lute Kamstra <lute@gnu.org>
* battery.el (battery-linux-proc-apm): Fix typo in docstring.
Catch errors with ignore-errors. Use temporary buffer.
(battery-linux-proc-acpi): Fix typo in docstring. Document `%r'.
* facemenu.el (facemenu-unlisted-faces): Delete foreground and
background color faces.
(facemenu-set-foreground, facemenu-set-background):
Use facemenu-set-face-from-menu.
(facemenu-set-face-from-menu): Treat face names that start with
"fg:" or "bg:" as special.
(facemenu-add-new-color): Don't create faces. Simplify.
2005-06-30 Richard M. Stallman <rms@gnu.org>
* emacs-lisp/crm.el (crm-do-completion): Handle minibuffer prompt.
(crm-find-current-element): Likewise.
2005-06-30 Johan Bockg,Ae(Brd <bojohan@users.sourceforge.net>
* help-fns.el (help-do-arg-highlight): Regexp-quote argument names.
2005-06-30 Stefan Monnier <monnier@iro.umontreal.ca>
* arc-mode.el (archive-extract): Make it work as a mouse binding.
(archive-mouse-extract): Make it an obsolete alias.
(archive-mode-map): Don't use archive-mouse-extract any more.
(archive-mode, archive-extract): write-contents-hooks ->
write-contents-functions.
(archive-arc-rename-entry, archive-lzh-rename-entry): Remove unused
first arg.
(archive-rename-entry): Update the call.
(archive-zip-summarize): Remove unused var `method'.
(archive-lzh-summarize): Remove unused var `creator'.
* emacs-lisp/debug.el (debug): Quieten Drew Adams by killing the
dedicated frame upon exit.
* arc-mode.el: Bind inhibit-read-only rather than buffer-read-only.
(archive-zip-extract, archive-zip-expunge)
(archive-zip-update, archive-zip-update-case): Use executable-find.
(archive-resummarize, archive-flag-deleted, archive-unmark-all-files):
Use restore-buffer-modified-p.
(archive-extract, archive-add-new-member, archive-write-file-member):
Use with-current-buffer.
(archive-lzh-ogm, archive-zip-chmod-entry): Use dolist.
2005-06-30 Andreas Schwab <schwab@suse.de>
* progmodes/gud.el (gud-filter): Remove unneeded progn.
2005-06-30 Glenn Morris <gmorris@ast.cam.ac.uk>
* progmodes/sh-script.el (sh-get-kw): `&' also separates words.
2005-06-30 Juri Linkov <juri@jurta.org>
* faces.el (vertical-border): Inherit from mode-line-inactive
only on tty.
2005-06-30 Juanma Barranquero <lekktu@gmail.com>
* help-fns.el (help-do-arg-highlight): Highlight also -ARG (for
example, -NLINES in the `occur' docstring).
* replace.el (occur-1): When no matches are found, do not set the
`buffer-read-only' and modified flags for the occur buffer,
because it is deleted.
* emulation/cua-base.el (cua-check-pending-input)
(cua-repeat-replace-region, cua-mode, cua-debug)
(cua-auto-tabify-rectangles, cua-inhibit-cua-keys):
Fix typos in docstrings.
* emulation/cua-gmrk.el (cua-toggle-global-mark)
(cua-cut-region-to-global-mark)
(cua--cut-rectangle-to-global-mark):
Remove period from end of messages.
* emulation/cua-rect.el (cua-do-rectangle-padding):
Remove period from end of messages.
(cua--rectangle-seq-format): Fix typo in docstring.
(cua-sequence-rectangle, cua-fill-char-rectangle):
Improve argument/docstring consistency.
2005-06-29 Juri Linkov <juri@jurta.org>
* faces.el (default-frame-background-mode): New internal variable.
(frame-set-background-mode): Use it.
* startup.el (normal-top-level): Set default-frame-background-mode
instead of frame-background-mode. Before setting it, test for its
nil value. Remove tests for frame-background-mode and frame
parameter `reverse'. Add test for "unspecified-fg".
* term/xterm.el (xterm-rxvt-set-background-mode):
* term/rxvt.el (rxvt-set-background-mode):
Set default-frame-background-mode instead of frame-background-mode.
2005-06-29 Juanma Barranquero <lekktu@gmail.com>
* simple.el (set-variable): Warn about obsolete user variables.
* imenu.el (imenu--completion-buffer):
* mouse.el (mouse-buffer-menu-alist):
* msb.el (msb-invisible-buffer-p):
* calendar/diary-lib.el (diary-header-line-format):
* emacs-lisp/pp.el (pp-buffer):
* progmodes/cperl-mode.el (cperl-do-auto-fill):
* textmodes/picture.el (picture-replace-match):
Change space constants followed by a sexp to "?\s ".
* play/decipher.el (decipher-loop-with-breaks):
* textmodes/texinfo.el (texinfo-insert-@item): Change space
constants "protected" from end of line by a comment to "?\s".
2005-06-29 Stefan Monnier <monnier@iro.umontreal.ca>
* font-lock.el (save-buffer-state): Use `declare'.
* progmodes/cperl-mode.el (cperl-find-pods-heres): Don't gratuitously
reset the syntax-table to cperl-mode-syntax-table.
(cperl-mode): Make _ into word-syntax during font-locking so "print" in
"foo_print_bar" is not matched as a reserved keyword.
2005-06-29 Carsten Dominik <dominik@science.uva.nl>
* textmodes/org.el (orgtbl-setup): New function, for delayed
setup for the orgtbl commands.
(org-calc-default-modes): New option.
(orgtbl-make-binding): Use `defun' to get better help display.
(org-diary): Call `org-compile-prefix-format'.
(org-table-formula-substitute-names): New function.
(org-agenda-day-view, org-agenda-week-view): New commands.
(org-agenda-toggle-week-view): Command removed.
(org-tbl-menu): Split off from org-org-menu.
(org-mode): Move removal of outline-mode menus to here.
(org-table-formula-debug): New option.
(org-table-insert-row): Keep first field if just "#" or "*".
(org-mode): Paragraph regexps fixed.
(org-table-recalculate-regexp): New constant.
(org-table-justify-field-maybe): Avoid replace if not necessary.
(org-copy-special, org-cut-special): Use `call-interactively'.
(org-table-copy-region): Take region from `interactive' call.
(org-trim): Return string even if no match.
(org-formula): New face.
(org-set-font-lock-defaults): No longer highlight "FIXME".
But highlight formula-related fields in table.
(org-table-p): Use regexp, not fontification.
(org-table-align): Handle white space at end of line.
(org-table-formula-evaluate-inline): New option.
(org-mode): Auto-wrapping in comment lines turned off.
(org-table-copy-down): Evaluate only in copied field, not in
destination.
(org-table-current-formula): Variable removed.
(org-table-store-formulas, org-table-get-stored-formulas)
(org-table-modify-formulas, org-table-replace-in-formulas)
(org-table-maybe-eval-formula): New functions.
(org-table-get-formula): Modify to use stored formulas.
(org-table-insert-column, org-table-delete-column)
(org-table-move-column): Call `org-table-modify-formulas'.
(org-complete): Add completion for keyword formulas.
(orgtbl-mode): Pull orgtbl-mode-map to start of
minor-mode-map-alist.
2005-06-29 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/python.el (python-check): Require `compile' before
modifying its variables.
* newcomment.el (comment-indent-default): Don't get fooled by an early
end of buffer.
2005-06-28 Vinicius Jose Latorre <viniciusjl@ig.com.br>
* ps-print.el (ps-print-version): Fix version number.
2005-06-28 Luc Teirlinck <teirllm@auburn.edu>
* textmodes/ispell.el (ispell-word): Remove stray parenthesis.
2005-06-28 Richard M. Stallman <rms@gnu.org>
* textmodes/flyspell.el (flyspell-use-local-map): Variable deleted.
(flyspell-local-mouse-map): Declaration deleted.
(flyspell-mouse-map): Bind only mouse-2.
(flyspell-mode-map): Don't test flyspell-use-local-map.
(flyspell-overlay-keymap-property-name): Var deleted.
(flyspell-mode-on): Don't make local bindings for
flyspell-mouse-map and flyspell-mode-map.
(make-flyspell-overlay): Unconditionally put on `keymap' text prop.
* textmodes/ispell.el (ispell-word): Do not ignore short words.
* progmodes/compile.el (compilation-next-error-function):
Don't switch buffers; operate on the current buffer.
* facemenu.el (facemenu-add-face): Warn when font-lock is active.
* comint.el (comint-password-prompt-regexp): Accept ", try again".
* bindings.el (global-map): Bind insertchar and its variants.
2005-06-27 Richard M. Stallman <rms@gnu.org>
* textmodes/artist.el (artist-text-overwrite)
(artist-figlet-get-extra-args, artist-text-see-thru): Use read-string.
2005-06-27 Vinicius Jose Latorre <viniciusjl@ig.com.br>
* ps-print.el: It was not working the page selection for printing.
Reported by Sebastian Tennant <sebyte@smolny.plus.com>.
(ps-print-version): New version 6.6.7.
(ps-end-sheet): New fun.
(ps-header-sheet, ps-end-job): Call it.
2005-06-27 Luc Teirlinck <teirllm@auburn.edu>
* subr.el (add-to-list, add-to-ordered-list): Doc fixes.
2005-06-27 Lute Kamstra <lute@gnu.org>
* facemenu.el (facemenu-unlisted-faces): Add foreground and
background color faces.
(facemenu-get-face): Delete function.
(facemenu-set-face-from-menu): Don't call facemenu-get-face.
(facemenu-add-new-color): Make second argument mandatory.
Create the approprate face and return it. Simplify.
(facemenu-set-foreground, facemenu-set-background): Don't check if
color is defined. Use return value of facemenu-add-new-color.
2005-06-26 Nick Roberts <nickrob@snap.net.nz>
* progmodes/gud.el (gud-filter): Add missing argument to
with-selected-window.
2005-06-26 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/easy-mmode.el (define-minor-mode): Don't automatically add
a :require to the defcustom.
* emacs-lisp/autoload.el (make-autoload): Add the :setter for
defcustoms corresponding to minor modes.
2005-06-26 David Ponce <david@dponce.com>
* recentf.el: Require tree-widget instead of wid-edit.
(recentf-filename-handler): Fix widget :type.
(recentf-cancel-dialog, recentf-open-more-files)
(recentf-open-files-action): Doc fix.
(recentf-dialog-goto-first): New function.
(recentf-dialog-mode-map): Set parent keymap first.
(recentf-dialog-mode): Define with define-derived-mode.
Don't display continuation lines in dialogs.
(recentf-edit-list): Rename from recentf-edit-selected-items.
(recentf-edit-list-select): Rename from recentf-edit-list-action.
Simplify.
(recentf-edit-list-validate): New function.
(recentf-edit-list): Update accordingly.
(recentf-open-files-item-shift): Remove.
(recentf-open-files-item): Convert menu elements into tree and
link widgets. Don't create the widgets.
(recentf-open-files): Update accordingly.
(recentf-save-list): Untabify.
2005-06-25 Luc Teirlinck <teirllm@auburn.edu>
* replace.el (keep-lines-read-args): Add INTERACTIVE arg.
(keep-lines): Add INTERACTIVE arg. Never delete lines only
partially contained in the active region. Do not take active
region into account when called from Lisp, unless INTERACTIVE arg
is non-nil. Use `forward-line' instead of `beginning-of-line' to
avoid trouble with fields. Make marker point nowhere when no
longer used. Always return nil. Doc fix.
(flush-lines): Add INTERACTIVE arg. Do not take active region
into account when called from Lisp, unless INTERACTIVE arg is
non-nil. Use `forward-line' instead of `beginning-of-line' to
avoid trouble with fields. Make marker point nowhere when no
longer used. Always return nil. Doc fix.
(how-many): Add INTERACTIVE arg. Make RSTART and REND args
interchangeable. Do not take active region into account when
called from Lisp, unless INTERACTIVE arg is non-nil. Do not print
message in echo area when called from Lisp, unless INTERACTIVE arg
is non-nil. Avoid saying "1 occurrences". Do not use markers.
Return the number of matches. Doc fix.
(occur): Doc fix.
(perform-replace): Make comment follow double space convention for
the sake of `outline-minor-mode'.
* faces.el (facep): Doc fix.
2005-06-25 Richard M. Stallman <rms@gnu.org>
@ -54,7 +690,7 @@
(line-move-1): When there are overlays around, use vertical-motion.
* faces.el (escape-glyph): Use brown against light background.
(nobreak-space): Renamed from no-break-space.
(nobreak-space): Rename from no-break-space.
Fix previous change.
* dired-aux.el (dired-do-copy): Fix arg prompt.
@ -108,7 +744,7 @@
* bindings.el (propertized-buffer-identification): Use renamed
`Buffer-menu-buffer' face.
* faces.el (vertical-border): Renamed from `vertical-divider'.
* faces.el (vertical-border): Rename from `vertical-divider'.
(escape-glyph): Change dark-background color back to `cyan'.
2005-06-21 Juri Linkov <juri@jurta.org>
@ -194,8 +830,7 @@
2005-06-18 Peter Kleiweg <p.c.j.kleiweg@rug.nl>
* progmodes/ps-mode.el: Update version and maintainer's email
address.
* progmodes/ps-mode.el: Update version and maintainer's email address.
2005-06-18 Steve Youngs <steve@xemacs.org>
@ -283,8 +918,8 @@
New backward-compatibility aliases for renamed faces.
(eshell-ls-decorated-name): Use renamed eshell-ls faces.
* progmodes/cc-fonts.el (c-nonbreakable-space-face): Remove
"-face" suffix from face name.
* progmodes/cc-fonts.el (c-nonbreakable-space-face):
Remove "-face" suffix from face name.
(c-cpp-matchers): Use the variable `c-nonbreakable-space-face'
instead of literal face.
@ -412,8 +1047,8 @@
ido-incomplete-regexp.
(ido-incomplete-regexp): New face.
(ido-completions): Use it.
(ido-complete, ido-exit-minibuffer, ido-completions): Handle
incomplete regexps.
(ido-complete, ido-exit-minibuffer, ido-completions):
Handle incomplete regexps.
(ido-completions): Add check for complete match when entering a regexp.
2005-06-15 Stefan Monnier <monnier@iro.umontreal.ca>
@ -442,6 +1077,11 @@
* progmodes/cperl-mode.el (cperl-init-faces): Use literal cperl
faces instead of (non-existent) variables.
2005-06-14 Stefan Monnier <monnier@iro.umontreal.ca>
* iswitchb.el (iswitchb-to-end): Replace mapcar with dolist.
(iswitchb-get-matched-buffers): Likewise. Simplify.
2005-06-14 Miles Bader <miles@gnu.org>
* progmodes/ld-script.el (ld-script-location-counter):

8
lisp/add-log.el
View File

@ -33,7 +33,7 @@
(require 'timezone))
(defgroup change-log nil
"Change log maintenance"
"Change log maintenance."
:group 'tools
:link '(custom-manual "(emacs)Change Log")
:prefix "change-log-"
@ -607,13 +607,13 @@ non-nil, otherwise in local time."
(beginning-of-line 1)
(looking-at "\\s *\\(\\*\\s *\\)?$"))
(insert ": ")
(if version (insert version ?\ )))
(if version (insert version ?\s)))
;; Make it easy to get rid of the function name.
(undo-boundary)
(unless (save-excursion
(beginning-of-line 1)
(looking-at "\\s *$"))
(insert ?\ ))
(insert ?\s))
;; See if the prev function name has a message yet or not.
;; If not, merge the two items.
(let ((pos (point-marker)))
@ -633,7 +633,7 @@ non-nil, otherwise in local time."
(insert "("))
(set-marker pos nil))
(insert defun "): ")
(if version (insert version ?\ )))))
(if version (insert version ?\s)))))
;;;###autoload
(defun add-change-log-entry-other-window (&optional whoami file-name)

2
lisp/apropos.el
View File

@ -61,7 +61,7 @@
(eval-when-compile (require 'cl))
(defgroup apropos nil
"Apropos commands for users and programmers"
"Apropos commands for users and programmers."
:group 'help
:prefix "apropos")

206
lisp/arc-mode.el
View File

@ -131,7 +131,7 @@
(make-temp-name
(expand-file-name (if (eq system-type 'ms-dos) "ar" "archive.tmp")
temporary-file-directory))
"*Directory for temporary files made by arc-mode.el"
"Directory for temporary files made by arc-mode.el."
:type 'directory
:group 'archive)
@ -218,11 +218,10 @@ Archive and member name will be added."
;; Zip archive configuration
(defcustom archive-zip-extract
(if (locate-file "unzip" nil 'file-executable-p)
'("unzip" "-qq" "-c")
(if (locate-file "pkunzip" nil 'file-executable-p)
'("pkunzip" "-e" "-o-")
'("unzip" "-qq" "-c")))
(if (and (not (executable-find "unzip"))
(executable-find "pkunzip"))
'("pkunzip" "-e" "-o-")
'("unzip" "-qq" "-c"))
"*Program and its options to run in order to extract a zip file member.
Extraction should happen to standard output. Archive and member name will
be added. If `archive-zip-use-pkzip' is non-nil then this program is
@ -239,11 +238,10 @@ expected to extract to a file junking the directory part of the name."
;; names.
(defcustom archive-zip-expunge
(if (locate-file "zip" nil 'file-executable-p)
'("zip" "-d" "-q")
(if (locate-file "pkzip" nil 'file-executable-p)
'("pkzip" "-d")
'("zip" "-d" "-q")))
(if (and (not (executable-find "zip"))
(executable-find "pkzip"))
'("pkzip" "-d")
'("zip" "-d" "-q"))
"*Program and its options to run in order to delete zip file members.
Archive and member names will be added."
:type '(list (string :tag "Program")
@ -253,11 +251,10 @@ Archive and member names will be added."
:group 'archive-zip)
(defcustom archive-zip-update
(if (locate-file "zip" nil 'file-executable-p)
'("zip" "-q")
(if (locate-file "pkzip" nil 'file-executable-p)
'("pkzip" "-u" "-P")
'("zip" "-q")))
(if (and (not (executable-find "zip"))
(executable-find "pkzip"))
'("pkzip" "-u" "-P")
'("zip" "-q"))
"*Program and its options to run in order to update a zip file member.
Options should ensure that specified directory will be put into the zip
file. Archive and member name will be added."
@ -268,11 +265,10 @@ file. Archive and member name will be added."
:group 'archive-zip)
(defcustom archive-zip-update-case
(if (locate-file "zip" nil 'file-executable-p)
'("zip" "-q" "-k")
(if (locate-file "pkzip" nil 'file-executable-p)
'("pkzip" "-u" "-P")
'("zip" "-q" "-k")))
(if (and (not (executable-find "zip"))
(executable-find "pkzip"))
'("pkzip" "-u" "-P")
'("zip" "-q" "-k"))
"*Program and its options to run in order to update a case fiddled zip member.
Options should ensure that specified directory will be put into the zip file.
Archive and member name will be added."
@ -371,7 +367,7 @@ Archive and member name will be added."
(substitute-key-definition 'undo 'archive-undo map global-map))
(define-key map
(if (featurep 'xemacs) 'button2 [mouse-2]) 'archive-mouse-extract)
(if (featurep 'xemacs) 'button2 [mouse-2]) 'archive-extract)
(if (featurep 'xemacs)
() ; out of luck
@ -637,8 +633,7 @@ archive.
;; Remote archives are not written by a hook.
(if archive-remote nil
(make-local-variable 'write-contents-hooks)
(add-hook 'write-contents-hooks 'archive-write-file))
(add-hook 'write-contents-functions 'archive-write-file nil t))
(make-local-variable 'require-final-newline)
(setq require-final-newline nil)
@ -715,7 +710,7 @@ Optional argument SHUT-UP, if non-nil, means don't print messages
when parsing the archive."
(widen)
(set-buffer-multibyte nil)
(let (buffer-read-only)
(let ((inhibit-read-only t))
(or shut-up
(message "Parsing archive file..."))
(buffer-disable-undo (current-buffer))
@ -733,11 +728,11 @@ when parsing the archive."
"Recreate the contents listing of an archive."
(let ((modified (buffer-modified-p))
(no (archive-get-lineno))
buffer-read-only)
(inhibit-read-only t))
(widen)
(delete-region (point-min) archive-proper-file-start)
(archive-summarize t)
(set-buffer-modified-p modified)
(restore-buffer-modified-p modified)
(goto-char archive-file-list-start)
(archive-next-line no)))
@ -751,19 +746,18 @@ when parsing the archive."
(apply
(function concat)
(mapcar
(function
(lambda (fil)
;; Using `concat' here copies the text also, so we can add
;; properties without problems.
(let ((text (concat (aref fil 0) "\n")))
(if (featurep 'xemacs)
() ; out of luck
(add-text-properties
(aref fil 1) (aref fil 2)
'(mouse-face highlight
help-echo "mouse-2: extract this file into a buffer")
text))
text)))
(lambda (fil)
;; Using `concat' here copies the text also, so we can add
;; properties without problems.
(let ((text (concat (aref fil 0) "\n")))
(if (featurep 'xemacs)
() ; out of luck
(add-text-properties
(aref fil 1) (aref fil 2)
'(mouse-face highlight
help-echo "mouse-2: extract this file into a buffer")
text))
text))
files)))
(setq archive-file-list-end (point-marker)))
@ -832,7 +826,7 @@ using `make-temp-file', and the generated name is returned."
(modified (buffer-modified-p))
(coding-system-for-read 'no-conversion)
(lno (archive-get-lineno))
buffer-read-only)
(inhibit-read-only t))
(if unchanged nil
(setq archive-files nil)
(erase-buffer)
@ -898,18 +892,12 @@ using `make-temp-file', and the generated name is returned."
(kill-local-variable 'buffer-file-coding-system)
(after-insert-file-set-coding (- (point-max) (point-min))))))
(defun archive-mouse-extract (event)
"Extract a file whose name you click on."
(interactive "e")
(mouse-set-point event)
(switch-to-buffer
(save-excursion
(archive-extract)
(current-buffer))))
(define-obsolete-function-alias 'archive-mouse-extract 'archive-extract "22.1")
(defun archive-extract (&optional other-window-p)
(defun archive-extract (&optional other-window-p event)
"In archive mode, extract this entry of the archive into its own buffer."
(interactive)
(interactive (list nil last-input-event))
(if event (mouse-set-point event))
(let* ((view-p (eq other-window-p 'view))
(descr (archive-get-descr))
(ename (aref descr 0))
@ -932,8 +920,7 @@ using `make-temp-file', and the generated name is returned."
(setq archive (archive-maybe-copy archive))
(setq buffer (get-buffer-create bufname))
(setq just-created t)
(save-excursion
(set-buffer buffer)
(with-current-buffer buffer
(setq buffer-file-name
(expand-file-name (concat arcname ":" iname)))
(setq buffer-file-truename
@ -942,8 +929,7 @@ using `make-temp-file', and the generated name is returned."
(setq default-directory arcdir)
(make-local-variable 'archive-superior-buffer)
(setq archive-superior-buffer archive-buffer)
(make-local-variable 'local-write-file-hooks)
(add-hook 'local-write-file-hooks 'archive-write-file-member)
(add-hook 'write-file-functions 'archive-write-file-member nil t)
(setq archive-subfile-mode descr)
(if (and
(null
@ -977,26 +963,22 @@ using `make-temp-file', and the generated name is returned."
(setq buffer-saved-size (buffer-size))
(normal-mode)
;; Just in case an archive occurs inside another archive.
(if (eq major-mode 'archive-mode)
(progn
(setq archive-remote t)
(if read-only-p (setq archive-read-only t))
;; We will write out the archive ourselves if it is
;; part of another archive.
(remove-hook 'write-contents-hooks 'archive-write-file t)))
(run-hooks 'archive-extract-hooks)
(when (derived-mode-p 'archive-mode)
(setq archive-remote t)
(if read-only-p (setq archive-read-only t))
;; We will write out the archive ourselves if it is
;; part of another archive.
(remove-hook 'write-contents-functions 'archive-write-file t))
(run-hooks 'archive-extract-hooks)
(if archive-read-only
(message "Note: altering this archive is not implemented."))))
(archive-maybe-update t))
(or (not (buffer-name buffer))
(progn
(if view-p
(view-buffer buffer (and just-created 'kill-buffer))
(if (eq other-window-p 'display)
(display-buffer buffer)
(if other-window-p
(switch-to-buffer-other-window buffer)
(switch-to-buffer buffer))))))))
(cond
(view-p (view-buffer buffer (and just-created 'kill-buffer)))
((eq other-window-p 'display) (display-buffer buffer))
(other-window-p (switch-to-buffer-other-window buffer))
(t (switch-to-buffer buffer))))))
(defun archive-*-extract (archive name command)
(let* ((default-directory (file-name-as-directory archive-tmpdir))
@ -1056,11 +1038,10 @@ using `make-temp-file', and the generated name is returned."
(read-buffer "Buffer containing archive: "
;; Find first archive buffer and suggest that
(let ((bufs (buffer-list)))
(while (and bufs (not (eq (save-excursion
(set-buffer (car bufs))
major-mode)
'archive-mode)))
(setq bufs (cdr bufs)))
(while (and bufs
(not (with-current-buffer (car bufs)
(derived-mode-p 'archive-mode))))
(setq bufs (cdr bufs)))
(if bufs
(car bufs)
(error "There are no archive buffers")))
@ -1069,8 +1050,7 @@ using `make-temp-file', and the generated name is returned."
(if buffer-file-name
(file-name-nondirectory buffer-file-name)
""))))
(save-excursion
(set-buffer arcbuf)
(with-current-buffer arcbuf
(or (eq major-mode 'archive-mode)
(error "Buffer is not an archive buffer"))
(if archive-read-only
@ -1079,12 +1059,11 @@ using `make-temp-file', and the generated name is returned."
(error "An archive buffer cannot be added to itself"))
(if (string= name "")
(error "Archive members may not be given empty names"))
(let ((func (save-excursion (set-buffer arcbuf)
(archive-name "add-new-member")))
(let ((func (with-current-buffer arcbuf
(archive-name "add-new-member")))
(membuf (current-buffer)))
(if (fboundp func)
(save-excursion
(set-buffer arcbuf)
(with-current-buffer arcbuf
(funcall func buffer-file-name membuf name))
(error "Adding a new member is not supported for this archive type"))))
;; -------------------------------------------------------------------------
@ -1095,10 +1074,10 @@ using `make-temp-file', and the generated name is returned."
(save-restriction
(message "Updating archive...")
(widen)
(let ((writer (save-excursion (set-buffer archive-superior-buffer)
(archive-name "write-file-member")))
(archive (save-excursion (set-buffer archive-superior-buffer)
(archive-maybe-copy (buffer-file-name)))))
(let ((writer (with-current-buffer archive-superior-buffer
(archive-name "write-file-member")))
(archive (with-current-buffer archive-superior-buffer
(archive-maybe-copy (buffer-file-name)))))
(if (fboundp writer)
(funcall writer archive archive-subfile-mode)
(archive-*-write-file-member archive
@ -1167,7 +1146,7 @@ With a prefix argument, mark that many files."
(beginning-of-line)
(let ((sign (if (>= p 0) +1 -1))
(modified (buffer-modified-p))
buffer-read-only)
(inhibit-read-only t))
(while (not (zerop p))
(if (archive-get-descr t)
(progn
@ -1175,7 +1154,7 @@ With a prefix argument, mark that many files."
(insert type)))
(forward-line sign)
(setq p (- p sign)))
(set-buffer-modified-p modified))
(restore-buffer-modified-p modified))
(archive-next-line 0))
(defun archive-unflag (p)
@ -1194,14 +1173,14 @@ With a prefix argument, un-mark that many members backward."
"Remove all marks."
(interactive)
(let ((modified (buffer-modified-p))
buffer-read-only)
(inhibit-read-only t))
(save-excursion
(goto-char archive-file-list-start)
(while (< (point) archive-file-list-end)
(or (= (following-char) ? )
(progn (delete-char 1) (insert ? )))
(forward-line 1)))
(set-buffer-modified-p modified)))
(restore-buffer-modified-p modified)))
(defun archive-mark (p)
"In archive mode, mark this member for group operations.
@ -1306,7 +1285,7 @@ as a relative change like \"g+rw\" as for chmod(2)"
(append (cdr command) (cons archive files))))
(defun archive-rename-entry (newname)
"Change the name associated with this entry in the tar file."
"Change the name associated with this entry in the archive file."
(interactive "sNew name: ")
(if archive-read-only (error "Archive is read-only"))
(if (string= newname "")
@ -1315,7 +1294,7 @@ as a relative change like \"g+rw\" as for chmod(2)"
(descr (archive-get-descr)))
(if (fboundp func)
(progn
(funcall func (buffer-file-name)
(funcall func
(if enable-multibyte-characters
(encode-coding-string newname file-name-coding-system)
newname)
@ -1339,7 +1318,7 @@ as a relative change like \"g+rw\" as for chmod(2)"
"Undo in an archive buffer.
This doesn't recover lost files, it just undoes changes in the buffer itself."
(interactive)
(let (buffer-read-only)
(let ((inhibit-read-only t))
(undo)))
;; -------------------------------------------------------------------------
;; Section: Arc Archives
@ -1391,14 +1370,14 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
"\n"))
(apply 'vector (nreverse files))))
(defun archive-arc-rename-entry (archive newname descr)
(defun archive-arc-rename-entry (newname descr)
(if (string-match "[:\\\\/]" newname)
(error "File names in arc files must not contain a directory component"))
(if (> (length newname) 12)
(error "File names in arc files are limited to 12 characters"))
(let ((name (concat newname (substring "\0\0\0\0\0\0\0\0\0\0\0\0\0"
(length newname))))
buffer-read-only)
(inhibit-read-only t))
(save-restriction
(save-excursion
(widen)
@ -1425,7 +1404,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
(time2 (archive-l-e (+ p 17) 2)) ;and UNIX format in level 2 header.)
(hdrlvl (char-after (+ p 20))) ;header level
thsize ;total header size (base + extensions)
fnlen efnname fiddle ifnname width p2 creator
fnlen efnname fiddle ifnname width p2
neh ;beginning of next extension header (level 1 and 2)
mode modestr uid gid text dir prname
gname uname modtime moddate)
@ -1438,13 +1417,9 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
(string-as-multibyte str))))
(setq p2 (+ p 22 fnlen))) ;
(if (= hdrlvl 1)
(progn ;specific to level 1 header
(setq creator (if (>= (- hsize fnlen) 24) (char-after (+ p2 2)) 0))
(setq neh (+ p2 3)))
(setq neh (+ p2 3)) ;specific to level 1 header
(if (= hdrlvl 2)
(progn ;specific to level 2 header
(setq creator (char-after (+ p 23)) )
(setq neh (+ p 24)))))
(setq neh (+ p 24)))) ;specific to level 2 header
(if neh ;if level 1 or 2 we expect extension headers to follow
(let* ((ehsize (archive-l-e neh 2)) ;size of the extension header
(etype (char-after (+ neh 2)))) ;extension type
@ -1560,7 +1535,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
p (1+ p)))
(logand sum 255)))
(defun archive-lzh-rename-entry (archive newname descr)
(defun archive-lzh-rename-entry (newname descr)
(save-restriction
(save-excursion
(widen)
@ -1570,7 +1545,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
(oldfnlen (char-after (+ p 21)))
(newfnlen (length newname))
(newhsize (+ oldhsize newfnlen (- oldfnlen)))
buffer-read-only)
(inhibit-read-only t))
(if (> newhsize 255)
(error "The file name is too long"))
(goto-char (+ p 21))
@ -1585,14 +1560,13 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
(save-excursion
(widen)
(set-buffer-multibyte nil)
(while files
(let* ((fil (car files))
(p (+ archive-proper-file-start (aref fil 4)))
(dolist (fil files)
(let* ((p (+ archive-proper-file-start (aref fil 4)))
(hsize (char-after p))
(fnlen (char-after (+ p 21)))
(p2 (+ p 22 fnlen))
(creator (if (>= (- hsize fnlen) 24) (char-after (+ p2 2)) 0))
buffer-read-only)
(inhibit-read-only t))
(if (= creator ?U)
(progn
(or (numberp newval)
@ -1604,8 +1578,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
(delete-char 1)
(insert (archive-lzh-resum (1+ p) hsize)))
(message "Member %s does not have %s field"
(aref fil 1) errtxt)))
(setq files (cdr files))))))
(aref fil 1) errtxt)))))))
(defun archive-lzh-chown-entry (newuid files)
(archive-lzh-ogm newuid files "an uid" 10))
@ -1616,7 +1589,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
(defun archive-lzh-chmod-entry (newmode files)
(archive-lzh-ogm
;; This should work even though newmode will be dynamically accessed.
(function (lambda (old) (archive-calc-mode old newmode t)))
(lambda (old) (archive-calc-mode old newmode t))
files "a unix-style mode" 8))
;; -------------------------------------------------------------------------
;; Section: Zip Archives
@ -1631,7 +1604,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
visual)
(while (string= "PK\001\002" (buffer-substring p (+ p 4)))
(let* ((creator (char-after (+ p 5)))
(method (archive-l-e (+ p 10) 2))
;; (method (archive-l-e (+ p 10) 2))
(modtime (archive-l-e (+ p 12) 2))
(moddate (archive-l-e (+ p 14) 2))
(ucsize (archive-l-e (+ p 24) 4))
@ -1709,13 +1682,12 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
(save-excursion
(widen)
(set-buffer-multibyte nil)
(while files
(let* ((fil (car files))
(p (+ archive-proper-file-start (car (aref fil 4))))
(dolist (fil files)
(let* ((p (+ archive-proper-file-start (car (aref fil 4))))
(creator (char-after (+ p 5)))
(oldmode (aref fil 3))
(newval (archive-calc-mode oldmode newmode t))
buffer-read-only)
(inhibit-read-only t))
(cond ((memq creator '(2 3)) ; Unix + VMS
(goto-char (+ p 40))
(delete-char 2)
@ -1726,7 +1698,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
(logand (logxor 1 (lsh newval -7)) 1)))
(delete-char 1))
(t (message "Don't know how to change mode for this member"))))
(setq files (cdr files))))))
))))
;; -------------------------------------------------------------------------
;; Section: Zoo Archives

81
lisp/battery.el
View File

@ -171,53 +171,49 @@ The following %-sequences are provided:
%B Battery status (verbose)
%b Battery status, empty means high, `-' means low,
`!' means critical, and `+' means charging
%p battery load percentage
%p Battery load percentage
%s Remaining time in seconds
%m Remaining time in minutes
%h Remaining time in hours
%t Remaining time in the form `h:min'"
(let (driver-version bios-version bios-interface line-status
battery-status battery-status-symbol load-percentage
seconds minutes hours remaining-time buffer tem)
(unwind-protect
(save-excursion
(setq buffer (get-buffer-create " *battery*"))
(set-buffer buffer)
(erase-buffer)
(insert-file-contents "/proc/apm")
(re-search-forward battery-linux-proc-apm-regexp)
(setq driver-version (match-string 1))
(setq bios-version (match-string 2))
(setq tem (string-to-number (match-string 3) 16))
(if (not (logand tem 2))
(setq bios-interface "not supported")
(setq bios-interface "enabled")
(cond ((logand tem 16) (setq bios-interface "disabled"))
((logand tem 32) (setq bios-interface "disengaged")))
(setq tem (string-to-number (match-string 4) 16))
(cond ((= tem 0) (setq line-status "off-line"))
((= tem 1) (setq line-status "on-line"))
((= tem 2) (setq line-status "on backup")))
(setq tem (string-to-number (match-string 6) 16))
(if (= tem 255)
(setq battery-status "N/A")
(setq tem (string-to-number (match-string 5) 16))
(cond ((= tem 0) (setq battery-status "high"
battery-status-symbol ""))
((= tem 1) (setq battery-status "low"
battery-status-symbol "-"))
((= tem 2) (setq battery-status "critical"
battery-status-symbol "!"))
((= tem 3) (setq battery-status "charging"
battery-status-symbol "+")))
(setq load-percentage (match-string 7))
(setq seconds (string-to-number (match-string 8)))
(and (string-equal (match-string 9) "min")
(setq seconds (* 60 seconds)))
(setq minutes (/ seconds 60)
hours (/ seconds 3600))
(setq remaining-time
(format "%d:%02d" hours (- minutes (* 60 hours))))))))
seconds minutes hours remaining-time tem)
(with-temp-buffer
(ignore-errors (insert-file-contents "/proc/apm"))
(when (re-search-forward battery-linux-proc-apm-regexp)
(setq driver-version (match-string 1))
(setq bios-version (match-string 2))
(setq tem (string-to-number (match-string 3) 16))
(if (not (logand tem 2))
(setq bios-interface "not supported")
(setq bios-interface "enabled")
(cond ((logand tem 16) (setq bios-interface "disabled"))
((logand tem 32) (setq bios-interface "disengaged")))
(setq tem (string-to-number (match-string 4) 16))
(cond ((= tem 0) (setq line-status "off-line"))
((= tem 1) (setq line-status "on-line"))
((= tem 2) (setq line-status "on backup")))
(setq tem (string-to-number (match-string 6) 16))
(if (= tem 255)
(setq battery-status "N/A")
(setq tem (string-to-number (match-string 5) 16))
(cond ((= tem 0) (setq battery-status "high"
battery-status-symbol ""))
((= tem 1) (setq battery-status "low"
battery-status-symbol "-"))
((= tem 2) (setq battery-status "critical"
battery-status-symbol "!"))
((= tem 3) (setq battery-status "charging"
battery-status-symbol "+")))
(setq load-percentage (match-string 7))
(setq seconds (string-to-number (match-string 8)))
(and (string-equal (match-string 9) "min")
(setq seconds (* 60 seconds)))
(setq minutes (/ seconds 60)
hours (/ seconds 3600))
(setq remaining-time
(format "%d:%02d" hours (- minutes (* 60 hours))))))))
(list (cons ?v (or driver-version "N/A"))
(cons ?V (or bios-version "N/A"))
(cons ?I (or bios-interface "N/A"))
@ -240,12 +236,13 @@ in Linux version 2.4.20 and 2.6.0.
The following %-sequences are provided:
%c Current capacity (mAh)
%r Current rate
%B Battery status (verbose)
%b Battery status, empty means high, `-' means low,
`!' means critical, and `+' means charging
%d Temperature (in degrees Celsius)
%L AC line status (verbose)
%p battery load percentage
%p Battery load percentage
%m Remaining time in minutes
%h Remaining time in hours
%t Remaining time in the form `h:min'"

6
lisp/bindings.el
View File

@ -781,6 +781,11 @@ language you are using."
(define-key global-map [insert] 'overwrite-mode)
(define-key global-map [C-insert] 'kill-ring-save)
(define-key global-map [S-insert] 'yank)
;; `insertchar' is what term.c produces. Should we change term.c
;; to produce `insert' instead?
(define-key global-map [insertchar] 'overwrite-mode)
(define-key global-map [C-insertchar] 'kill-ring-save)
(define-key global-map [S-insertchar] 'yank)
(define-key global-map [undo] 'undo)
(define-key global-map [redo] 'repeat-complex-command)
(define-key global-map [again] 'repeat-complex-command) ; Sun keyboard
@ -791,7 +796,6 @@ language you are using."
;; (define-key global-map [clearline] 'function-key-error)
(define-key global-map [insertline] 'open-line)
(define-key global-map [deleteline] 'kill-line)
;; (define-key global-map [insertchar] 'function-key-error)
(define-key global-map [deletechar] 'delete-char)
;; (define-key global-map [backtab] 'function-key-error)
;; (define-key global-map [f1] 'function-key-error)

3
lisp/bookmark.el
View File

@ -309,7 +309,8 @@ through a file easier.")
(defvar bookmark-yank-point 0)
(defvar bookmark-current-buffer nil)
(defvar Info-current-node)
(defvar Info-suffix-list)
;; Helper functions.

8
lisp/calc/calc.el
View File

@ -207,7 +207,7 @@
(require 'calc-macs)
(defgroup calc nil
"GNU Calc"
"GNU Calc."
:prefix "calc-"
:tag "Calc"
:group 'applications)
@ -3026,10 +3026,10 @@ See calc-keypad for details."
(setq w (cdr off)
off (car off))
(when (> off 0)
(setq c (math-comp-concat (make-string off ? ) c)))
(setq c (math-comp-concat (make-string off ?\s) c)))
(or (equal calc-left-label "")
(setq c (math-comp-concat (if (eq a 'top-of-stack)
(make-string (length calc-left-label) ? )
(make-string (length calc-left-label) ?\s)
calc-left-label)
c)))
(when calc-line-numbering
@ -3044,7 +3044,7 @@ See calc-keypad for details."
(require 'calc-ext)
(setq c (list 'horiz c
(make-string (max (- w (math-comp-width c)
(length calc-right-label)) 0) ? )
(length calc-right-label)) 0) ?\s)
'(break -1)
calc-right-label)))
(setq s (if (stringp c)

2
lisp/calendar/diary-lib.el
View File

@ -290,7 +290,7 @@ The format of the header is specified by `diary-header-line-format'."
"Selective display active - press \"s\" in calendar \
before edit/copy"
"Diary"))
?\ (frame-width)))
?\s (frame-width)))
"*Format of the header line displayed by `simple-diary-display'.
Only used if `diary-header-line-flag' is non-nil."
:group 'diary

12
lisp/comint.el
View File

@ -146,11 +146,11 @@
:group 'processes)
(defgroup comint-completion nil
"Completion facilities in comint"
"Completion facilities in comint."
:group 'comint)
(defgroup comint-source nil
"Source finding facilities in comint"
"Source finding facilities in comint."
:prefix "comint-"
:group 'comint)
@ -338,8 +338,8 @@ This variable is buffer-local."
"\\(\\([Oo]ld \\|[Nn]ew \\|'s \\|login \\|\
Kerberos \\|CVS \\|UNIX \\| SMB \\|^\\)\
\[Pp]assword\\( (again)\\)?\\|\
pass phrase\\|\\(Enter\\|Repeat\\) passphrase\\)\
\\( for [^:]+\\)?:\\s *\\'"
pass phrase\\|\\(Enter\\|Repeat\\|Bad\\) passphrase\\)\
\\(?:, try again\\)?\\(?: for [^:]+\\)?:\\s *\\'"
"*Regexp matching prompts for passwords in the inferior process.
This is used by `comint-watch-for-password-prompt'."
:type 'regexp
@ -986,7 +986,7 @@ See also `comint-read-input-ring'."
(message "Hit space to flush")
(setq comint-dynamic-list-input-ring-window-conf conf)
(let ((ch (read-event)))
(if (eq ch ?\ )
(if (eq ch ?\s)
(set-window-configuration conf)
(setq unread-command-events (list ch)))))))
@ -2930,7 +2930,7 @@ Typing SPC flushes the help buffer."
(progn
(mouse-choose-completion first)
(set-window-configuration comint-dynamic-list-completions-config))
(unless (eq first ?\ )
(unless (eq first ?\s)
(setq unread-command-events (listify-key-sequence key)))
(unless (eq first ?\t)
(set-window-configuration comint-dynamic-list-completions-config))))))

6
lisp/cus-face.el
View File

@ -323,6 +323,10 @@ FACE's list property `theme-face' \(using `custom-push-theme')."
(spec (nth 1 entry))
(now (nth 2 entry))
(comment (nth 3 entry)))
;; If FACE is actually an alias, customize the face it
;; is aliased to.
(if (get face 'face-alias)
(setq face (get face 'face-alias)))
(put face 'saved-face spec)
(put face 'saved-face-comment comment)
(custom-push-theme 'theme-face face theme 'set spec)
@ -337,6 +341,8 @@ FACE's list property `theme-face' \(using `custom-push-theme')."
;; Old format, a plist of FACE SPEC pairs.
(let ((face (nth 0 args))
(spec (nth 1 args)))
(if (get face 'face-alias)
(setq face (get face 'face-alias)))
(put face 'saved-face spec)
(custom-push-theme 'theme-face face theme 'set spec))
(setq args (cdr (cdr args))))))))

38
lisp/cus-theme.el
View File

@ -1,6 +1,6 @@
;;; cus-theme.el -- custom theme creation user interface
;;
;; Copyright (C) 2001 Free Software Foundation, Inc.
;; Copyright (C) 2001, 2005 Free Software Foundation, Inc.
;;
;; Author: Alex Schroeder <alex@gnu.org>
;; Maintainer: FSF
@ -31,6 +31,18 @@
(eval-when-compile
(require 'wid-edit))
(define-derived-mode custom-new-theme-mode nil "New-Theme"
"Major mode for the buffer created by `customize-create-theme'.
Do not call this mode function yourself. It is only meant for internal
use by `customize-create-theme'."
(set-keymap-parent custom-new-theme-mode-map widget-keymap))
(put 'custom-new-theme-mode 'mode-class 'special)
(defvar custom-theme-name)
(defvar custom-theme-variables)
(defvar custom-theme-faces)
(defvar custom-theme-description)
;;;###autoload
(defun customize-create-theme ()
"Create a custom theme."
@ -38,15 +50,23 @@
(if (get-buffer "*New Custom Theme*")
(kill-buffer "*New Custom Theme*"))
(switch-to-buffer "*New Custom Theme*")
(kill-all-local-variables)
(let ((inhibit-read-only t))
(erase-buffer))
(custom-new-theme-mode)
(make-local-variable 'custom-theme-name)
(make-local-variable 'custom-theme-variables)
(make-local-variable 'custom-theme-faces)
(make-local-variable 'custom-theme-description)
(let ((inhibit-read-only t))
(erase-buffer))
(widget-insert "This buffer helps you write a custom theme elisp file.
This will help you share your customizations with other people.\n\n")
This will help you share your customizations with other people.
Just insert the names of all variables and faces you want the theme
to include. Then clicking mouse-2 or pressing RET on the [Done] button
will write a theme file that sets all these variables and faces to their
current global values. It will write that file into the directory given
by the variable `custom-theme-directory', usually \"~/.emacs.d/\".
To undo all your edits to the buffer, use the [Reset] button.\n\n")
(widget-insert "Theme name: ")
(setq custom-theme-name
(widget-create 'editable-field
@ -81,7 +101,6 @@ This will help you share your customizations with other people.\n\n")
(bury-buffer))
"Bury Buffer")
(widget-insert "\n")
(use-local-map widget-keymap)
(widget-setup))
(defun custom-theme-write (&rest ignore)
@ -90,6 +109,10 @@ This will help you share your customizations with other people.\n\n")
(variables (widget-value custom-theme-variables))
(faces (widget-value custom-theme-faces)))
(switch-to-buffer (concat name "-theme.el"))
(emacs-lisp-mode)
(unless (file-exists-p custom-theme-directory)
(make-directory (file-name-as-directory custom-theme-directory) t))
(setq default-directory custom-theme-directory)
(setq buffer-file-name (expand-file-name (concat name "-theme.el")))
(let ((inhibit-read-only t))
(erase-buffer))
@ -100,7 +123,8 @@ This will help you share your customizations with other people.\n\n")
(insert ")\n")
(custom-theme-write-variables name variables)
(custom-theme-write-faces name faces)
(insert "\n(provide-theme '" name ")\n")))
(insert "\n(provide-theme '" name ")\n")
(save-buffer)))
(defun custom-theme-write-variables (theme vars)
"Write a `custom-theme-set-variables' command for THEME.

30
lisp/custom.el
View File

@ -121,7 +121,7 @@ compatibility, DEFAULT is also stored in SYMBOL's property
`standard-value'. At the same time, SYMBOL's property `force-value' is
set to nil, as the value is no longer rogue."
;; Remember the standard setting. The value should be in the standard
;; theme, not in this property. However, his would require changeing
;; theme, not in this property. However, this would require changing
;; the C source of defvar and others as well...
(put symbol 'standard-value (list default))
;; Maybe this option was rogue in an earlier version. It no longer is.
@ -486,8 +486,10 @@ both appear in constructs like `custom-set-variables'."
(defun custom-add-option (symbol option)
"To the variable SYMBOL add OPTION.
If SYMBOL is a hook variable, OPTION should be a hook member.
For other types variables, the effect is undefined."
If SYMBOL's custom type is a hook, OPTION should be a hook member.
If SYMBOL's custom type is an alist, OPTION specifies a symbol
to offer to the user as a possible key in the alist.
For other custom types, this has no effect."
(let ((options (get symbol 'custom-options)))
(unless (member option options)
(put symbol 'custom-options (cons option options)))))
@ -560,7 +562,7 @@ LOAD should be either a library file name, or a feature name."
(t (condition-case nil (load load) (error nil))))))))
(defvar custom-known-themes '(user standard)
"Themes that have been define with `deftheme'.
"Themes that have been defined with `deftheme'.
The default value is the list (user standard). The theme `standard'
contains the Emacs standard settings from the original Lisp files. The
theme `user' contains all the the settings the user customized and saved.
@ -926,6 +928,19 @@ Return non-nil iff the `customized-value' property actually changed."
(defvar custom-loaded-themes nil
"Themes in the order they are loaded.")
(defcustom custom-theme-directory
(if (eq system-type 'ms-dos)
;; MS-DOS cannot have initial dot.
"~/_emacs.d/"
"~/.emacs.d/")
"Directory in which Custom theme files should be written.
`require-theme' searches this directory in addition to load-path.
The command `customize-create-theme' writes the files it produces
into this directory."
:type 'string
:group 'customize
:version "22.1")
(defun custom-theme-loaded-p (theme)
"Return non-nil when THEME has been loaded."
(memq theme custom-loaded-themes))
@ -949,8 +964,11 @@ Usually the `theme-feature' property contains a symbol created
by `custom-make-theme-feature'."
;; Note we do no check for validity of the theme here.
;; This allows to pull in themes by a file-name convention
(require (or (get theme 'theme-feature)
(custom-make-theme-feature theme))))
(let ((load-path (if (file-directory-p custom-theme-directory)
(cons custom-theme-directory load-path)
load-path)))
(require (or (get theme 'theme-feature)
(custom-make-theme-feature theme)))))
(defun custom-remove-theme (spec-alist theme)
"Delete all elements from SPEC-ALIST whose car is THEME."

4
lisp/dabbrev.el
View File

@ -100,7 +100,7 @@
;;----------------------------------------------------------------
(defgroup dabbrev nil
"Dynamic Abbreviations"
"Dynamic Abbreviations."
:tag "Dynamic Abbreviations"
:group 'abbrev
:group 'convenience)
@ -509,7 +509,7 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]."
(setq direction dabbrev--last-direction))
;; If the user inserts a space after expanding
;; and then asks to expand again, always fetch the next word.
(if (and (eq (preceding-char) ?\ )
(if (and (eq (preceding-char) ?\s)
(markerp dabbrev--last-abbrev-location)
(marker-position dabbrev--last-abbrev-location)
(= (point) (1+ dabbrev--last-abbrev-location)))

8
lisp/delim-col.el
View File

@ -125,7 +125,7 @@
;; User Options:
(defgroup columns nil
"Prettify columns"
"Prettify columns."
:link '(emacs-library-link :tag "Source Lisp File" "delim-col.el")
:prefix "delimit-columns-"
:group 'internal)
@ -424,13 +424,13 @@ START and END delimits the corners of text rectangle."
(and delimit-columns-format
(make-string (- (aref delimit-columns-max ncol)
(- (current-column) origin))
?\ )))
?\s)))
(setq ncol (1+ ncol)))
;; Prepare last column spaces
(let ((spaces (and delimit-columns-format
(make-string (- (aref delimit-columns-max ncol)
(- (current-column) origin))
?\ ))))
?\s))))
;; Adjust extra columns, if needed
(and delimit-columns-extra
(while (and (< (setq ncol (1+ ncol)) len)
@ -438,7 +438,7 @@ START and END delimits the corners of text rectangle."
(delimit-columns-format spaces)
(setq spaces (and delimit-columns-format
(make-string (aref delimit-columns-max ncol)
?\ )))))
?\s)))))
;; insert last formating
(cond ((null delimit-columns-format)
(insert delimit-columns-after delimit-columns-str-after))

12
lisp/diff-mode.el
View File

@ -57,7 +57,7 @@
(defgroup diff-mode ()
"Major mode for viewing/editing diffs"
"Major mode for viewing/editing diffs."
:version "21.1"
:group 'tools
:group 'diff)
@ -640,7 +640,7 @@ else cover the whole bufer."
(while (progn (setq last-pt (point))
(= (forward-line -1) 0))
(case (char-after)
(? (insert " ") (setq modif nil) (backward-char 1))
(?\s (insert " ") (setq modif nil) (backward-char 1))
(?+ (delete-region (point) last-pt) (setq modif t))
(?- (if (not modif)
(progn (forward-char 1)
@ -665,7 +665,7 @@ else cover the whole bufer."
(let ((modif nil) (delete nil))
(while (not (eobp))
(case (char-after)
(? (insert " ") (setq modif nil) (backward-char 1))
(?\s (insert " ") (setq modif nil) (backward-char 1))
(?- (setq delete t) (setq modif t))
(?+ (if (not modif)
(progn (forward-char 1)
@ -723,7 +723,7 @@ else cover the whole bufer."
(while (< (point) pt2)
(case (char-after)
((?! ?-) (delete-char 2) (insert "-") (forward-line 1))
(?\ ;merge with the other half of the chunk
(?\s ;merge with the other half of the chunk
(let* ((endline2
(save-excursion
(goto-char pt2) (forward-line 1) (point)))
@ -733,7 +733,7 @@ else cover the whole bufer."
(insert "+"
(prog1 (buffer-substring (+ pt2 2) endline2)
(delete-region pt2 endline2))))
(?\ ;FIXME: check consistency
(?\s ;FIXME: check consistency
(delete-region pt2 endline2)
(delete-char 1)
(forward-line 1))
@ -814,7 +814,7 @@ else cover the whole bufer."
(t (when (and first last (< first last))
(insert (delete-and-extract-region first last)))
(setq first nil last nil)
(equal ?\ c)))
(equal ?\s c)))
(forward-line 1))))))))))
(defun diff-fixup-modifs (start end)

3
lisp/dired-aux.el
View File

@ -839,6 +839,9 @@ Otherwise, the rule is a compression rule, and compression is done with gzip.")
(sit-for 1)
(apply 'message qprompt qs-args)
(setq char (set qs-var (read-char))))
;; Display the question with the answer.
(message (concat (apply 'format qprompt qs-args)
(char-to-string char)))
(memq (cdr elt) '(t y yes)))))))
;;;###autoload

2
lisp/dired.el
View File

@ -437,6 +437,8 @@ Subexpression 2 must end right before the \\n or \\r.")
nil (0 dired-ignored-face))))
)
"Additional expressions to highlight in Dired mode.")
(defvar dnd-protocol-alist)
;;; Macros must be defined before they are used, for the byte compiler.

2
lisp/ediff-diff.el
View File

@ -43,7 +43,7 @@
(require 'ediff-init)
(defgroup ediff-diff nil
"Diff related utilities"
"Diff related utilities."
:prefix "ediff-"
:group 'ediff)

8
lisp/ediff-init.el
View File

@ -393,17 +393,17 @@ It needs to be killed when we quit the session.")
this-command)))
(defgroup ediff-highlighting nil
"Hilighting of difference regions in Ediff"
"Hilighting of difference regions in Ediff."
:prefix "ediff-"
:group 'ediff)
(defgroup ediff-merge nil
"Merging utilities"
"Merging utilities."
:prefix "ediff-"
:group 'ediff)
(defgroup ediff-hook nil
"Hooks run by Ediff"
"Hooks run by Ediff."
:prefix "ediff-"
:group 'ediff)
@ -1840,7 +1840,7 @@ Unless optional argument INPLACE is non-nil, return a new string."
"Merge dir versions via ancestors")
(t
(capitalize
(subst-char-in-string ?- ?\ (substring (symbol-name jobname) 6))))
(subst-char-in-string ?- ?\s (substring (symbol-name jobname) 6))))
))

6
lisp/ediff-mult.el
View File

@ -106,7 +106,7 @@
(provide 'ediff-mult)
(defgroup ediff-mult nil
"Multi-file and multi-buffer processing in Ediff"
"Multi-file and multi-buffer processing in Ediff."
:prefix "ediff-"
:group 'ediff)
@ -857,7 +857,7 @@ behavior."
(session-info (ediff-overlay-get overl 'ediff-meta-info))
(activity-marker (ediff-get-session-activity-marker session-info))
buffer-read-only)
(or new-marker activity-marker (setq new-marker ?\ ))
(or new-marker activity-marker (setq new-marker ?\s))
(goto-char (ediff-overlay-start overl))
(if (eq (char-after (point)) new-marker)
() ; if marker shown in buffer is the same as new-marker, do nothing
@ -872,7 +872,7 @@ behavior."
(session-info (ediff-overlay-get overl 'ediff-meta-info))
(status (ediff-get-session-status session-info))
buffer-read-only)
(setq new-status (or new-status status ?\ ))
(setq new-status (or new-status status ?\s))
(goto-char (ediff-overlay-start overl))
(forward-char 1) ; status is the second char in session record
(if (eq (char-after (point)) new-status)

2
lisp/ediff-ptch.el
View File

@ -28,7 +28,7 @@
(provide 'ediff-ptch)
(defgroup ediff-ptch nil
"Ediff patch support"
"Ediff patch support."
:tag "Patch"
:prefix "ediff-"
:group 'ediff)

2
lisp/ediff-wind.el
View File

@ -66,7 +66,7 @@
(defun ediff-compute-toolbar-width () 0))
(defgroup ediff-window nil
"Ediff window manipulation"
"Ediff window manipulation."
:prefix "ediff-"
:group 'ediff
:group 'frames)

4
lisp/ediff.el
View File

@ -7,7 +7,7 @@
;; Keywords: comparing, merging, patching, tools, unix
(defconst ediff-version "2.80" "The current version of Ediff")
(defconst ediff-date "June 3, 2005" "Date of last update")
(defconst ediff-date "June 3, 2005" "Date of last update")
;; This file is part of GNU Emacs.
@ -135,7 +135,7 @@
(require 'ediff-mult) ; required because of the registry stuff
(defgroup ediff nil
"A comprehensive visual interface to diff & patch"
"A comprehensive visual interface to diff & patch."
:tag "Ediff"
:group 'tools)

18
lisp/emacs-lisp/autoload.el
View File

@ -1,7 +1,7 @@
;; autoload.el --- maintain autoloads in loaddefs.el
;; Copyright (C) 1991,92,93,94,95,96,97, 2001,02,03,04
;; Free Software Foundation, Inc.
;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2001, 2002, 2003,
;; 2004, 2005 Free Software Foundation, Inc.
;; Author: Roland McGrath <roland@gnu.org>
;; Keywords: maint
@ -123,7 +123,17 @@ or macro definition or a defcustom)."
)
`(progn
(defvar ,varname ,init ,doc)
(custom-autoload ',varname ,file))))
(custom-autoload ',varname ,file)
;; The use of :require in a defcustom can be annoying, especially
;; when defcustoms are moved from one file to another between
;; releases because the :require arg gets placed in the user's
;; .emacs. In order for autoloaded minor modes not to need the
;; use of :require, we arrange to store their :setter.
,(let ((setter (condition-case nil
(cadr (memq :set form))
(error nil))))
(if (equal setter ''custom-set-minor-mode)
`(put ',varname 'custom-set 'custom-set-minor-mode))))))
;; nil here indicates that this is not a special autoload form.
(t nil))))
@ -566,5 +576,5 @@ Calls `update-directory-autoloads' on the command line arguments."
(provide 'autoload)
;;; arch-tag: 00244766-98f4-4767-bf42-8a22103441c6
;; arch-tag: 00244766-98f4-4767-bf42-8a22103441c6
;;; autoload.el ends here

7
lisp/emacs-lisp/bytecomp.el
View File

@ -193,7 +193,7 @@
(defgroup bytecomp nil
"Emacs Lisp byte-compiler"
"Emacs Lisp byte-compiler."
:group 'lisp)
(defcustom emacs-lisp-file-regexp (if (eq system-type 'vax-vms)
@ -1248,7 +1248,10 @@ extra args."
(defun byte-compile-nogroup-warn (form)
(let ((keyword-args (cdr (cdr (cdr (cdr form)))))
(name (cadr form)))
(or (plist-get keyword-args :group)
(or (not (eq (car-safe name) 'quote))
(and (eq (car form) 'custom-declare-group)
(equal name ''emacs))
(plist-get keyword-args :group)
(not (and (consp name) (eq (car name) 'quote)))
(byte-compile-warn
"%s for `%s' fails to specify containing group"

4
lisp/emacs-lisp/cl-indent.el
View File

@ -49,13 +49,13 @@
;;; Code:
(defgroup lisp-indent nil
"Indentation in Lisp"
"Indentation in Lisp."
:group 'lisp)
(defcustom lisp-indent-maximum-backtracking 3
"*Maximum depth to backtrack out from a sublist for structured indentation.
If this variable is 0, no backtracking will occur and forms such as flet
If this variable is 0, no backtracking will occur and forms such as `flet'
may not be correctly indented."
:type 'integer
:group 'lisp-indent)

19
lisp/emacs-lisp/crm.el
View File

@ -197,9 +197,10 @@ If an element is found, bind:
respectively,
and return t."
(let* ((minibuffer-string (buffer-string))
(end-index (or (string-match "," minibuffer-string (1- (point)))
(1- (point-max))))
(let* ((prompt-end (minibuffer-prompt-end))
(minibuffer-string (buffer-substring prompt-end (point-max)))
(end-index (or (string-match "," minibuffer-string (- (point) prompt-end))
(- (point-max) prompt-end)))
(target-string (substring minibuffer-string 0 end-index))
(index (or (string-match
(concat crm-separator "\\([^" crm-separator "]*\\)$")
@ -213,9 +214,10 @@ and return t."
(progn
;;
(setq crm-beginning-of-element (match-beginning 1))
(setq crm-end-of-element end-index)
(setq crm-end-of-element (+ end-index prompt-end))
;; string to the left of the current element
(setq crm-left-of-element (substring target-string 0 (match-beginning 1)))
(setq crm-left-of-element
(substring target-string 0 (match-beginning 1)))
;; the current element
(setq crm-current-element (match-string 1 target-string))
;; string to the right of the current element
@ -287,7 +289,7 @@ The meanings of the return values are:
(if completedp
(progn
(erase-buffer)
(delete-region (minibuffer-prompt-end) (point-max))
(insert crm-left-of-element completion)
;; (if crm-complete-up-to-point
;; (insert crm-separator))
@ -480,7 +482,7 @@ This function is modeled after `minibuffer_complete_and_exit' in src/minibuf.c"
(setq result
(catch 'crm-exit
(if (eq (point-min) (point-max))
(if (eq (minibuffer-prompt-end) (point-max))
(throw 'crm-exit t))
;; TODO: this test is suspect?
@ -506,7 +508,8 @@ This function is modeled after `minibuffer_complete_and_exit' in src/minibuf.c"
nil
(if (equal result "check")
(let ((check-strings
(crm-strings-completed-p (buffer-string))))
(crm-strings-completed-p
(buffer-substring (minibuffer-prompt-end) (point-max)))))
;; check all of minibuffer
(if (eq check-strings t)
(throw 'exit nil)

4
lisp/emacs-lisp/debug.el
View File

@ -231,7 +231,9 @@ first will be printed into the backtrace buffer."
;; would need to be de-iconified anyway immediately
;; after when we re-enter the debugger, so iconifying it
;; here would cause flashing.
(bury-buffer))))
;; Use quit-window rather than bury-buffer to quieten
;; Drew Adams. --Stef
(quit-window))))
(kill-buffer debugger-buffer))
(set-match-data debugger-outer-match-data)))
;; Put into effect the modified values of these variables

5
lisp/emacs-lisp/easy-mmode.el
View File

@ -201,10 +201,7 @@ See the command `%s' for a description of this minor-mode."))
:type 'boolean
,@(cond
((not (and curfile require)) nil)
((not (eq require t)) `(:require ,require))
(t `(:require
',(intern (file-name-nondirectory
(file-name-sans-extension curfile))))))
((not (eq require t)) `(:require ,require)))
,@(nreverse extra-keywords))))
;; The actual function.

6
lisp/emacs-lisp/edebug.el
View File

@ -61,7 +61,7 @@
;;; Options
(defgroup edebug nil
"A source-level debugger for Emacs Lisp"
"A source-level debugger for Emacs Lisp."
:group 'lisp)
@ -519,7 +519,7 @@ the minibuffer."
(put ',(nth 1 form) 'saved-face
',(get (nth 1 form) 'saved-face))
(put ',(nth 1 form) 'customized-face
',(nth 2 form)))
,(nth 2 form)))
(put (nth 1 form) 'saved-face nil)))))
(setq edebug-result (eval form))
(if (not edebugging)
@ -4224,7 +4224,7 @@ reinstrument it."
(- (current-column)
(if (= ?\( (following-char)) 0 1)))))
(insert (make-string
(max 0 (- col (- (point) start-of-count-line))) ?\ )
(max 0 (- col (- (point) start-of-count-line))) ?\s)
(if (and (< 0 count)
(not (memq coverage
'(unknown ok-coverage))))

2
lisp/emacs-lisp/elp.el
View File

@ -130,7 +130,7 @@
;; vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
(defgroup elp nil
"Emacs Lisp Profiler"
"Emacs Lisp Profiler."
:group 'lisp)
(defcustom elp-function-list nil

6
lisp/emacs-lisp/lisp-mode.el
View File

@ -631,10 +631,10 @@ Reinitialize the face according to the `defface' specification."
;; Resetting `saved-face' temporarily to nil is needed to let
;; `defface' change the spec, regardless of a saved spec.
(prog1 `(prog1 ,form
(put ',(eval (nth 1 form)) 'saved-face
(put ,(nth 1 form) 'saved-face
',(get (eval (nth 1 form)) 'saved-face))
(put ',(eval (nth 1 form)) 'customized-face
',(eval (nth 2 form))))
(put ,(nth 1 form) 'customized-face
,(nth 2 form)))
(put (eval (nth 1 form)) 'saved-face nil)))
((eq (car form) 'progn)
(cons 'progn (mapcar 'eval-defun-1 (cdr form))))

10
lisp/emacs-lisp/macroexp.el
View File

@ -45,15 +45,17 @@
;; structure of the result with the input. Doing so recursively using
;; `maybe-cons' results in excessively deep recursion for very long
;; input forms.
(defmacro macroexp-accumulate (#1=#:\(var\ list\) &rest body)
(defmacro macroexp-accumulate (var+list &rest body)
"Return a list of the results of evaluating BODY for each element of LIST.
Evaluate BODY with VAR bound to each `car' from LIST, in turn.
Return a list of the values of the final form in BODY.
The list structure of the result will share as much with LIST as
possible (for instance, when BODY just returns VAR unchanged, the
result will be eq to LIST)."
(let ((var (car #1#))
(list (cadr #1#))
result will be eq to LIST).
\(fn (VAR LIST) BODY...)"
(let ((var (car var+list))
(list (cadr var+list))
(shared (make-symbol "shared"))
(unshared (make-symbol "unshared"))
(tail (make-symbol "tail"))

2
lisp/emacs-lisp/pp.el
View File

@ -67,7 +67,7 @@ to make output that `read' can handle, whenever this is possible."
(save-excursion
(backward-char 1)
(skip-chars-backward "'`#^")
(when (and (not (bobp)) (memq (char-before) '(?\ ?\t ?\n)))
(when (and (not (bobp)) (memq (char-before) '(?\s ?\t ?\n)))
(delete-region
(point)
(progn (skip-chars-backward " \t\n") (point)))

2
lisp/emacs-lisp/testcover.el
View File

@ -73,7 +73,7 @@
;;;==========================================================================
(defgroup testcover nil
"Code-coverage tester"
"Code-coverage tester."
:group 'lisp
:prefix "testcover-"
:version "21.1")

7
lisp/emacs-lisp/timer.el
View File

@ -408,12 +408,11 @@ This function returns a timer object which you can use in `cancel-timer'."
(defmacro with-timeout (list &rest body)
"Run BODY, but if it doesn't finish in SECONDS seconds, give up.
If we give up, we run the TIMEOUT-FORMS and return the value of the last one.
The call should look like:
(with-timeout (SECONDS TIMEOUT-FORMS...) BODY...)
The timeout is checked whenever Emacs waits for some kind of external
event \(such as keyboard input, input from subprocesses, or a certain time);
event (such as keyboard input, input from subprocesses, or a certain time);
if the program loops without waiting in any way, the timeout will not
be detected."
be detected.
\n(fn (SECONDS TIMEOUT-FORMS...) BODY)"
(let ((seconds (car list))
(timeout-forms (cdr list)))
`(let ((with-timeout-tag (cons nil nil))

2
lisp/emacs-lisp/trace.el
View File

@ -156,7 +156,7 @@
(require 'advice)
(defgroup trace nil
"Tracing facility for Emacs Lisp functions"
"Tracing facility for Emacs Lisp functions."
:prefix "trace-"
:group 'lisp)

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

@ -350,7 +350,7 @@ Must be set prior to enabling CUA."
(defcustom cua-check-pending-input t
"*If non-nil, don't override prefix key if input pending.
It is rumoured that input-pending-p is unreliable under some window
It is rumoured that `input-pending-p' is unreliable under some window
managers, so try setting this to nil, if prefix override doesn't work."
:type 'boolean
:group 'cua)
@ -370,7 +370,7 @@ buffer is NOT modified, until you execute a command that actually modifies it.
"*If non-nil, automatically tabify after rectangle commands.
This basically means that `tabify' is applied to all lines that
are modified by inserting or deleting a rectangle. If value is
an integer, cua will look for existing tabs in a region around
an integer, CUA will look for existing tabs in a region around
the rectangle, and only do the conversion if any tabs are already
present. The number specifies then number of characters before
and after the region marked by the rectangle to search."
@ -568,7 +568,7 @@ a cons (TYPE . COLOR), then both properties are affected."
;;; Low-level Interface
(defvar cua-inhibit-cua-keys nil
"Buffer-local variable that may disable the cua keymappings.")
"Buffer-local variable that may disable the CUA keymappings.")
(make-variable-buffer-local 'cua-inhibit-cua-keys)
;;; Aux. variables
@ -902,8 +902,8 @@ Activates the mark if a prefix argument is given."
(defun cua-repeat-replace-region (arg)
"Repeat replacing text of highlighted region with typed text.
Searches for the next streach of text identical to the region last
replaced by typing text over it and replaces it with the same streach
Searches for the next stretch of text identical to the region last
replaced by typing text over it and replaces it with the same stretch
of text."
(interactive "P")
(when cua--last-deleted-region-pos
@ -1331,7 +1331,7 @@ If ARG is the atom `-', scroll upward by nearly full screen."
When enabled, using shifted movement keys will activate the region (and
highlight the region using `transient-mark-mode'), and typed text replaces
the active selection. C-z, C-x, C-c, and C-v will undo, cut, copy, and
paste (in addition to the normal emacs bindings)."
paste (in addition to the normal Emacs bindings)."
:global t
:group 'cua
:set-after '(cua-enable-modeline-indications cua-use-hyper-key)
@ -1394,7 +1394,7 @@ paste (in addition to the normal emacs bindings)."
(setq cua--saved-state nil))))
(defun cua-debug ()
"Toggle cua debugging."
"Toggle CUA debugging."
(interactive)
(setq cua--debug (not cua--debug)))

8
lisp/emulation/cua-gmrk.el
View File

@ -96,7 +96,7 @@ When the global marker is set, CUA cut and copy commands will automatically
insert the deleted or copied text before the global marker, even when the
global marker is in another buffer.
If the global marker isn't set, set the global marker at point in the current
buffer. Otherwise jump to the global marker position and cancel it.
buffer. Otherwise jump to the global marker position and cancel it.
With prefix argument, don't jump to global mark when cancelling it."
(interactive "P")
(unless cua--global-mark-initialized
@ -105,7 +105,7 @@ With prefix argument, don't jump to global mark when cancelling it."
(if (not buffer-read-only)
(cua--activate-global-mark t)
(ding)
(message "Cannot set global mark in read-only buffer."))
(message "Cannot set global mark in read-only buffer"))
(when (not stay)
(pop-to-buffer (marker-buffer cua--global-mark-marker))
(goto-char cua--global-mark-marker))
@ -165,7 +165,7 @@ With prefix argument, don't jump to global mark when cancelling it."
(if (equal (marker-buffer cua--global-mark-marker) src-buf)
(if (and (< start (marker-position cua--global-mark-marker))
(< (marker-position cua--global-mark-marker) end))
(message "Can't move region into itself.")
(message "Can't move region into itself")
(let ((text (buffer-substring-no-properties start end))
(p1 (copy-marker start))
(p2 (copy-marker end)))
@ -222,7 +222,7 @@ With prefix argument, don't jump to global mark when cancelling it."
(setq in-rect t olist nil)
(setq olist (cdr olist))))
(if in-rect
(message "Can't move rectangle into itself.")
(message "Can't move rectangle into itself")
(let ((text (cua--extract-rectangle)))
(cua--delete-rectangle)
(goto-char (marker-position cua--global-mark-marker))

18
lisp/emulation/cua-rect.el
View File

@ -992,7 +992,7 @@ With prefix argument, the toggle restriction."
(defun cua-do-rectangle-padding ()
(interactive)
(if buffer-read-only
(message "Cannot do padding in read-only buffer.")
(message "Cannot do padding in read-only buffer")
(cua--rectangle-operation nil nil t t t)
(cua--rectangle-set-corners))
(cua--keep-active))
@ -1098,14 +1098,14 @@ The length of STRING need not be the same as the rectangle width."
'(lambda (l r)
(cua--rectangle-right (max l (+ l (length string) -1)))))))
(defun cua-fill-char-rectangle (ch)
(defun cua-fill-char-rectangle (character)
"Replace CUA rectangle contents with CHARACTER."
(interactive "cFill rectangle with character: ")
(cua--rectangle-operation 'clear nil t 1 nil
'(lambda (s e l r)
(delete-region s e)
(move-to-column l t)
(insert-char ch (- r l)))))
(insert-char character (- r l)))))
(defun cua-replace-in-rectangle (regexp newtext)
"Replace REGEXP with NEWTEXT in each line of CUA rectangle."
@ -1137,9 +1137,9 @@ The length of STRING need not be the same as the rectangle width."
(t nil)))))
(defvar cua--rectangle-seq-format "%d"
"Last format used by cua-sequence-rectangle.")
"Last format used by `cua-sequence-rectangle'.")
(defun cua-sequence-rectangle (first incr fmt)
(defun cua-sequence-rectangle (first incr format)
"Resequence each line of CUA rectangle starting from FIRST.
The numbers are formatted according to the FORMAT string."
(interactive
@ -1150,13 +1150,13 @@ The numbers are formatted according to the FORMAT string."
(string-to-number
(read-string "Increment: (1) " nil nil "1"))
(read-string (concat "Format: (" cua--rectangle-seq-format ") "))))
(if (= (length fmt) 0)
(setq fmt cua--rectangle-seq-format)
(setq cua--rectangle-seq-format fmt))
(if (= (length format) 0)
(setq format cua--rectangle-seq-format)
(setq cua--rectangle-seq-format format))
(cua--rectangle-operation 'clear nil t 1 nil
'(lambda (s e l r)
(delete-region s e)
(insert (format fmt first))
(insert (format format first))
(setq first (+ first incr)))))
(defmacro cua--convert-rectangle-as (command tabify)

6
lisp/emulation/edt-mapper.el
View File

@ -113,7 +113,6 @@
(sit-for 600)
(kill-emacs t)))
;;;
;;; Decide Emacs Variant, GNU Emacs or XEmacs (aka Lucid Emacs).
;;; Determine Window System, and X Server Vendor (if appropriate).
@ -146,6 +145,11 @@
(defvar edt-return-seq nil)
(defvar edt-term nil)
;; To silence the byte-compiler
(eval-when-compile
(defvar EDT-key-name)
(defvar edt-save-function-key-map))
;;;
;;; Determine Terminal Type (if appropriate).
;;;

33
lisp/emulation/edt.el
View File

@ -175,6 +175,20 @@
:prefix "edt-"
:group 'emulations)
;; To silence the byte-compiler
(eval-when-compile
(defvar *EDT-keys*)
(defvar edt-default-global-map)
(defvar edt-last-copied-word)
(defvar edt-learn-macro-count)
(defvar edt-orig-page-delimiter)
(defvar edt-orig-transient-mark-mode)
(defvar edt-rect-start-point)
(defvar edt-user-global-map)
(defvar rect-start-point)
(defvar time-string)
(defvar zmacs-region-stays))
;;;
;;; Version Information
;;;
@ -332,6 +346,11 @@ This means that an edt-user.el file was found in the user's `load-path'.")
(defvar edt-keys-file nil
"User's custom keypad and function keys mappings to emulate LK-201 keyboard.")
(defvar edt-last-copied-word nil
"Last word that the user copied.")
(defvar zmacs-region-stays)
;;;;
;;;; EDT Emulation Commands
@ -1621,9 +1640,8 @@ Argument NUM is the percentage into the buffer to move."
(defun edt-mark-section-wisely ()
"Mark the section in a manner consistent with the `major-mode'.
Uses `mark-defun' for emacs-lisp and Lisp,
mark-c-function for C,
mark-fortran-subsystem for fortran,
Uses `mark-defun' for Emacs-Lisp and Lisp, and for Fortran,
`c-mark-function' for C,
and `mark-paragraph' for other modes."
(interactive)
(if edt-select-mode
@ -1631,15 +1649,13 @@ and `mark-paragraph' for other modes."
(edt-reset))
(progn
(cond ((or (eq major-mode 'emacs-lisp-mode)
(eq major-mode 'fortran-mode)
(eq major-mode 'lisp-mode))
(mark-defun)
(message "Lisp defun selected"))
((eq major-mode 'c-mode)
(mark-c-function)
(c-mark-function)
(message "C function selected"))
((eq major-mode 'fortran-mode)
(mark-fortran-subprogram)
(message "Fortran subprogram selected"))
(t (mark-paragraph)
(message "Paragraph selected"))))))
@ -1766,8 +1782,7 @@ Argument NUM is the number of times to duplicate the line."
"Display the current time."
(interactive)
(if edt-x-emacs19-p (setq zmacs-region-stays t))
(set 'time-string (current-time-string))
(message "%s" time-string))
(message "%s" (current-time-string)))
;;;
;;; LEARN

66
lisp/emulation/tpu-edt.el
View File

@ -307,17 +307,11 @@
;;; Emacs version identifiers - currently referenced by
;;;
;;; o tpu-mark o tpu-set-mark
;;; o tpu-string-prompt o tpu-regexp-prompt
;;; o tpu-edt-on o tpu-load-xkeys
;;; o tpu-update-mode-line o mode line section
;;; o mode line section o tpu-load-xkeys
;;;
(defconst tpu-emacs19-p (not (string-lessp emacs-version "19"))
"Non-nil if we are running Lucid Emacs or version 19.")
(defconst tpu-lucid-emacs19-p
(and tpu-emacs19-p (string-match "Lucid" emacs-version))
"Non-nil if we are running Lucid Emacs version 19.")
(defconst tpu-lucid-emacs-p
(string-match "Lucid" emacs-version)
"Non-nil if we are running Lucid Emacs.")
;;;
;;; Global Keymaps
@ -341,10 +335,10 @@ GOLD is the ASCII 7-bit escape sequence <ESC>OP.")
"Maps the function keys on the VT100 keyboard preceded by GOLD-SS3.")
(defvar tpu-global-map nil "TPU-edt global keymap.")
(defvar tpu-original-global-map (copy-keymap global-map)
(defvar tpu-original-global-map global-map
"Original global keymap.")
(and tpu-lucid-emacs19-p
(and tpu-lucid-emacs-p
(defvar minibuffer-local-ns-map (make-sparse-keymap)
"Hack to give Lucid Emacs the same maps as ordinary Emacs."))
@ -463,13 +457,12 @@ GOLD is the ASCII 7-bit escape sequence <ESC>OP.")
(defun tpu-update-mode-line nil
"Make sure mode-line in the current buffer reflects all changes."
(setq tpu-mark-flag (if transient-mark-mode "" (if (tpu-mark) " @" " ")))
(cond (tpu-emacs19-p (force-mode-line-update))
(t (set-buffer-modified-p (buffer-modified-p)) (sit-for 0))))
(force-mode-line-update))
(cond (tpu-lucid-emacs19-p
(cond (tpu-lucid-emacs-p
(add-hook 'zmacs-deactivate-region-hook 'tpu-update-mode-line)
(add-hook 'zmacs-activate-region-hook 'tpu-update-mode-line))
(tpu-emacs19-p
(t
(add-hook 'activate-mark-hook 'tpu-update-mode-line)
(add-hook 'deactivate-mark-hook 'tpu-update-mode-line)))
@ -542,26 +535,25 @@ Otherwise sets the tpu-match markers to nil and returns nil."
(defun tpu-caar (thingy) (car (car thingy)))
(defun tpu-cadr (thingy) (car (cdr thingy)))
(defvar zmacs-regions)
(defun tpu-mark nil
"TPU-edt version of the mark function.
Return the appropriate value of the mark for the current
version of Emacs."
(cond (tpu-lucid-emacs19-p (mark (not zmacs-regions)))
(tpu-emacs19-p (and mark-active (mark (not transient-mark-mode))))
(t (mark))))
(cond (tpu-lucid-emacs-p (mark (not zmacs-regions)))
(t (and mark-active (mark (not transient-mark-mode))))))
(defun tpu-set-mark (pos)
"TPU-edt version of the `set-mark' function.
Sets the mark at POS and activates the region according to the
current version of Emacs."
(set-mark pos)
(and tpu-lucid-emacs19-p pos (zmacs-activate-region)))
(and tpu-lucid-emacs-p pos (zmacs-activate-region)))
(defun tpu-string-prompt (prompt history-symbol)
"Read a string with PROMPT."
(if tpu-emacs19-p
(read-from-minibuffer prompt nil nil nil history-symbol)
(read-string prompt)))
(read-from-minibuffer prompt nil nil nil history-symbol))
(defvar tpu-last-answer nil "Most recent response to tpu-y-or-n-p.")
@ -1118,9 +1110,7 @@ kills modified buffers without asking."
(defun tpu-regexp-prompt (prompt)
"Read a string, adding 'RE' to the prompt if tpu-regexp-p is set."
(let ((re-prompt (concat (if tpu-regexp-p "RE ") prompt)))
(if tpu-emacs19-p
(read-from-minibuffer re-prompt nil nil nil 'tpu-regexp-prompt-hist)
(read-string re-prompt))))
(read-from-minibuffer re-prompt nil nil nil 'tpu-regexp-prompt-hist)))
(defun tpu-search-highlight nil
(if (tpu-check-match)
@ -2017,8 +2007,6 @@ Accepts a prefix argument for the number of tpu-pan-columns to scroll."
;;;
;;; Define keymaps
;;;
(define-key global-map "\e[" CSI-map) ; CSI map
(define-key global-map "\eO" SS3-map) ; SS3 map
(define-key SS3-map "P" GOLD-map) ; GOLD map
(define-key GOLD-map "\e[" GOLD-CSI-map) ; GOLD-CSI map
(define-key GOLD-map "\eO" GOLD-SS3-map) ; GOLD-SS3 map
@ -2275,16 +2263,6 @@ Accepts a prefix argument for the number of tpu-pan-columns to scroll."
(define-key GOLD-SS3-map "M" 'tpu-substitute) ; KPenter
;;;
;;; Repeat complex command map additions to make arrows work
;;;
(cond ((boundp 'repeat-complex-command-map)
(define-key repeat-complex-command-map "\e[A" 'previous-complex-command)
(define-key repeat-complex-command-map "\e[B" 'next-complex-command)
(define-key repeat-complex-command-map "\eOA" 'previous-complex-command)
(define-key repeat-complex-command-map "\eOB" 'next-complex-command)))
;;;
;;; Minibuffer map additions to make KP_enter = RET
;;;
@ -2292,8 +2270,6 @@ Accepts a prefix argument for the number of tpu-pan-columns to scroll."
(define-key minibuffer-local-ns-map "\eOM" 'exit-minibuffer)
(define-key minibuffer-local-completion-map "\eOM" 'exit-minibuffer)
(define-key minibuffer-local-must-match-map "\eOM" 'minibuffer-complete-and-exit)
(and (boundp 'repeat-complex-command-map)
(define-key repeat-complex-command-map "\eOM" 'exit-minibuffer))
;;;
@ -2407,10 +2383,10 @@ If FILE is nil, try to load a default file. The default file names are
(setq file (expand-file-name file)))
(tpu-xkeys-file
(setq file (expand-file-name tpu-xkeys-file)))
(tpu-lucid-emacs19-p
(tpu-lucid-emacs-p
(setq file (convert-standard-filename
(expand-file-name "~/.tpu-lucid-keys"))))
(tpu-emacs19-p
(t
(setq file (convert-standard-filename
(expand-file-name "~/.tpu-keys")))
(and (not (file-exists-p file))
@ -2503,6 +2479,10 @@ If FILE is nil, try to load a default file. The default file names are
(setq-default page-delimiter "\f")
(setq-default truncate-lines t)
(setq scroll-step 1)
(setq tpu-original-global-map global-map)
(setq global-map (copy-keymap global-map))
(define-key global-map "\e[" CSI-map)
(define-key global-map "\eO" SS3-map)
(setq tpu-edt-mode t))))
(defun tpu-edt-off nil
@ -2516,7 +2496,7 @@ If FILE is nil, try to load a default file. The default file names are
(setq-default page-delimiter "^\f")
(setq-default truncate-lines nil)
(setq scroll-step 0)
(setq global-map (copy-keymap tpu-original-global-map))
(setq global-map tpu-original-global-map)
(use-global-map global-map)
(setq tpu-edt-mode nil))))

7
lisp/emulation/vi.el
View File

@ -314,7 +314,7 @@ command extensions.")
(put 'mark-defun 'point-moving-unit 'region)
(put 'mark-whole-buffer 'point-moving-unit 'region)
(put 'mark-end-of-sentence 'point-moving-unit 'region)
(put 'mark-c-function 'point-moving-unit 'region)
(put 'c-mark-function 'point-moving-unit 'region)
;;;
(defvar vi-mark-alist nil
@ -637,7 +637,8 @@ insert state."
"Go to ARGth line."
(interactive "P")
(if (null (vi-raw-numeric-prefix arg))
(end-of-buffer)
(with-no-warnings
(end-of-buffer))
(goto-line (vi-prefix-numeric-value arg))))
(defun vi-beginning-of-buffer ()
@ -1384,7 +1385,7 @@ l(ines)."
((char-equal region ?b) (mark-whole-buffer))
((char-equal region ?p) (mark-paragraph))
((char-equal region ?P) (mark-page arg))
((char-equal region ?f) (mark-c-function))
((char-equal region ?f) (c-mark-function))
((char-equal region ?w) (mark-word arg))
((char-equal region ?e) (mark-end-of-sentence arg))
((char-equal region ?l) (vi-mark-lines arg))

13
lisp/emulation/vip.el
View File

@ -1112,9 +1112,10 @@ the query replace mode will toggle between string replace and regexp replace."
(replace-match (vip-read-string
(format "Replace regexp \"%s\" with: " str))
nil nil))
(replace-string
str
(vip-read-string (format "Replace \"%s\" with: " str)))))))
(with-no-warnings
(replace-string
str
(vip-read-string (format "Replace \"%s\" with: " str))))))))
;; basic cursor movement. j, k, l, m commands.
@ -2830,7 +2831,8 @@ a token has type \(command, address, end-mark\) and value."
(skip-chars-forward " \t")
(if (looking-at "[\n|]") (error "Missing rhs"))
(set-mark (point))
(end-of-buffer)
(with-no-warnings
(end-of-buffer))
(backward-char 1)
(setq string (buffer-substring (mark) (point))))
(if (not (lookup-key ex-map char))
@ -2900,7 +2902,8 @@ a token has type \(command, address, end-mark\) and value."
(setq file (buffer-substring (point) (mark)))))
(if variant
(shell-command command t)
(insert-file file))))
(with-no-warnings
(insert-file file)))))
(defun ex-set ()
(eval (list 'setq

2
lisp/emulation/viper-ex.el
View File

@ -58,7 +58,7 @@
(require 'viper-util)
(defgroup viper-ex nil
"Viper support for Ex commands"
"Viper support for Ex commands."
:prefix "ex-"
:group 'viper)

2
lisp/emulation/viper-mous.el
View File

@ -52,7 +52,7 @@
(defgroup viper-mouse nil
"Support for Viper special mouse-bound commands"
"Support for Viper special mouse-bound commands."
:prefix "viper-"
:group 'viper)

2
lisp/eshell/esh-var.el
View File

@ -28,7 +28,7 @@
(defgroup eshell-var nil
"Variable interpolation is introduced whenever the '$' character
appears unquoted in any argument (except when that argument is
surrounded by single quotes) . It may be used to interpolate a
surrounded by single quotes). It may be used to interpolate a
variable value, a subcommand, or even the result of a Lisp form."
:tag "Variable handling"
:group 'eshell)

111
lisp/facemenu.el
View File

@ -1,6 +1,6 @@
;;; facemenu.el --- create a face menu for interactively adding fonts to text
;; Copyright (c) 1994, 1995, 1996, 2001, 2002 Free Software Foundation, Inc.
;; Copyright (c) 1994, 1995, 1996, 2001, 2002, 2005 Free Software Foundation, Inc.
;; Author: Boris Goldowsky <boris@gnu.org>
;; Keywords: faces
@ -99,7 +99,7 @@
(define-key global-map "\M-o" 'facemenu-keymap)
(defgroup facemenu nil
"Create a face menu for interactively adding fonts to text"
"Create a face menu for interactively adding fonts to text."
:group 'faces
:prefix "facemenu-")
@ -365,10 +365,9 @@ typing a character to insert cancels the specification."
(region-beginning))
(if (and mark-active (not current-prefix-arg))
(region-end))))
(unless (color-defined-p color)
(message "Color `%s' undefined" color))
(facemenu-add-new-color color 'facemenu-foreground-menu)
(facemenu-add-face (list (list :foreground color)) start end))
(facemenu-set-face-from-menu
(facemenu-add-new-color color 'facemenu-foreground-menu)
start end))
;;;###autoload
(defun facemenu-set-background (color &optional start end)
@ -389,34 +388,41 @@ typing a character to insert cancels the specification."
(region-beginning))
(if (and mark-active (not current-prefix-arg))
(region-end))))
(unless (color-defined-p color)
(message "Color `%s' undefined" color))
(facemenu-add-new-color color 'facemenu-background-menu)
(facemenu-add-face (list (list :background color)) start end))
(facemenu-set-face-from-menu
(facemenu-add-new-color color 'facemenu-background-menu)
start end))
;;;###autoload
(defun facemenu-set-face-from-menu (face start end)
"Set the FACE of the region or next character typed.
This function is designed to be called from a menu; the face to use
is the menu item's name.
This function is designed to be called from a menu; FACE is determined
using the event type of the menu entry. If FACE is a symbol whose
name starts with \"fg:\" or \"bg:\", then this functions sets the
foreground or background to the color specified by the rest of the
symbol's name. Any other symbol is considered the name of a face.
If the region is active (normally true except in Transient Mark mode)
and there is no prefix argument, this command sets the region to the
requested face.
Otherwise, this command specifies the face for the next character
inserted. Moving point or switching buffers before
typing a character to insert cancels the specification."
inserted. Moving point or switching buffers before typing a character
to insert cancels the specification."
(interactive (list last-command-event
(if (and mark-active (not current-prefix-arg))
(region-beginning))
(if (and mark-active (not current-prefix-arg))
(region-end))))
(barf-if-buffer-read-only)
(facemenu-get-face face)
(if start
(facemenu-add-face face start end)
(facemenu-add-face face)))
(facemenu-add-face
(let ((fn (symbol-name face)))
(if (string-match "\\`\\([fb]\\)g:\\(.+\\)" fn)
(list (list (if (string= (match-string 1 fn) "f")
:foreground
:background)
(match-string 2 fn)))
face))
start end))
;;;###autoload
(defun facemenu-set-invisible (start end)
@ -615,7 +621,9 @@ effect. See `facemenu-remove-face-function'."
self-insert-face
(list self-insert-face)))
face)
self-insert-face-command this-command)))))
self-insert-face-command this-command))))
(unless (facemenu-enable-faces-p)
(message "Font-lock mode will override any faces you set in this buffer")))
(defun facemenu-active-faces (face-list &optional frame)
"Return from FACE-LIST those faces that would be used for display.
@ -648,14 +656,6 @@ use the selected frame. If t, then the global, non-frame faces are used."
(setq face-list (cdr face-list)))
(nreverse active-list)))
(defun facemenu-get-face (symbol)
"Make sure FACE exists.
If not, create it and add it to the appropriate menu. Return the SYMBOL."
(let ((name (symbol-name symbol)))
(cond ((facep symbol))
(t (make-face symbol))))
symbol)
(defun facemenu-add-new-face (face)
"Add FACE (a face) to the Face menu.
@ -715,47 +715,40 @@ This is called whenever you create a new face."
(define-key menu key (cons name function))))))
nil) ; Return nil for facemenu-iterate
(defun facemenu-add-new-color (color &optional menu)
(defun facemenu-add-new-color (color menu)
"Add COLOR (a color name string) to the appropriate Face menu.
MENU should be `facemenu-foreground-menu' or
`facemenu-background-menu'.
MENU should be `facemenu-foreground-menu' or `facemenu-background-menu'.
Return the event type (a symbol) of the added menu entry.
This is called whenever you use a new color."
(let* (name
symbol
docstring
function menu-val key
(color-p (memq menu '(facemenu-foreground-menu
facemenu-background-menu))))
(unless (stringp color)
(error "%s is not a color" color))
(setq name color
symbol (intern name))
(let (symbol docstring)
(unless (color-defined-p color)
(error "Color `%s' undefined" color))
(cond ((eq menu 'facemenu-foreground-menu)
(setq docstring
(format "Select foreground color %s for subsequent insertion."
name)))
color)
symbol (intern (concat "fg:" color))))
((eq menu 'facemenu-background-menu)
(setq docstring
(format "Select background color %s for subsequent insertion."
name))))
(cond ((facemenu-iterate ; check if equivalent face is already in the menu
(lambda (m) (and (listp m)
(symbolp (car m))
(stringp (cadr m))
(string-equal (cadr m) color)))
(cdr (symbol-function menu))))
(t ; No keyboard equivalent. Figure out where to put it:
(setq key (vector symbol)
function 'facemenu-set-face-from-menu
menu-val (symbol-function menu))
(if (and facemenu-new-faces-at-end
(> (length menu-val) 3))
(define-key-after menu-val key (cons name function)
(car (nth (- (length menu-val) 3) menu-val)))
(define-key menu key (cons name function))))))
nil) ; Return nil for facemenu-iterate
color)
symbol (intern (concat "bg:" color))))
(t (error "MENU should be `facemenu-foreground-menu' or `facemenu-background-menu'")))
(unless (facemenu-iterate ; Check if color is already in the menu.
(lambda (m) (and (listp m)
(eq (car m) symbol)))
(cdr (symbol-function menu)))
;; Color is not in the menu. Figure out where to put it.
(let ((key (vector symbol))
(function 'facemenu-set-face-from-menu)
(menu-val (symbol-function menu)))
(if (and facemenu-new-faces-at-end
(> (length menu-val) 3))
(define-key-after menu-val key (cons color function)
(car (nth (- (length menu-val) 3) menu-val)))
(define-key menu key (cons color function)))))
symbol))
(defun facemenu-complete-face-list (&optional oldlist)
"Return list of all faces that look different.

32
lisp/faces.el
View File

@ -869,7 +869,10 @@ Otherwise, return a single face."
(aliasfaces nil)
(nonaliasfaces nil)
faces)
;; Make a list of the named faces that the `face' property uses.
;; Try to get a face name from the buffer.
(if (memq (intern-soft (thing-at-point 'symbol)) (face-list))
(setq faces (list (intern-soft (thing-at-point 'symbol)))))
;; Add the named faces that the `face' property uses.
(if (and (listp faceprop)
;; Don't treat an attribute spec as a list of faces.
(not (keywordp (car faceprop)))
@ -879,10 +882,6 @@ Otherwise, return a single face."
(push f faces)))
(if (symbolp faceprop)
(push faceprop faces)))
;; If there are none, try to get a face name from the buffer.
(if (and (null faces)
(memq (intern-soft (thing-at-point 'symbol)) (face-list)))
(setq faces (list (intern-soft (thing-at-point 'symbol)))))
;; Build up the completion tables.
(mapatoms (lambda (s)
@ -896,22 +895,27 @@ Otherwise, return a single face."
(unless multiple
(if faces
(setq faces (list (car faces)))))
(require 'crm)
(let* ((input
;; Read the input.
(completing-read
(completing-read-multiple
(if (or faces string-describing-default)
(format "%s (default %s): " prompt
(if faces (mapconcat 'symbol-name faces ", ")
(if faces (mapconcat 'symbol-name faces ",")
string-describing-default))
(format "%s: " prompt))
(complete-in-turn nonaliasfaces aliasfaces) nil t))
(complete-in-turn nonaliasfaces aliasfaces)
nil t nil nil
(if faces (mapconcat 'symbol-name faces ","))))
;; Canonicalize the output.
(output
(if (equal input "")
faces
(if (stringp input)
(list (intern input))
input))))
(cond ((or (equal input "") (equal input '("")))
faces)
((stringp input)
(mapcar 'intern (split-string input ", *" t)))
((listp input)
(mapcar 'intern input))
(input))))
;; Return either a list of faces or just one face.
(if multiple
output
@ -1915,7 +1919,7 @@ created."
:group 'basic-faces)
(defface vertical-border
'((default :inherit mode-line-inactive))
'((((type tty)) :inherit mode-line-inactive))
"Face used for vertical window dividers on ttys."
:version "22.1"
:group 'modeline

19
lisp/find-file.el
View File

@ -946,18 +946,11 @@ and the name of the file passed in."
(defun ff-which-function-are-we-in ()
"Return the name of the function whose definition/declaration point is in.
Also remember that name in `ff-function-name'."
(setq ff-function-name nil)
(save-excursion
(if (re-search-backward ada-procedure-start-regexp nil t)
(setq ff-function-name (buffer-substring (match-beginning 0)
(match-end 0)))
; we didn't find a procedure start, perhaps there is a package
(if (re-search-backward ada-package-start-regexp nil t)
(setq ff-function-name (buffer-substring (match-beginning 0)
(match-end 0)))
))))
(setq ff-function-name
(save-excursion
(if (or (re-search-backward ada-procedure-start-regexp nil t)
(re-search-backward ada-package-start-regexp nil t))
(match-string 0)))))
;; bind with (setq ff-post-load-hook 'ff-set-point-accordingly)
;;
@ -971,5 +964,5 @@ That name was previously determined by `ff-which-function-are-we-in'."
(provide 'find-file)
;;; arch-tag: 5a2fc49e-3b0a-4708-9acf-fb14e471a97a
;; arch-tag: 5a2fc49e-3b0a-4708-9acf-fb14e471a97a
;;; find-file.el ends here

41
lisp/font-lock.el
View File

@ -620,6 +620,7 @@ Major/minor modes can set this variable if they know which option applies.")
;; We use this to preserve or protect things when modifying text properties.
(defmacro save-buffer-state (varlist &rest body)
"Bind variables according to VARLIST and eval BODY restoring buffer state."
(declare (indent 1) (debug let))
(let ((modified (make-symbol "modified")))
`(let* ,(append varlist
`((,modified (buffer-modified-p))
@ -634,8 +635,6 @@ Major/minor modes can set this variable if they know which option applies.")
,@body)
(unless ,modified
(restore-buffer-modified-p nil)))))
(put 'save-buffer-state 'lisp-indent-function 1)
(def-edebug-spec save-buffer-state let)
;;
;; Shut up the byte compiler.
(defvar font-lock-face-attributes)) ; Obsolete but respected if set.
@ -1826,15 +1825,15 @@ Sets various variables using `font-lock-defaults' (or, if nil, using
"Font Lock mode face used to highlight preprocessor directives."
:group 'font-lock-highlighting-faces)
(defface font-lock-regexp-backslash
(defface font-lock-regexp-grouping-backslash
'((((class color) (min-colors 16)) :inherit escape-glyph)
(t :inherit bold))
"Font Lock mode face used to highlight a backslash in Lisp regexps."
"Font Lock mode face for backslashes in Lisp regexp grouping constructs."
:group 'font-lock-highlighting-faces)
(defface font-lock-regexp-backslash-construct
(defface font-lock-regexp-grouping-construct
'((t :inherit bold))
"Font Lock mode face used to highlight `\' constructs in Lisp regexps."
"Font Lock mode face used to highlight grouping constructs in Lisp regexps."
:group 'font-lock-highlighting-faces)
;;; End of Colour etc. support.
@ -2083,22 +2082,22 @@ This function could be MATCHER in a MATCH-ANCHORED `font-lock-keywords' item."
("\\<:\\sw+\\>" 0 font-lock-builtin-face)
;; ELisp and CLisp `&' keywords as types.
("\\&\\sw+\\>" . font-lock-type-face)
;; Make regexp grouping constructs bold, so they stand out, but only
;; in strings.
;; ELisp regexp grouping constructs
((lambda (bound)
(if (re-search-forward "\\(\\\\\\\\\\)\\((\\(?:?:\\)?\\|[|)]\\)" bound t)
(let ((face (get-text-property (1- (point)) 'face)))
(if (listp face)
(memq 'font-lock-string-face face)
(eq 'font-lock-string-face face)))))
(1 'font-lock-regexp-backslash prepend)
(2 'font-lock-regexp-backslash-construct prepend))
;; Underline innermost grouping, so that you can more easily see what
;; belongs together. 2005-05-12: Font-lock can go into an
;; unbreakable endless loop on this -- something's broken.
;;("[\\][\\][(]\\(?:\\?:\\)?\\(\\(?:[^\\\"]+\\|[\\]\\(?:[^\\]\\|[\\][^(]\\)\\)+?\\)[\\][\\][)]"
;;1 'underline prepend)
(catch 'found
;; The following loop is needed to continue searching after matches
;; that do not occur in strings. The associated regexp matches one
;; of `\\\\' `\\(' `\\(?:' `\\|' `\\)'. `\\\\' has been included to
;; avoid highlighting, for example, `\\(' in `\\\\('.
(while (re-search-forward "\\(\\\\\\\\\\)\\(?:\\(\\\\\\\\\\)\\|\\((\\(?:\\?:\\)?\\|[|)]\\)\\)" bound t)
(unless (match-beginning 2)
(let ((face (get-text-property (1- (point)) 'face)))
(when (or (and (listp face)
(memq 'font-lock-string-face face))
(eq 'font-lock-string-face face))
(throw 'found t)))))))
(1 'font-lock-regexp-grouping-backslash prepend)
(3 'font-lock-regexp-grouping-construct prepend))
;;; This is too general -- rms.
;;; A user complained that he has functions whose names start with `do'
;;; and that they get the wrong color.

41
lisp/gnus/ChangeLog
View File

@ -1,3 +1,44 @@
2005-07-04 Juanma Barranquero <lekktu@gmail.com>
* gnus.el (gnus-exit):
* gnus-group.el (gnus-group-icons):
* nnmail.el (nnmail-prepare): Fix typos in docstrings.
* gnus-nocem.el (gnus-nocem):
* message.el (message-various, message-buffers, message-sending)
(message-interface, message-forwarding, message-insertion)
(message-headers, message-news, message-mail):
* pgg-gpg.el (pgg-gpg):
* pgg-parse.el (pgg-parse):
* pgg-pgp.el (pgg-pgp):
* pgg-pgp5.el (pgg-pgp5):
* pop3.el (pop3): Finish `defgroup' description with period.
2005-07-01 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-art.el (article-display-face): Improve the efficiency.
(article-display-x-face): Ditto; remove grey x-face stuff.
2005-06-30 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-art.el (article-display-face): Correct the position in
which Faces are inserted; use dolist.
2005-06-29 Didier Verna <didier@xemacs.org>
* gnus-art.el (article-display-face): Display faces in correct
order.
2005-06-29 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-nocem.el (gnus-nocem-verifyer): Default to pgg-verify.
(gnus-nocem-check-article): Fetch the Type header.
(gnus-nocem-message-wanted-p): Fix the way to examine types.
(gnus-nocem-verify-issuer): Use functionp instead of fboundp.
(gnus-nocem-enter-article): Make sure gnus-nocem-hashtb is initialized.
* pgg.el (pgg-verify): Return the verification result.
2005-06-24 Juanma Barranquero <lekktu@gmail.com>
* gnus-art.el (gnus-article-mode): Set `nobreak-char-display', not

106
lisp/gnus/gnus-art.el
View File

@ -2123,31 +2123,31 @@ unfolded."
;; read-only.
(if (and wash-face-p (memq 'face gnus-article-wash-types))
(gnus-delete-images 'face)
(let (face faces)
(save-excursion
(let (face faces from)
(save-current-buffer
(when (and wash-face-p
(progn
(goto-char (point-min))
(not (re-search-forward "^Face:[\t ]*" nil t)))
(gnus-buffer-live-p gnus-original-article-buffer))
(gnus-buffer-live-p gnus-original-article-buffer)
(not (re-search-forward "^Face:[\t ]*" nil t)))
(set-buffer gnus-original-article-buffer))
(save-restriction
(mail-narrow-to-head)
(while (gnus-article-goto-header "Face")
(push (mail-header-field-value) faces))))
(while (setq face (pop faces))
(let ((png (gnus-convert-face-to-png face))
image)
(when png
(setq image (gnus-create-image png 'png t))
(gnus-article-goto-header "from")
(when (bobp)
(insert "From: [no `from' set]\n")
(forward-char -17))
(gnus-add-wash-type 'face)
(gnus-add-image 'face image)
(gnus-put-image image nil 'face))))))
)))
(when faces
(goto-char (point-min))
(let ((from (gnus-article-goto-header "from"))
png image)
(unless from
(insert "From:")
(setq from (point))
(insert "[no `from' set]\n"))
(while faces
(when (setq png (gnus-convert-face-to-png (pop faces)))
(setq image (gnus-create-image png 'png t))
(goto-char from)
(gnus-add-wash-type 'face)
(gnus-add-image 'face image)
(gnus-put-image image nil 'face))))))))))
(defun article-display-x-face (&optional force)
"Look for an X-Face header and display it if present."
@ -2164,13 +2164,10 @@ unfolded."
(gnus-delete-images 'xface)
;; Display X-Faces.
(let (x-faces from face)
(save-excursion
(save-current-buffer
(when (and wash-face-p
(progn
(goto-char (point-min))
(not (re-search-forward
"^X-Face\\(-[0-9]+\\)?:[\t ]*" nil t)))
(gnus-buffer-live-p gnus-original-article-buffer))
(gnus-buffer-live-p gnus-original-article-buffer)
(not (re-search-forward "^X-Face:[\t ]*" nil t)))
;; If type `W f', use gnus-original-article-buffer,
;; otherwise use the current buffer because displaying
;; RFC822 parts calls this function too.
@ -2184,35 +2181,36 @@ unfolded."
;; single external face.
(when (stringp gnus-article-x-face-command)
(setq x-faces (list (car x-faces))))
(while (and (setq face (pop x-faces))
gnus-article-x-face-command
(or force
;; Check whether this face is censored.
(not gnus-article-x-face-too-ugly)
(and gnus-article-x-face-too-ugly from
(not (string-match gnus-article-x-face-too-ugly
from)))))
;; We display the face.
(cond ((stringp gnus-article-x-face-command)
;; The command is a string, so we interpret the command
;; as a, well, command, and fork it off.
(let ((process-connection-type nil))
(gnus-set-process-query-on-exit-flag
(start-process
"article-x-face" nil shell-file-name
shell-command-switch gnus-article-x-face-command)
nil)
(with-temp-buffer
(insert face)
(process-send-region "article-x-face"
(point-min) (point-max)))
(process-send-eof "article-x-face")))
((functionp gnus-article-x-face-command)
;; The command is a lisp function, so we call it.
(funcall gnus-article-x-face-command face))
(t
(error "%s is not a function"
gnus-article-x-face-command)))))))))
(when (and x-faces
gnus-article-x-face-command
(or force
;; Check whether this face is censored.
(not gnus-article-x-face-too-ugly)
(and from
(not (string-match gnus-article-x-face-too-ugly
from)))))
(while (setq face (pop x-faces))
;; We display the face.
(cond ((stringp gnus-article-x-face-command)
;; The command is a string, so we interpret the command
;; as a, well, command, and fork it off.
(let ((process-connection-type nil))
(gnus-set-process-query-on-exit-flag
(start-process
"article-x-face" nil shell-file-name
shell-command-switch gnus-article-x-face-command)
nil)
(with-temp-buffer
(insert face)
(process-send-region "article-x-face"
(point-min) (point-max)))
(process-send-eof "article-x-face")))
((functionp gnus-article-x-face-command)
;; The command is a lisp function, so we call it.
(funcall gnus-article-x-face-command face))
(t
(error "%s is not a function"
gnus-article-x-face-command))))))))))
(defun article-decode-mime-words ()
"Decode all MIME-encoded words in the article."

2
lisp/gnus/gnus-group.el
View File

@ -382,7 +382,7 @@ ticked: The number of ticked articles."
:type 'character)
(defgroup gnus-group-icons nil
"Add Icons to your group buffer. "
"Add Icons to your group buffer."
:group 'gnus-group-visual)
(defcustom gnus-group-icon-list

26
lisp/gnus/gnus-nocem.el
View File

@ -1,6 +1,6 @@
;;; gnus-nocem.el --- NoCeM pseudo-cancellation treatment
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2004
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2004, 2005
;; Free Software Foundation, Inc.
@ -37,7 +37,7 @@
(require 'gnus-range)
(defgroup gnus-nocem nil
"NoCeM pseudo-cancellation treatment"
"NoCeM pseudo-cancellation treatment."
:group 'gnus-score)
(defcustom gnus-nocem-groups
@ -74,12 +74,13 @@ issuer registry."
:group 'gnus-nocem
:type 'integer)
(defcustom gnus-nocem-verifyer 'mc-verify
(defcustom gnus-nocem-verifyer 'pgg-verify
"*Function called to verify that the NoCeM message is valid.
One likely value is `mc-verify'. If the function in this variable
One likely value is `pgg-verify'. If the function in this variable
isn't bound, the message will be used unconditionally."
:group 'gnus-nocem
:type '(radio (function-item mc-verify)
:type '(radio (function-item pgg-verify)
(function-item mc-verify)
(function :tag "other")))
(defcustom gnus-nocem-liberal-fetch nil
@ -246,7 +247,7 @@ valid issuer, which is much faster if you are selective about the issuers."
;; We get the name of the issuer.
(narrow-to-region b e)
(setq issuer (mail-fetch-field "issuer")
type (mail-fetch-field "issuer"))
type (mail-fetch-field "type"))
(widen)
(if (not (gnus-nocem-message-wanted-p issuer type))
(message "invalid NoCeM issuer: %s" issuer)
@ -267,18 +268,20 @@ valid issuer, which is much faster if you are selective about the issuers."
(while (setq condition (pop conditions))
(cond
((stringp condition)
(setq wanted (string-match condition type)))
(when (string-match condition type)
(setq wanted t)))
((and (consp condition)
(eq (car condition) 'not)
(stringp (cadr condition)))
(setq wanted (not (string-match (cadr condition) type))))
(when (string-match (cadr condition) type)
(setq wanted nil)))
(t
(error "Invalid NoCeM condition: %S" condition))))
wanted))))
(defun gnus-nocem-verify-issuer (person)
"Verify using PGP that the canceler is who she says she is."
(if (fboundp gnus-nocem-verifyer)
(if (functionp gnus-nocem-verifyer)
(ignore-errors
(funcall gnus-nocem-verifyer))
;; If we don't have Mailcrypt, then we use the message anyway.
@ -315,7 +318,10 @@ valid issuer, which is much faster if you are selective about the issuers."
(while (eq (char-after) ?\t)
(forward-line -1))
(setq id (buffer-substring (point) (1- (search-forward "\t"))))
(unless (gnus-gethash id gnus-nocem-hashtb)
(unless (if gnus-nocem-hashtb
(gnus-gethash id gnus-nocem-hashtb)
(setq gnus-nocem-hashtb (gnus-make-hashtable))
nil)
;; only store if not already present
(gnus-sethash id t gnus-nocem-hashtb)
(push id ncm))

2
lisp/gnus/gnus.el
View File

@ -273,7 +273,7 @@ is restarted, and sometimes reloaded."
:group 'gnus)
(defgroup gnus-exit nil
"Exiting gnus."
"Exiting Gnus."
:link '(custom-manual "(gnus)Exiting Gnus")
:group 'gnus)

18
lisp/gnus/message.el
View File

@ -62,46 +62,46 @@
(put 'user-full-name 'custom-type 'string)
(defgroup message-various nil
"Various Message Variables"
"Various Message Variables."
:link '(custom-manual "(message)Various Message Variables")
:group 'message)
(defgroup message-buffers nil
"Message Buffers"
"Message Buffers."
:link '(custom-manual "(message)Message Buffers")
:group 'message)
(defgroup message-sending nil
"Message Sending"
"Message Sending."
:link '(custom-manual "(message)Sending Variables")
:group 'message)
(defgroup message-interface nil
"Message Interface"
"Message Interface."
:link '(custom-manual "(message)Interface")
:group 'message)
(defgroup message-forwarding nil
"Message Forwarding"
"Message Forwarding."
:link '(custom-manual "(message)Forwarding")
:group 'message-interface)
(defgroup message-insertion nil
"Message Insertion"
"Message Insertion."
:link '(custom-manual "(message)Insertion")
:group 'message)
(defgroup message-headers nil
"Message Headers"
"Message Headers."
:link '(custom-manual "(message)Message Headers")
:group 'message)
(defgroup message-news nil
"Composing News Messages"
"Composing News Messages."
:group 'message)
(defgroup message-mail nil
"Composing Mail Messages"
"Composing Mail Messages."
:group 'message)
(defgroup message-faces nil

2
lisp/gnus/nnmail.el
View File

@ -49,7 +49,7 @@
:group 'nnmail)
(defgroup nnmail-prepare nil
"Preparing (or mangling) new mail after retrival."
"Preparing (or mangling) new mail after retrieval."
:group 'nnmail)
(defgroup nnmail-duplicate nil

2
lisp/gnus/pgg-gpg.el
View File

@ -30,7 +30,7 @@
(require 'pgg))
(defgroup pgg-gpg ()
"GnuPG interface"
"GnuPG interface."
:group 'pgg)
(defcustom pgg-gpg-program "gpg"

2
lisp/gnus/pgg-parse.el
View File

@ -40,7 +40,7 @@
(require 'custom)
(defgroup pgg-parse ()
"OpenPGP packet parsing"
"OpenPGP packet parsing."
:group 'pgg)
(defcustom pgg-parse-public-key-algorithm-alist

2
lisp/gnus/pgg-pgp.el
View File

@ -30,7 +30,7 @@
(require 'pgg))
(defgroup pgg-pgp ()
"PGP 2.* and 6.* interface"
"PGP 2.* and 6.* interface."
:group 'pgg)
(defcustom pgg-pgp-program "pgp"

2
lisp/gnus/pgg-pgp5.el
View File

@ -30,7 +30,7 @@
(require 'pgg))
(defgroup pgg-pgp5 ()
"PGP 5.* interface"
"PGP 5.* interface."
:group 'pgg)
(defcustom pgg-pgp5-pgpe-program "pgpe"

3
lisp/gnus/pgg.el
View File

@ -380,7 +380,8 @@ within the region."
(with-output-to-temp-buffer pgg-echo-buffer
(set-buffer standard-output)
(insert-buffer-substring (if status pgg-output-buffer
pgg-errors-buffer)))))))
pgg-errors-buffer)))))
status))
;;;###autoload
(defun pgg-insert-key ()

2
lisp/gnus/pop3.el
View File

@ -39,7 +39,7 @@
(require 'mail-utils)
(defgroup pop3 nil
"Post Office Protocol"
"Post Office Protocol."
:group 'mail
:group 'mail-source)

4
lisp/help-fns.el
View File

@ -275,9 +275,9 @@ face (according to `face-differs-from-default-p')."
;; This is heuristic, but covers all common cases
;; except ARG1-ARG2
(concat "\\<" ; beginning of word
"\\(?:[a-z-]+-\\)?" ; for xxx-ARG
"\\(?:[a-z-]*-\\)?" ; for xxx-ARG
"\\("
arg
(regexp-quote arg)
"\\)"
"\\(?:es\\|s\\|th\\)?" ; for ARGth, ARGs
"\\(?:-[a-z-]+\\)?" ; for ARG-xxx

2
lisp/imenu.el
View File

@ -877,7 +877,7 @@ Return one of the entries in index-alist or nil."
(if (not imenu-space-replacement) index-alist
(mapcar
(lambda (item)
(cons (subst-char-in-string ?\ (aref imenu-space-replacement 0)
(cons (subst-char-in-string ?\s (aref imenu-space-replacement 0)
(car item))
(cdr item)))
index-alist))))

2
lisp/indent.el
View File

@ -29,7 +29,7 @@
;;; Code:
(defgroup indent nil
"Indentation commands"
"Indentation commands."
:group 'editing)
(defcustom standard-indent 4

6
lisp/info.el
View File

@ -38,7 +38,7 @@
(eval-when-compile (require 'jka-compr))
(defgroup info nil
"Info subsystem"
"Info subsystem."
:group 'help
:group 'docs)
@ -2868,7 +2868,7 @@ Build a menu of the possible matches."
(while (progn (setq flag (not (pos-visible-in-window-p (point-max))))
(message (if flag "Type Space to see more"
"Type Space to return to Info"))
(if (not (eq ?\ (setq ch (read-event))))
(if (not (eq ?\s (setq ch (read-event))))
(progn (setq unread-command-events (list ch)) nil)
flag))
(scroll-up)))
@ -3196,6 +3196,8 @@ With a zero prefix arg, put the name inside a function call to `info'."
(put 'Info-mode 'mode-class 'special)
(put 'Info-mode 'no-clone-indirect t)
(defvar tool-bar-map)
(defun Info-mode ()
"Info mode provides commands for browsing through the Info documentation tree.
Documentation in Info is divided into \"nodes\", each of which discusses

4
lisp/jka-cmpr-hook.el
View File

@ -32,11 +32,11 @@
;;; Code:
(defgroup compression nil
"Data compression utilities"
"Data compression utilities."
:group 'data)
(defgroup jka-compr nil
"jka-compr customization"
"jka-compr customization."
:group 'compression)
;;; I have this defined so that .Z files are assumed to be in unix

4
lisp/lpr.el
View File

@ -41,7 +41,7 @@
(defgroup lpr nil
"Print Emacs buffer on line printer"
"Print Emacs buffer on line printer."
:group 'wp)
@ -291,7 +291,7 @@ The characters tab, linefeed, space, return and formfeed are not affected."
(while (re-search-forward "[\^@-\^h\^k\^n-\^_\177-\377]" nil t)
(setq c (preceding-char))
(delete-backward-char 1)
(insert (if (< c ?\ )
(insert (if (< c ?\s)
(format "\\^%c" (+ c ?@))
(format "\\%02x" c))))))))

2
lisp/mail/mailalias.el
View File

@ -33,7 +33,7 @@
(require 'sendmail)
(defgroup mailalias nil
"Expanding mail aliases"
"Expanding mail aliases."
:group 'mail)
(defcustom mail-passwd-files '("/etc/passwd")

34
lisp/mail/rmailsum.el
View File

@ -54,6 +54,14 @@
("{ \\([^\n}]+\\) }" 1 font-lock-comment-face)) ; Labels.
"Additional expressions to highlight in Rmail Summary mode.")
(defvar rmail-summary-redo
"(FUNCTION . ARGS) to regenerate this Rmail summary buffer.")
(defvar rmail-summary-overlay nil)
(put 'rmail-summary-overlay 'permanent-local t)
(defvar rmail-summary-mode-map nil)
;; Entry points for making a summary buffer.
;; Regenerate the contents of the summary
@ -165,6 +173,8 @@ SENDERS is a string of names separated by commas."
(defvar rmail-summary-symbol-number 0)
(defvar rmail-new-summary-line-count)
(defun rmail-new-summary (description redo-form function &rest args)
"Create a summary of selected messages.
DESCRIPTION makes part of the mode line of the summary buffer.
@ -187,7 +197,7 @@ nil for FUNCTION means all messages."
(setq mesg rmail-current-message)
;; Filter the messages; make or get their summary lines.
(let ((summary-msgs ())
(new-summary-line-count 0))
(rmail-new-summary-line-count 0))
(let ((msgnum 1)
(buffer-read-only nil)
(old-min (point-min-marker))
@ -263,11 +273,11 @@ nil for FUNCTION means all messages."
(defun rmail-make-summary-line (msg)
(let ((line (or (aref rmail-summary-vector (1- msg))
(progn
(setq new-summary-line-count
(1+ new-summary-line-count))
(if (zerop (% new-summary-line-count 10))
(setq rmail-new-summary-line-count
(1+ rmail-new-summary-line-count))
(if (zerop (% rmail-new-summary-line-count 10))
(message "Computing summary lines...%d"
new-summary-line-count))
rmail-new-summary-line-count))
(rmail-make-summary-line-1 msg)))))
;; Fix up the part of the summary that says "deleted" or "unseen".
(aset line 5
@ -842,8 +852,6 @@ Search, the `unseen' attribute is restored.")
(rmail-show-message msg-num t))))))
(rmail-summary-update-highlight nil)))))
(defvar rmail-summary-mode-map nil)
(if rmail-summary-mode-map
nil
(setq rmail-summary-mode-map (make-keymap))
@ -1037,9 +1045,6 @@ Search, the `unseen' attribute is restored.")
(define-key rmail-summary-mode-map [menu-bar move next]
'("Next" . rmail-summary-next-all))
(defvar rmail-summary-overlay nil)
(put 'rmail-summary-overlay 'permanent-local t)
(defun rmail-summary-mouse-goto-message (event)
"Select the message whose summary line you click on."
(interactive "@e")
@ -1191,7 +1196,8 @@ move to the previous message."
(or (eq buffer (window-buffer (next-window (frame-first-window))))
(delete-other-windows)))
(pop-to-buffer rmail-view-buffer))
(beginning-of-buffer)
(with-no-warnings
(beginning-of-buffer))
(pop-to-buffer rmail-summary-buffer))
(defun rmail-summary-bury ()
@ -1275,12 +1281,14 @@ argument says to read a file name and use that file as the inbox."
(defun rmail-summary-first-message ()
"Show first message in Rmail file from summary buffer."
(interactive)
(beginning-of-buffer))
(with-no-warnings
(beginning-of-buffer)))
(defun rmail-summary-last-message ()
"Show last message in Rmail file from summary buffer."
(interactive)
(end-of-buffer)
(with-no-warnings
(end-of-buffer))
(forward-line -1))
(defvar rmail-summary-edit-map nil)

12
lisp/mail/supercite.el
View File

@ -44,28 +44,28 @@
;; vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
(defgroup supercite nil
"Supercite package"
"Supercite package."
:prefix "sc-"
:group 'mail
:group 'news)
(defgroup supercite-frames nil
"Supercite (regi) frames"
"Supercite (regi) frames."
:prefix "sc-"
:group 'supercite)
(defgroup supercite-attr nil
"Supercite attributions"
"Supercite attributions."
:prefix "sc-"
:group 'supercite)
(defgroup supercite-cite nil
"Supercite citings"
"Supercite citings."
:prefix "sc-"
:group 'supercite)
(defgroup supercite-hooks nil
"Hooking into supercite"
"Hooking into supercite."
:prefix "sc-"
:group 'supercite)
@ -1317,6 +1317,8 @@ use it instead of `sc-citation-root-regexp'."
sc-citation-delimiter
sc-citation-separator))
(defvar filladapt-prefix-table)
(defun sc-setup-filladapt ()
"Setup `filladapt-prefix-table' to handle Supercited paragraphs."
(let* ((fa-sc-elt 'filladapt-supercite-included-text)

3
lisp/makefile.w32-in
View File

@ -312,8 +312,11 @@ bootstrap-clean-SH:
-for dir in . $(WINS); do rm -f $$dir/*.elc; done
# Generate/update files for the bootstrap process.
# When done, remove bootstrap-emacs from ../bin, so that
# it will not be mistaken for an installed binary.
bootstrap: update-subdirs autoloads compile finder-data custom-deps
- $(DEL) $(EMACS)
#
# Assuming INSTALL_DIR is defined, copy the elisp files to it

2
lisp/mouse.el
View File

@ -1857,7 +1857,7 @@ and selects that window."
(string< (buffer-name elt1) (buffer-name elt2))))))
(setq tail buffers)
(while tail
(or (eq ?\ (aref (buffer-name (car tail)) 0))
(or (eq ?\s (aref (buffer-name (car tail)) 0))
(setq maxlen
(max maxlen
(length (buffer-name (car tail))))))

2
lisp/msb.el
View File

@ -489,7 +489,7 @@ See the function `mouse-select-buffer' and the variable
"Return t if optional BUFFER is an \"invisible\" buffer.
If the argument is left out or nil, then the current buffer is considered."
(and (> (length (buffer-name buffer)) 0)
(eq ?\ (aref (buffer-name buffer) 0))))
(eq ?\s (aref (buffer-name buffer) 0))))
(defun msb--strip-dir (dir)
"Strip one hierarchy level from the end of DIR."

2
lisp/net/browse-url.el
View File

@ -799,6 +799,8 @@ to use."
;; --- Default MS-Windows browser ---
(defvar dos-windows-version)
(defun browse-url-default-windows-browser (url &optional new-window)
(interactive (browse-url-interactive-arg "URL: "))
(if (eq system-type 'ms-dos)

2
lisp/net/rcompile.el
View File

@ -70,7 +70,7 @@
;;;; user defined variables
(defgroup remote-compile nil
"Run a compilation on a remote machine"
"Run a compilation on a remote machine."
:group 'processes
:group 'tools)

2
lisp/net/rlogin.el
View File

@ -41,7 +41,7 @@
(require 'shell)
(defgroup rlogin nil
"Remote login interface"
"Remote login interface."
:group 'processes
:group 'unix)

2
lisp/newcomment.el
View File

@ -502,7 +502,7 @@ Point is assumed to be just at the end of a comment."
(or (match-end 1) (/= (current-column) (current-indentation))))
0
(when (or (/= (current-column) (current-indentation))
(and (> comment-add 0) (looking-at "\\s<\\S<")))
(and (> comment-add 0) (looking-at "\\s<\\(\\S<\\|\\'\\)")))
comment-column)))
;;;###autoload

2
lisp/obsolete/ooutline.el
View File

@ -33,7 +33,7 @@
;; Jan '86, Some new features added by Peter Desnoyers and rewritten by RMS.
(defgroup outlines nil
"Support for hierarchical outlining"
"Support for hierarchical outlining."
:prefix "outline-"
:group 'editing)

2
lisp/outline.el
View File

@ -38,7 +38,7 @@
;;; Code:
(defgroup outlines nil
"Support for hierarchical outlining"
"Support for hierarchical outlining."
:prefix "outline-"
:group 'editing)

2
lisp/pcmpl-cvs.el
View File

@ -33,7 +33,7 @@
(require 'executable)
(defgroup pcmpl-cvs nil
"Functions for dealing with CVS completions"
"Functions for dealing with CVS completions."
:group 'pcomplete)
;; User Variables:

2
lisp/pcmpl-rpm.el
View File

@ -30,7 +30,7 @@
(require 'pcomplete)
(defgroup pcmpl-rpm nil
"Functions for dealing with CVS completions"
"Functions for dealing with CVS completions."
:group 'pcomplete)
;; Functions:

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