procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from emacs--devo--0

Browse source 
Patches applied:

 * emacs--devo--0  (patch 523-544)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 168-171)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-150
This commit is contained in:
Miles Bader 2006-12-07 04:14:14 +00:00
commit a0451a715e
290 changed files with 3719 additions and 2022 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -38,5 +38,6 @@ config.cache
Makefile
emacs*.tar.gz
leim*.tar.gz
lock
*.xdelta
autom4te.cache

2
AUTHORS
View file

@ -154,8 +154,6 @@ Andy Norman: wrote ange-ftp.el
Andy Petrusenco: changed w32term.c
Anna Bigatti: changed cal-html.el
Anna M. Bigatti: wrote cal-html.el
Ari Roponen: changed atimer.c startup.el

102
ChangeLog
View file

@ -1,3 +1,28 @@
2006-12-04 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* configure.in (HAVE_SYNC): New test.
* configure: Regenerate.
2006-12-03 Glenn Morris <rgm@gnu.org>
* Makefile.in: Fix Copyright format.
* configure.in (AH_TOP): Add missing Copyright year.
* update-subdirs: Add missing Copyright years.
2006-11-27 Chris Moore <christopher.ian.moore@gmail.com> (tiny change)
* Makefile.in: Touch only the parts of the share/emacs directory
specific to this version.
2006-11-26 Chong Yidong <cyd@stupidchicken.com>
* configure.in (HAVE_X86_64_LIB64_DIR): New test.
* configure: Regenerate.
2006-11-14 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* configure.in (HAVE_CANCELMENUTRACKING): Remove test.
@ -356,7 +381,7 @@
Update FSF's address in GPL notices.
2005-06-19 J,bi(Br,bt(Bme Marant <jerome@marant.org>
2005-06-19 J,Ai(Br,At(Bme Marant <jerome@marant.org>
* Makefile.in (epaths-force): Protect both lisppath and
buildlisppath from whitespace.
@ -445,7 +470,7 @@
* Makefile.in (install-arch-indep, uninstall): Add url and org
manuals.
2004-12-07 Stefan <monnier@iro.umontreal.ca>
2004-12-07 Stefan Monnier <monnier@iro.umontreal.ca>
* configure.in (INLINE, RE_TRANSLATE_P): Move patches mistakenly
committed to src/config.in.
@ -515,7 +540,7 @@
* configure.in (HAVE_RANDOM_HEAPSTART): Change AC_MSG_ERROR to
AC_MSG_WARN. Move output of warning message to end of configure run.
2004-10-05 Jan Dj,Ad(Brv. <jan.h.d@swipnet.se>
2004-10-05 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* configure.in (HAVE_RANDOM_HEAPSTART): Rename HAVE_EXECSHIELD.
Run test to see if heap start address is random.
@ -637,7 +662,7 @@
* configure.in <darwin>: Use fink packages if available.
2004-01-25 Jerome Marant <jmarant@free.fr> (tiny change)
2004-01-25 J,Ai(Br,At(Bme Marant <jmarant@free.fr> (tiny change)
* make-dist (lispref): Do include lispref/index.texi.
@ -946,7 +971,7 @@
* configure.in (*-sunos5*, *-solaris*): Use sol2-8.
2002-11-14 Francesco Potorti` <pot@gnu.org>
2002-11-14 Francesco Potort,Al(B <pot@gnu.org>
* configure.in (*-sunos5.8*, *-solaris2.8*): New configurations.
@ -1200,7 +1225,7 @@
These changes make Leim part of the standard distribution:
* README: Add info about the `leim' directory
* README: Add info about the `leim' directory.
* INSTALL: Remove text that describes Leim as a separate package.
@ -1768,8 +1793,7 @@
2000-08-24 Gerd Moellmann <gerd@gnu.org>
* configure.in <making srcdir absolute>: Unset CDPATH in case $PWD
contains a relative path. Protect against unusable values of
$PWD.
contains a relative path. Protect against unusable values of $PWD.
2000-08-08 Eli Zaretskii <eliz@is.elta.co.il>
@ -1780,8 +1804,7 @@
2000-08-07 Gerd Moellmann <gerd@gnu.org>
* Makefile.in (config.status): Prepend `$(srcdir)/' to
`configure'.
* Makefile.in (config.status): Prepend `$(srcdir)/' to `configure'.
2000-08-03 Gerd Moellmann <gerd@gnu.org>
@ -2147,7 +2170,7 @@
1999-08-18 Dave Love <fx@gnu.org>
* configure.in: : Check for termcap.h.
* configure.in: Check for termcap.h.
1999-08-15 Gerd Moellmann <gerd@gnu.org>
@ -2260,8 +2283,8 @@
1998-12-04 Andreas Schwab <schwab@delysid.gnu.org>
* Makefile.in: Don't install customize info file. Run
install-info on viper info file.
* Makefile.in: Don't install customize info file.
Run install-info on viper info file.
1998-11-29 Richard Stallman <rms@psilocin.ai.mit.edu>
@ -2481,7 +2504,7 @@
1997-09-30 Karl Eichwalder <ke@suse.de>
* Makefile.in (install-arch-indep): install the widget info file.
* Makefile.in (install-arch-indep): Install the widget info file.
1997-09-24 Jonathan I. Kamens <jik@kamens.brookline.ma.us>
@ -2493,8 +2516,7 @@
1997-09-21 Erik Naggum <erik@naggum.no>
* make-dist (making links to `src'): Keep timestamp on copied
files.
* make-dist (making links to `src'): Keep timestamp on copied files.
* make-delta: New script to produce delta distributions.
@ -2655,7 +2677,7 @@
* make-dist (etc): Really avoid symlinks now.
(lisp): Don't delete from subdirs the things we never copy.
1997-07-07 Ken'ichi Handa <handa@psilocin.gnu.ai.mit.edu>
1997-07-07 Kenichi Handa <handa@psilocin.gnu.ai.mit.edu>
* Makefile.in (install-arch-indep): Correct the target name.
The first letter `i' was dropped by the previous change of mine.
@ -2680,12 +2702,12 @@
* Makefile.in (install-leim): Correct previous change.
1997-07-02 Ken'ichi Handa <handa@psilocin.gnu.ai.mit.edu>
1997-07-02 Kenichi Handa <handa@psilocin.gnu.ai.mit.edu>
* Makefile.in (install-leim): New target.
(install): Depend on install-leim.
1997-07-01 Ken'ichi Handa <handa@psilocin.gnu.ai.mit.edu>
1997-07-01 Kenichi Handa <handa@psilocin.gnu.ai.mit.edu>
* Makefile.in (SUBDIR): Add leim.
(SUBDIR_MAKEFILES): Add leim/Makefile.
@ -2721,16 +2743,14 @@
1997-06-22 Dave Love <d.love@dl.ac.uk>
* Makefile.in (lib-src): Depend on src/config.h (e.g. for
movemail.o).
(src/config.h): New target to re-configure if src/config.in
is patched.
* Makefile.in (lib-src): Depend on src/config.h (e.g. for movemail.o).
(src/config.h): New target to re-configure if src/config.in is patched.
1997-06-18 Richard Stallman <rms@psilocin.gnu.ai.mit.edu>
* configure.in (shutdown): Check for `shutdown' function.
1997-06-18 Ken'ichi Handa <handa@psilocin.gnu.ai.mit.edu>
1997-06-18 Kenichi Handa <handa@psilocin.gnu.ai.mit.edu>
* update-subdirs: Include the directory "language" in subdirs.
@ -2767,15 +2787,14 @@
1997-04-09 Marcus G. Daniels <marcus@cathcart.sysc.pdx.edu>
* configure.in (doug_lea_malloc): First check for SYSTEM_MALLOC,
in case it is desirable to disable the GNU malloc features with
glibc.
in case it is desirable to disable the GNU malloc features with glibc.
1997-04-08 Marcus G. Daniels <marcus@cathcart.sysc.pdx.edu>
* configure.in (DOUG_LEA_MALLOC):
Define if malloc_{get,set}_state exist.
1997-03-05 Ken'ichi Handa <handa@etl.go.jp>
1997-03-05 Kenichi Handa <handa@etl.go.jp>
* make-dist: Make links for files under lisp/language.
@ -2967,7 +2986,7 @@
1996-07-11 Bill Mann <dvmann@dvncr.praxisint.com>
* configure.in: Use s/usg5-4-3.h for ncr-i[3456]86-sysv4.3
* configure.in: Use s/usg5-4-3.h for ncr-i[3456]86-sysv4.3.
1996-07-07 Karl Heuer <kwzh@gnu.ai.mit.edu>
@ -3490,8 +3509,8 @@
1995-06-22 Paul Eggert <eggert@twinsun.com>
* configure.in: Treat SunOS 4.1.4 like SunOS 4.1.3.
(Likewise for SunOS 4.1.5 thorugh 4.1.9, should they ever exist.)
* configure.in: Treat SunOS 4.1.4 like SunOS 4.1.3. (Likewise for
SunOS 4.1.5 thorugh 4.1.9, should they ever exist.)
1995-06-22 Paul Eggert <eggert@twinsun.com>
@ -3563,7 +3582,7 @@
1995-05-22 enami tsugutomo <enami@sys.ptg.sony.co.jp>
* configure.in: pass arg to sqrt.
* configure.in: Pass arg to sqrt.
1995-05-18 Karl Heuer <kwzh@hal.gnu.ai.mit.edu>
@ -3575,8 +3594,7 @@
1995-05-09 David J. MacKenzie <djm@geech.gnu.ai.mit.edu>
* configure.in: Use sqrt (more portable) instead of fmod in -lm
check.
* configure.in: Use sqrt (more portable) instead of fmod in -lm check.
1995-05-09 Richard Stallman <rms@mole.gnu.ai.mit.edu>
@ -3593,9 +3611,9 @@
1995-05-06 David J. MacKenzie <djm@geech.gnu.ai.mit.edu>
* configure.in: Make sure CDPATH doesn't mess up PWD check. Check
whether X bitmaps are in X11/bitmaps instead of bitmaps. Use fmod
instead of logb in -lm check.
* configure.in: Make sure CDPATH doesn't mess up PWD check.
Check whether X bitmaps are in X11/bitmaps instead of bitmaps.
Use fmod instead of logb in -lm check.
1995-05-03 Richard Stallman <rms@mole.gnu.ai.mit.edu>
@ -3615,7 +3633,7 @@
* configure.in (*-sun-sunos4.1.3*): Use shared libraries,
since that's what the header file expects.
1995-04-24 Francesco Potorti` (pot@cnuce.cnr.it)
1995-04-24 Francesco Potort,Al(B (pot@cnuce.cnr.it)
* configure.in (m68k-motorola-sysv*): Distinguish between 68030
and 68040 based machines when choosing options for gnucc.
@ -3644,7 +3662,7 @@
1995-04-06 Simon Leinen <simon@lia.di.epfl.ch>
* Makefile.in (install-arch-indep, dist):
look for `update-subdir' in $(srcdir).
Look for `update-subdir' in $(srcdir).
1995-04-06 Richard Stallman <rms@mole.gnu.ai.mit.edu>
@ -3680,8 +3698,8 @@
1995-02-02 David J. MacKenzie <djm@geech.gnu.ai.mit.edu>
* configure.in: Create a .gdbinit that sources the real one, if
using a different build directory.
* configure.in: Create a .gdbinit that sources the real one,
if using a different build directory.
1995-01-23 Karl Heuer <kwzh@hal.gnu.ai.mit.edu>
@ -6396,8 +6414,8 @@
;; add-log-time-zone-rule: t
;; End:
Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2006
Free Software Foundation, Inc.
Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
2003, 2004, 2005, 2006 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted provided the copyright notice and this notice are preserved.

4
INSTALL
View file

@ -1,6 +1,6 @@
GNU Emacs Installation Guide
Copyright (c) 1992, 1994, 1996, 1997, 2000, 2001, 2002, 2006
Free software Foundation, Inc.
Copyright (c) 1992, 1994, 1996, 1997, 2000, 2001, 2002, 2003, 2004,
2005, 2006 Free Software Foundation, Inc.
See the end of the file for copying permissions.

6
Makefile.in
View file

@ -2,8 +2,8 @@
# DIST: make most of the changes to this file you might want, so try
# DIST: that first.
# Copyright (C) 1992,93,94,95,96,97,98,1999,2000,01,02,03,04,2005,2006
# Free Software Foundation, Inc.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
# 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
@ -518,7 +518,7 @@ install-arch-indep: mkdir info
${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
done; \
else true; fi
-chmod -R a+r $(DESTDIR)${datadir}/emacs ${COPYDESTS} $(DESTDIR)${infodir}
-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} $(DESTDIR)${datadir}/emacs/site-lisp ${COPYDESTS} $(DESTDIR)${infodir}
thisdir=`/bin/pwd`; \
cd ${srcdir}/etc; \
for page in emacs emacsclient etags ctags ; do \

48
README
View file

@ -1,28 +1,29 @@
This directory tree holds version 22.0.91 of GNU Emacs, the extensible,
customizable, self-documenting real-time display editor.
You may encounter bugs in this release. If you do, please report
them; your bug reports are valuable contributions to the FSF, since
they allow us to notice and fix problems on machines we don't have, or
in code we don't use often. See the file BUGS for more information on
how to report bugs.
The file INSTALL in this directory says how to build and install GNU
Emacs on various systems, once you have unpacked or checked out the
entire Emacs file tree.
See the file etc/NEWS for information on new features and other
user-visible changes in recent versions of Emacs.
The file INSTALL in this directory says how to bring up GNU Emacs on
various systems, once you have loaded the entire subtree of this
directory.
The file etc/PROBLEMS contains information on many common problems that
occur in building, installing and running Emacs.
Reports of bugs in Emacs should be sent to the mailing list
bug-gnu-emacs@gnu.org. See the "Bugs" section of the Emacs
manual for more information on how to report bugs. (The file `BUGS'
in this directory explains how you can find and read that section
using the Info files that come with Emacs.) See `etc/MAILINGLISTS'
for more information on mailing lists relating to GNU packages.
You may encounter bugs in this release. If you do, please report
them; your bug reports are valuable contributions to the FSF, since
they allow us to notice and fix problems on machines we don't have, or
in code we don't use often. Please send bug reports for released
versions of Emacs sent to the mailing list bug-gnu-emacs@gnu.org.
Please send bug reports for pretest versions of Emacs, and versions
from the Savannah.gnu.org repository, to emacs-pretest-bugs@gnu.org.
See the "Bugs" section of the Emacs manual for more information on how
to report bugs. (The file `BUGS' in this directory explains how you
can find and read that section using the Info files that come with
Emacs.) See `etc/MAILINGLISTS' for more information on mailing lists
relating to GNU packages.
The `etc' subdirectory contains several other files, named in capital
letters, which you might consider looking at when installing GNU
@ -86,20 +87,3 @@ There are several subdirectories:
that aren't part of the standard distribution of the OS. The
platform-specific README files and installation instructions should
list the required tools.
VMS info:
Emacs 19.x and above do not compile out of the box on OpenVMS.
Richard Levitte <levitte@lp.se> is distributing and maintaining a
version of Emacs (currently based on version 19.28, but soon moving to
19.34 and then 20.1) that compiles and works on OpenVMS 5.5 and above
on both VAX and Alpha architectures. For more information see
http://www.lp.se/gnu-vms/software/released1/emacs.html
There is also some effort going on with Emacs 21. Source code is
available at ftp://ftp.nvg.ntnu.no/pub/vms/emacs/. Look for most
recent stuff with ls -lta.
It is a working "development" version (editing and much more works).
More developers are needed; contact roart@nvg.ntnu.no.

8
admin/ChangeLog
View file

@ -1,3 +1,8 @@
2006-11-25 Juanma Barranquero <lekktu@gmail.com>
* admin.el (set-version): Set version number in
lib-src/makefile.w32-in.
2006-11-06 Reiner Steib <Reiner.Steib@gmx.de>
* FOR-RELEASE (BUGS): Remove "Build failure under Suse 10.0" was
@ -395,7 +400,8 @@
;; add-log-time-zone-rule: t
;; End:
Copyright (C) 2001 Free Software Foundation, Inc.
Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software
Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted provided the copyright notice and this notice are preserved.

14
admin/FOR-RELEASE
View file

@ -43,11 +43,21 @@ to the hack introduced on 2005-07-01 to fix some other Cleartype problem.
* BUGS
** make-network-process :nowait t doesn't work for non-local targets
on Windows.
If it cannot be fixed, (featurep 'make-network-process '(:nowait t))
should return nil.
** Document use of gpg-agent
** seltenreich@gmx.de, Nov 19: Failed assertion on make-frame-on-display
** monnier@iro.umontreal.ca, Nov 24:
gnus-summary-tick-article-forward doesn't work any more?
** jbuehler@spirentcom.com, Nov 20: AIX 5.2 loadup failure
** christopher.ian.moore@gmail.com, Nov 30: too much recursion in gnus-sort-threads-1.
** dooglus@gmail.com, Dec 1: Replacement of spaces in wdired
** Should CC mode set beginning-of-defun-function?
* DOCUMENTATION

6
admin/admin.el
View file

@ -1,6 +1,7 @@
;;; admin.el --- utilities for Emacs administration
;; Copyright (C) 2001, 2005 Free Software Foundation, Inc.
;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software
;; Foundation, Inc.
;; This file is part of GNU Emacs.
@ -88,6 +89,9 @@ Root must be the root of an Emacs source tree."
(set-version-in-file root "lispref/elisp.texi" version
(rx (and "EMACSVER" (1+ space)
(submatch (1+ (in "0-9."))))))
(set-version-in-file root "lib-src/makefile.w32-in" version
(rx (and "VERSION" (0+ space) "=" (0+ space)
(submatch (1+ (in "0-9."))))))
;; nt/emacs.rc also contains the version number, but in an awkward
;; format. It must contain four components, separated by commas, and
;; in two places those commas are followed by space, in two other

3
admin/alloc-colors.c
View file

@ -1,5 +1,6 @@
/* Allocate X colors. Used for testing with dense colormaps.
Copyright (C) 2001, 2006 Free Software Foundation, Inc.
Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software
Foundation, Inc.
This file is part of GNU Emacs.

3
admin/build-configs
View file

@ -1,6 +1,7 @@
#! /usr/bin/perl
# Copyright (C) 2001, 2006 Free Software Foundation, Inc.
# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software
# Foundation, Inc.
#
# This file is part of GNU Emacs.
#

3
admin/cus-test.el
View file

@ -1,6 +1,7 @@
;;; cus-test.el --- tests for custom types and load problems
;; Copyright (C) 1998, 2000, 2002, 2006 Free Software Foundation, Inc.
;; Copyright (C) 1998, 2000, 2002, 2003, 2004, 2005, 2006 Free
;; Software Foundation, Inc.
;; Author: Markus Rost <markus.rost@mathematik.uni-regensburg.de>
;; Maintainer: Markus Rost <rost@math.ohio-state.edu>

3
admin/diff-tar-files
View file

@ -1,6 +1,7 @@
#! /bin/sh
# Copyright (C) 2001, 2006 Free Software Foundation, Inc.
# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software
# Foundation, Inc.
#
# This file is part of GNU Emacs.
#

3
admin/make-emacs
View file

@ -1,6 +1,7 @@
#! /usr/bin/perl
# Copyright (C) 2001, 2006 Free Software Foundation, Inc.
# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software
# Foundation, Inc.
#
# This file is part of GNU Emacs.
#

3
admin/revdiff
View file

@ -1,6 +1,7 @@
#! /usr/bin/perl
# Copyright (C) 2001, 2006 Free Software Foundation, Inc.
# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software
# Foundation, Inc.
#
# This file is part of GNU Emacs.
#

4
config.bat
View file

@ -1,8 +1,8 @@
@echo off
rem ----------------------------------------------------------------------
rem Configuration script for MSDOS
rem Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2004, 2006
rem Free Software Foundation, Inc.
rem Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003
rem 2004, 2005, 2006 Free Software Foundation, Inc.
rem This file is part of GNU Emacs.

16
configure vendored
View file

@ -5193,6 +5193,19 @@ fi
### The standard library on x86-64 GNU/Linux distributions can
### be located in either /usr/lib64 or /usr/lib.
case "${canonical}" in
x86_64-*-linux-gnu* )
if test -d /usr/lib64; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_X86_64_LIB64_DIR 1
_ACEOF
fi
esac
@ -15095,6 +15108,7 @@ done
for ac_func in gethostname getdomainname dup2 \
@ -15104,7 +15118,7 @@ strerror fpathconf select mktime euidaccess getpagesize tzset setlocale \
utimes setrlimit setpgid getcwd getwd shutdown getaddrinfo \
__fpending mblen mbrlen mbsinit strsignal setitimer ualarm index rindex \
sendto recvfrom getsockopt setsockopt getsockname getpeername \
gai_strerror mkstemp getline getdelim mremap memmove fsync bzero \
gai_strerror mkstemp getline getdelim mremap memmove fsync sync bzero \
memset memcmp difftime memcpy mempcpy mblen mbrlen posix_memalign
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

14
configure.in
View file

@ -1494,6 +1494,16 @@ dnl Do this early because it can frob feature test macros for Unix-98 &c.
AC_SYS_LARGEFILE
### The standard library on x86-64 GNU/Linux distributions can
### be located in either /usr/lib64 or /usr/lib.
case "${canonical}" in
x86_64-*-linux-gnu* )
if test -d /usr/lib64; then
AC_DEFINE(HAVE_X86_64_LIB64_DIR, 1,
[Define to 1 if the file /usr/lib64 exists.])
fi
esac
dnl This function defintion taken from Gnome 2.0
dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
@ -2572,7 +2582,7 @@ strerror fpathconf select mktime euidaccess getpagesize tzset setlocale \
utimes setrlimit setpgid getcwd getwd shutdown getaddrinfo \
__fpending mblen mbrlen mbsinit strsignal setitimer ualarm index rindex \
sendto recvfrom getsockopt setsockopt getsockname getpeername \
gai_strerror mkstemp getline getdelim mremap memmove fsync bzero \
gai_strerror mkstemp getline getdelim mremap memmove fsync sync bzero \
memset memcmp difftime memcpy mempcpy mblen mbrlen posix_memalign)
AC_CHECK_HEADERS(sys/un.h)
@ -2957,7 +2967,7 @@ if test "${REL_ALLOC}" = "yes" ; then
fi
AH_TOP([/* GNU Emacs site configuration template file.
Copyright (C) 1988, 1993, 1994, 1999, 2000, 2002, 2004, 2005, 2006
Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005, 2006
Free Software Foundation, Inc.
This file is part of GNU Emacs.

20
etc/ChangeLog
View file

@ -1,3 +1,23 @@
2006-12-05 Micha,Ak(Bl Cadilhac <michael.cadilhac@lrde.org>
* NEWS (Changes to cmuscheme): Mention the alternative for
`~/.emacs_SCHEMEPROG' which is `~/.emacs.d/init_SCHEMEPROG.scm'.
(Init file changes): Same for `~/.emacs_SHELL' versus
`~/.emacs.d/init_SHELL.sh'.
2006-12-01 Juanma Barranquero <lekktu@gmail.com>
* DEVEL.HUMOR: Another entry.
2006-08-14 Masatake YAMATO <jet@gyve.org>
* etags.1: Added / to the end of DEVAR regex.
2006-11-22 Juanma Barranquero <lekktu@gmail.com>
* emacsclient.1 (DESCRIPTION): Suggest also `server-mode'.
(OPTIONS): Document `-f', `--server-file' and EMACS_SERVER_FILE.
2006-11-20 Michael Olson <mwolson@gnu.org>
* NEWS: Change M-x erc-select to M-x erc.

11
etc/DEVEL.HUMOR
View file

@ -157,3 +157,14 @@ readable?
serious effort', reminiscent of mathematicians' use of 'trivial' as
synonymous with 'provable with serious effort'?"
-- RMS and David Kastrup
----------------------------------------------------------------------
Re: New Emacs Icon and Tango
"What about using the 'happy face' with gnu horns?"
"It would make Emacs the object of ridicule until the end of time."
"Isn't it already?"
"It's the object of ridicule until the end of _tape_. The jury is
still out about that end of time thing."
-- Kim F. Storm, Miles Bader, RMS and David Kastrup

30
etc/NEWS
View file

@ -310,8 +310,8 @@ displays a buffer menu. This option turns the buffer menu off.
+++
** Init file changes
If the init file ~/.emacs does not exist, Emacs will try
~/.emacs.d/init.el or ~/.emacs.d/init.elc. You can also put the shell
init file .emacs_SHELL under ~/.emacs.d.
~/.emacs.d/init.el or ~/.emacs.d/init.elc. Likewise, if the shell init file
~/.emacs_SHELL is not found, Emacs will try ~/.emacs.d/init_SHELL.sh.
+++
** Emacs now reads the standard abbrevs file ~/.abbrev_defs
@ -1109,6 +1109,21 @@ jit-lock-defer-contextually is renamed jit-lock-contextually and
jit-lock-context-time determines the delay after which contextual
refontification takes place.
---
*** lazy-lock is considered obsolete.
The `lazy-lock' package is superseded by `jit-lock' and is considered
obsolete. `jit-lock' is activated by default; if you wish to continue
using `lazy-lock', activate it in your ~/.emacs like this:
(setq font-lock-support-mode 'lazy-lock-mode)
If you invoke `lazy-lock-mode' directly rather than through
`font-lock-support-mode', it now issues a warning:
"Use font-lock-support-mode rather than calling lazy-lock-mode"
** Menu support:
---
@ -1260,7 +1275,7 @@ characters instead, depending on how the terminal (or terminal
emulator) works. Use `set-keyboard-coding-system' (or customize
keyboard-coding-system) if you prefer META to work (the old default)
or if the locale doesn't describe the character set actually generated
by the keyboard. See Info node `Single-Byte Character Support'.
by the keyboard. See Info node `Unibyte Mode'.
+++
*** The new command `revert-buffer-with-coding-system' (C-x RET r)
@ -2222,9 +2237,9 @@ at point is suggested as default, but not inserted at the prompt.
*** Emacs now offers to start Scheme if the user tries to
evaluate a Scheme expression but no Scheme subprocess is running.
*** If a file `.emacs_NAME' (where NAME is the name of the Scheme interpreter)
exists in the user's home directory or in ~/.emacs.d, its
contents are sent to the Scheme subprocess upon startup.
*** If the file ~/.emacs_NAME or ~/.emacs.d/init_NAME.scm (where NAME
is the name of the Scheme interpreter) exists, its contents are sent
to the Scheme subprocess upon startup.
*** There are new commands to instruct the Scheme interpreter to trace
procedure calls (`scheme-trace-procedure') and to expand syntactic forms
@ -3873,8 +3888,9 @@ deleting the part of subprocess output that matches the input.
** The variable `memory-full' now remains t until
there is no longer a shortage of memory.
+++
** When Emacs receives a USR1 or USR2 signal, this generates
an input event: usr1-signal or usr2-signal.
input event sequences: [signal usr1] or [signal usr2].
* Lisp Changes in Emacs 22.1

14
etc/emacsclient.1
View file

@ -29,10 +29,10 @@ default editor.
For
.B emacsclient
to work, you need an already running Emacs with a server. Within Emacs, call
the function
`server-start'. (Your `.emacs' file can do this automatically if you
add the expression `(server-start)' to it.)
to work, you need an already running Emacs with a server. Within Emacs,
call the functions `server-start' or `server-mode'. (Your `.emacs' file
can do this automatically if you add either `(server-start)' or
`(server-mode 1)' to it.)
When you've finished editing the buffer, type `C-x #'
(`server-edit'). This saves the file and sends a message back to the
@ -57,7 +57,11 @@ do not visit files but instead evaluate the arguments as Emacs
Lisp expressions.
.TP
.B \-s, \-\-socket-name=FILENAME
Use socket named FILENAME for communication.
use socket named FILENAME for communication.
.TP
.B \-f, \-\-server-file=FILENAME
use TCP configuration file FILENAME for communication.
This can also be specified via the `EMACS_SERVER_FILE' environment variable.
.TP
.B \-a, \-\-alternate-editor=EDITOR
if the Emacs server is not running, run the specified editor instead.

2
etc/etags.1
View file

@ -205,7 +205,7 @@ from shell interpretation.
Tag the DEFVAR macros in the emacs source files:
.br
\fI\-\-regex\='/[ \\t]*DEFVAR_[A-Z_ \\t(]+"\\([^"]+\\)"\/'\fP
\fI\-\-regex\='/[ \\t]*DEFVAR_[A-Z_ \\t(]+"\\([^"]+\\)"/'\fP
.\"" This comment is to avoid confusion to Emacs syntax highlighting
.br

22
leim/ChangeLog
View file

@ -1,3 +1,12 @@
2006-12-05 Juanma Barranquero <lekktu@gmail.com>
* makefile.w32-in (MISC): Add $(srcdir)/quail/sisheng.elc.
2006-11-29 Juanma Barranquero <lekktu@gmail.com>
* quail/greek.el ("greek-mizuochi"): Remove spurious initial newline
in docstring.
2006-11-04 Romain Francoise <romain@orebokech.com>
* Makefile.in (bootstrap-clean): New target.
@ -98,19 +107,16 @@
2005-06-04 Eli Zaretskii <eliz@gnu.org>
* makefile.w32-in (distclean): Fix a typo (colon was after
"clean").
* makefile.w32-in (distclean): Fix a typo (colon was after "clean").
(extraclean): New target, emulates Makefile.in.
2005-04-06 Kenichi Handa <handa@m17n.org>
* quail/sgml-input.el ("sgml"): Enable quail-completion by typing
TAB.
* quail/sgml-input.el ("sgml"): Enable quail-completion by typing TAB.
2005-03-26 Kenichi Handa <handa@m17n.org>
* quail/latin-ltx.el ("TeX"): Enable quail-completion by typing
TAB.
* quail/latin-ltx.el ("TeX"): Enable quail-completion by typing TAB.
2005-03-18 Kenichi Handa <handa@m17n.org>
@ -170,7 +176,7 @@
2004-07-01 David Kastrup <dak@gnu.org>
* quail/greek.el ("((") ("))"): add quotation mark shorthands.
* quail/greek.el ("((") ("))"): Add quotation mark shorthands.
2004-06-30 Andreas Schwab <schwab@suse.de>
@ -221,7 +227,7 @@
2004-05-01 Kenichi Handa <handa@m17n.org>
* Makefile.in (OTHERS): Raname from MISC.
* Makefile.in (OTHERS): Rename from MISC.
(MISC): Rename from MISC-DIC.
(WORLD): Adjute for the above changes.
(TIT-MISC, NON-TIT-MISC): New targets.

3
leim/makefile.w32-in
View file

@ -119,7 +119,8 @@ MISC= \
$(srcdir)/quail/ethiopic.elc \
$(srcdir)/quail/ipa.elc \
$(srcdir)/quail/hebrew.elc \
$(srcdir)/quail/georgian.elc
$(srcdir)/quail/georgian.elc \
$(srcdir)/quail/sisheng.elc
MISC_DIC=\
quail/tsang-b5.elc \

4
leim/quail/greek.el
View file

@ -137,8 +137,8 @@ Sorry, accents and terminal sigma are not supported in JIS."
;;
(quail-define-package "greek-mizuochi" "Greek" "CG" t "
The Mizuochi input method for Classical Greek using mule-unicode-0100-24ff.
(quail-define-package "greek-mizuochi" "Greek" "CG" t
"The Mizuochi input method for Classical Greek using mule-unicode-0100-24ff.
-------------------------------------
character capital small

75
lib-src/ChangeLog
View file

@ -1,3 +1,78 @@
2006-12-06 Christoph Conrad <christoph.conrad@gmx.de>
* makefile.w32-in ($(BLD)/emacsclient.exe, $(BLD)/emacsclientw.exe):
Use $(USER32) for compatibility with Visual Studio .NET 2003.
2006-11-30 Juanma Barranquero <lekktu@gmail.com>
* emacsclient.c (emacs_pid): New variable.
(message): Remove leftover code.
(get_server_config): Set emacs_pid. Don't allow Emacs to grab the
focus yet; emacsclient can still display an informational message
before sending requests to Emacs.
(main): Allow Emacs to grab the focus. Simplify message() call.
2006-11-30 Michael Mauger <mmaug@yahoo.com>
* emacsclient.c (message): Make sure the message is properly
written even if it contains printf escapes, and flush the result.
(set_tcp_socket): Make the message for non-local connections
informational rather than an error.
2006-11-28 Kevin Ryde <user42@zip.com.au> (tiny change)
* etags.c (readline): Check for double quote after #line.
2006-11-28 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> (tiny change)
* etags.c (readline): sscanf could in principle return 2.
2006-11-28 Francesco Potort,Al(B <pot@gnu.org>
* etags.c (readline): lno is unsigned.
(TeX_commands): Use p++ (rather than *p++) to increment p.
(Lua_functions): Explicitly discard LOOKING_AT's return value.
2006-11-27 Juanma Barranquero <lekktu@gmail.com>
* makefile.w32-in (TRES): New macro (copied from nt/makefile.w32-in).
($(TRES)): New rule (copied from nt/makefile.w32-in).
($(BLD)/emacsclientw.exe): Add dependency.
2006-11-27 Eli Zaretskii <eliz@gnu.org>
* makefile.w32-in ($(BLD)/emacsclient.$(O)): Depend on
makefile.w32-in.
2006-11-25 Juanma Barranquero <lekktu@gmail.com>
* makefile.w32-in (VERSION): New macro.
(ECLIENT_CFLAGS): Add -DVERSION.
2006-11-25 Jason Rumney <jasonr@gnu.org>
* emacsclient.c (file_name_absolute_p) [WINDOWSNT]: Use isalpha().
2006-11-24 Michael Mauger <mmaug@yahoo.com>
* emacsclient.c (file_name_absolute_p) [WINDOWSNT]: Support
absolute file names with forward slashes.
2006-11-23 Juanma Barranquero <lekktu@gmail.com>
* emacsclient.c (print_help_and_exit): Tweak message contents and
tabs/spaces to improve alignment in message boxes.
2006-11-22 Lennart Borgman <lennart.borgman.073@student.lu.se>
* emacsclient.c: Include <stdarg.h>.
[WINDOWSNT]: Include <windows.h>.
(w32_check_console_app): New function.
(message): New function.
(decode_options, print_help_and_exit, fail, main)
(initialize_sockets, get_server_config, set_tcp_socket)
(set_local_socket, set_socket): Use message().
2006-11-13 Jason Rumney <jasonr@gnu.org>
* emacsclient.c [WINDOWSNT]: Let config.h define HAVE_SOCKETS and

178
lib-src/emacsclient.c
View file

@ -34,6 +34,7 @@ Boston, MA 02110-1301, USA. */
# include <malloc.h>
# include <stdlib.h>
# include <windows.h>
# define NO_SOCKETS_IN_FILE_SYSTEM
@ -58,6 +59,7 @@ Boston, MA 02110-1301, USA. */
#undef signal
#include <stdarg.h>
#include <ctype.h>
#include <stdio.h>
#include "getopt.h"
@ -127,6 +129,9 @@ char *socket_name = NULL;
/* If non-NULL, the filename of the authentication file. */
char *server_file = NULL;
/* PID of the Emacs server process. */
int emacs_pid = 0;
void print_help_and_exit () NO_RETURN;
struct option longopts[] =
@ -144,6 +149,53 @@ struct option longopts[] =
{ 0, 0, 0, 0 }
};
/* Message functions. */
#ifdef WINDOWSNT
/* I first tried to check for STDOUT. The check did not work,
I get a valid handle also in nonconsole apps.
Instead I test for console title, which seems to work. */
int
w32_window_app()
{
static int window_app = -1;
char szTitle[MAX_PATH];
if (window_app < 0)
window_app = (GetConsoleTitleA (szTitle, MAX_PATH) == 0);
return window_app;
}
#endif
void
message (int is_error, char *message, ...)
{
char msg [2048];
va_list args;
va_start (args, message);
vsprintf (msg, message, args);
va_end (args);
#ifdef WINDOWSNT
if (w32_window_app ())
{
if (is_error)
MessageBox (NULL, msg, "Emacsclient ERROR", MB_ICONERROR);
else
MessageBox (NULL, msg, "Emacsclient", MB_ICONINFORMATION);
}
else
#endif
{
FILE *f = is_error ? stderr : stdout;
fputs (msg, f);
fflush (f);
}
}
/* Decode the options from argv and argc.
The global variable `optind' will say how many arguments we used up. */
@ -201,7 +253,7 @@ decode_options (argc, argv)
break;
case 'V':
printf ("emacsclient %s\n", VERSION);
message (FALSE, "emacsclient %s\n", VERSION);
exit (EXIT_SUCCESS);
break;
@ -210,7 +262,7 @@ decode_options (argc, argv)
break;
default:
fprintf (stderr, "Try `%s --help' for more information\n", progname);
message (TRUE, "Try `%s --help' for more information\n", progname);
exit (EXIT_FAILURE);
break;
}
@ -220,25 +272,26 @@ decode_options (argc, argv)
void
print_help_and_exit ()
{
printf (
message (FALSE,
"Usage: %s [OPTIONS] FILE...\n\
Tell the Emacs server to visit the specified files.\n\
Every FILE can be either just a FILENAME or [+LINE[:COLUMN]] FILENAME.\n\
\n\
The following OPTIONS are accepted:\n\
-V, --version Just print a version info and return\n\
-H, --help Print this usage information message\n\
-n, --no-wait Don't wait for the server to return\n\
-e, --eval Evaluate the FILE arguments as ELisp expressions\n\
-d, --display=DISPLAY Visit the file in the given display\n"
\n\
-V, --version Just print version info and return\n\
-H, --help Print this usage information message\n\
-e, --eval Evaluate FILE arguments as Lisp expressions\n\
-n, --no-wait Don't wait for the server to return\n\
-d, --display=DISPLAY Visit the file in the given display\n"
#ifndef NO_SOCKETS_IN_FILE_SYSTEM
"-s, --socket-name=FILENAME\n\
Set the filename of the UNIX socket for communication\n"
Set filename of the UNIX socket for communication\n"
#endif
"-f, --server-file=FILENAME\n\
Set the filename of the TCP configuration file\n\
Set filename of the TCP authentication file\n\
-a, --alternate-editor=EDITOR\n\
Editor to fallback to if the server is not running\n\
Editor to fallback to if server is not running\n\
\n\
Report bugs to bug-gnu-emacs@gnu.org.\n", progname);
exit (EXIT_SUCCESS);
@ -261,7 +314,7 @@ fail (argc, argv)
argv[i] = (char *)alternate_editor;
#endif
execvp (alternate_editor, argv + i);
fprintf (stderr, "%s: error executing alternate editor \"%s\"\n",
message (TRUE, "%s: error executing alternate editor \"%s\"\n",
progname, alternate_editor);
}
exit (EXIT_FAILURE);
@ -275,9 +328,8 @@ main (argc, argv)
int argc;
char **argv;
{
fprintf (stderr, "%s: Sorry, the Emacs server is supported only\n",
message (TRUE, "%s: Sorry, the Emacs server is supported only\non systems with Berkely sockets.\n",
argv[0]);
fprintf (stderr, "on systems with Berkeley sockets.\n");
fail (argc, argv);
}
@ -399,8 +451,8 @@ file_name_absolute_p (filename)
#ifdef WINDOWSNT
/* X:\xxx is always absolute; X:xxx is an error and will fail. */
if (islower (tolower (filename[0]))
&& filename[1] == ':' && filename[2] == '\\')
if (isalpha (filename[0])
&& filename[1] == ':' && (filename[2] == '\\' || filename[2] == '/'))
return TRUE;
/* Both \xxx and \\xxx\yyy are absolute. */
@ -411,7 +463,7 @@ file_name_absolute_p (filename)
}
#ifdef WINDOWSNT
/* Wrapper to make WSACleanup a cdecl, as required by atexit(). */
/* Wrapper to make WSACleanup a cdecl, as required by atexit(). */
void
__cdecl close_winsock ()
{
@ -426,7 +478,7 @@ initialize_sockets ()
if (WSAStartup (MAKEWORD (2, 0), &wsaData))
{
fprintf (stderr, "%s: error initializing WinSock2", progname);
message (TRUE, "%s: error initializing WinSock2", progname);
exit (EXIT_FAILURE);
}
@ -482,7 +534,7 @@ get_server_config (server, authentication)
}
else
{
fprintf (stderr, "%s: invalid configuration info", progname);
message (TRUE, "%s: invalid configuration info", progname);
exit (EXIT_FAILURE);
}
@ -492,35 +544,13 @@ get_server_config (server, authentication)
if (! fread (authentication, AUTH_KEY_LENGTH, 1, config))
{
fprintf (stderr, "%s: cannot read authentication info", progname);
message (TRUE, "%s: cannot read authentication info", progname);
exit (EXIT_FAILURE);
}
fclose (config);
#ifdef WINDOWSNT
/*
Modern Windows restrict which processes can set the foreground window.
So, for emacsclient to be able to force Emacs into the foreground, we
have to call AllowSetForegroundWindow(). Unfortunately, older Windows
(W95, W98 and NT) don't have this function, so we have to check first.
We're doing this here because it has to be done before sending info
to Emacs, and otherwise we'll need a global variable just to pass around
the pid, which is also inelegant.
*/
{
HMODULE hUser32;
if (hUser32 = LoadLibrary ("user32.dll"))
{
FARPROC set_fg;
if (set_fg = GetProcAddress (hUser32, "AllowSetForegroundWindow"))
set_fg (atoi (pid));
FreeLibrary (hUser32);
}
}
#endif
emacs_pid = atoi (pid);
return TRUE;
}
@ -537,7 +567,7 @@ set_tcp_socket ()
return INVALID_SOCKET;
if (server.sin_addr.s_addr != inet_addr ("127.0.0.1"))
fprintf (stderr, "%s: connected to remote socket at %s\n",
message (FALSE, "%s: connected to remote socket at %s\n",
progname, inet_ntoa (server.sin_addr));
/*
@ -545,8 +575,7 @@ set_tcp_socket ()
*/
if ((s = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
{
fprintf (stderr, "%s: ", progname);
perror ("socket");
message (TRUE, "%s: socket: %s\n", progname, strerror (errno));
return INVALID_SOCKET;
}
@ -555,8 +584,7 @@ set_tcp_socket ()
*/
if (connect (s, (struct sockaddr *) &server, sizeof server) < 0)
{
fprintf (stderr, "%s: ", progname);
perror ("connect");
message (TRUE, "%s: connect: %s\n", progname, strerror (errno));
return INVALID_SOCKET;
}
@ -608,8 +636,7 @@ set_local_socket ()
if ((s = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
{
fprintf (stderr, "%s: ", progname);
perror ("socket");
message (TRUE, "%s: socket: %s\n", progname, strerror (errno));
return INVALID_SOCKET;
}
@ -639,7 +666,7 @@ set_local_socket ()
strcpy (server.sun_path, socket_name);
else
{
fprintf (stderr, "%s: socket-name %s too long",
message (TRUE, "%s: socket-name %s too long",
progname, socket_name);
exit (EXIT_FAILURE);
}
@ -674,7 +701,7 @@ set_local_socket ()
strcpy (server.sun_path, socket_name);
else
{
fprintf (stderr, "%s: socket-name %s too long",
message (TRUE, "%s: socket-name %s too long",
progname, socket_name);
exit (EXIT_FAILURE);
}
@ -694,7 +721,7 @@ set_local_socket ()
we are root. */
if (0 != geteuid ())
{
fprintf (stderr, "%s: Invalid socket owner\n", progname);
message (TRUE, "%s: Invalid socket owner\n", progname);
return INVALID_SOCKET;
}
break;
@ -702,12 +729,12 @@ set_local_socket ()
case 2:
/* `stat' failed */
if (saved_errno == ENOENT)
fprintf (stderr,
message (TRUE,
"%s: can't find socket; have you started the server?\n\
To start the server in Emacs, type \"M-x server-start\".\n",
progname);
else
fprintf (stderr, "%s: can't stat %s: %s\n",
message (TRUE, "%s: can't stat %s: %s\n",
progname, server.sun_path, strerror (saved_errno));
return INVALID_SOCKET;
}
@ -716,8 +743,7 @@ To start the server in Emacs, type \"M-x server-start\".\n",
if (connect (s, (struct sockaddr *) &server, strlen (server.sun_path) + 2)
< 0)
{
fprintf (stderr, "%s: ", progname);
perror ("connect");
message (TRUE, "%s: connect: %s\n", progname, strerror (errno));
return INVALID_SOCKET;
}
@ -740,7 +766,7 @@ set_socket ()
if ((s != INVALID_SOCKET) || alternate_editor)
return s;
fprintf (stderr, "%s: error accessing socket \"%s\"",
message (TRUE, "%s: error accessing socket \"%s\"",
progname, socket_name);
exit (EXIT_FAILURE);
}
@ -756,7 +782,7 @@ set_socket ()
if ((s != INVALID_SOCKET) || alternate_editor)
return s;
fprintf (stderr, "%s: error accessing server file \"%s\"",
message (TRUE, "%s: error accessing server file \"%s\"",
progname, server_file);
exit (EXIT_FAILURE);
}
@ -775,7 +801,7 @@ set_socket ()
return s;
/* No implicit or explicit socket, and no alternate editor. */
fprintf (stderr, "%s: No socket or alternate editor. Please use:\n\n"
message (TRUE, "%s: No socket or alternate editor. Please use:\n\n"
#ifndef NO_SOCKETS_IN_FILE_SYSTEM
"\t--socket-name\n"
#endif
@ -802,8 +828,8 @@ main (argc, argv)
if ((argc - optind < 1) && !eval)
{
fprintf (stderr, "%s: file name or argument required\n", progname);
fprintf (stderr, "Try `%s --help' for more information\n", progname);
message (TRUE, "%s: file name or argument required\nTry `%s --help' for more information\n",
progname, progname);
exit (EXIT_FAILURE);
}
@ -818,15 +844,37 @@ main (argc, argv)
if (cwd == 0)
{
/* getwd puts message in STRING if it fails. */
message (TRUE, "%s: %s (%s)\n", progname,
#ifdef HAVE_GETCWD
fprintf (stderr, "%s: %s (%s)\n", progname,
"Cannot get current working directory", strerror (errno));
"Cannot get current working directory",
#else
fprintf (stderr, "%s: %s (%s)\n", progname, string, strerror (errno));
string,
#endif
strerror (errno));
fail (argc, argv);
}
#ifdef WINDOWSNT
/*
Modern Windows restrict which processes can set the foreground window.
emacsclient can allow Emacs to grab the focus by calling the function
AllowSetForegroundWindow(). Unfortunately, older Windows (W95, W98
and NT) lack this function, so we have to check its availability.
*/
if (emacs_pid)
{
HMODULE hUser32;
if (hUser32 = LoadLibrary ("user32.dll"))
{
FARPROC set_fg;
if (set_fg = GetProcAddress (hUser32, "AllowSetForegroundWindow"))
set_fg (emacs_pid);
FreeLibrary (hUser32);
}
}
#endif
if (nowait)
SEND_STRING ("-nowait ");

17
lib-src/etags.c
View file

@ -41,7 +41,7 @@
* configuration file containing regexp definitions for etags.
*/
char pot_etags_version[] = "@(#) pot revision number is 17.20";
char pot_etags_version[] = "@(#) pot revision number is $Revision: 3.61 $";
#define TRUE 1
#define FALSE 0
@ -4955,7 +4955,7 @@ Lua_functions (inf)
if (bp[0] != 'f' && bp[0] != 'l')
continue;
LOOKING_AT (bp, "local"); /* skip possible "local" */
(void)LOOKING_AT (bp, "local"); /* skip possible "local" */
if (LOOKING_AT (bp, "function"))
get_tag (bp, NULL);
@ -5137,7 +5137,7 @@ TeX_commands (inf)
if (!opgrp || *p == TEX_clgrp)
{
while (*p != '\0' && *p != TEX_opgrp && *p != TEX_clgrp)
*p++;
p++;
linelen = p - lb.buffer + 1;
}
make_tag (cp, namelen, TRUE,
@ -6256,15 +6256,14 @@ readline (lbp, stream)
/* Check whether this is a #line directive. */
if (result > 12 && strneq (lbp->buffer, "#line ", 6))
{
int start, lno;
unsigned int lno;
int start = 0;
if (DEBUG) start = 0; /* shut up the compiler */
if (sscanf (lbp->buffer, "#line %d %n\"", &lno, &start) >= 1
&& lbp->buffer[start] == '"')
if (sscanf (lbp->buffer, "#line %u \"%n", &lno, &start) >= 1
&& start > 0) /* double quote character found */
{
char *endp = lbp->buffer + ++start;
char *endp = lbp->buffer + start;
assert (start > 0);
while ((endp = etags_strchr (endp, '"')) != NULL
&& endp[-1] == '\\')
endp++;

20
lib-src/makefile.w32-in
View file

@ -24,11 +24,13 @@ ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacs
.PHONY: $(ALL)
VERSION = 22.0.91
LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
-DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \
-I../src
LIBS = $(BASE_LIBS) $(ADVAPI32)
LIBS = $(BASE_LIBS) $(ADVAPI32)
$(BLD)/make-docfile.exe: $(BLD)/make-docfile.$(O) $(BLD)/ntlib.$(O)
$(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/make-docfile.$(O) $(BLD)/ntlib.$(O) $(LIBS)
@ -68,21 +70,27 @@ $(BLD)/movemail.exe: $(MOVEMAILOBJS) getopt.h
# put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
$(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(MOVEMAILOBJS) $(WSOCK32) $(LIBS)
ECLIENT_CFLAGS = -DHAVE_GETCWD -DHAVE_STRERROR
ECLIENT_CFLAGS = -DHAVE_GETCWD -DHAVE_STRERROR -DVERSION="\"$(VERSION)\""
ECLIENTOBJS = $(BLD)/emacsclient.$(O) \
$(BLD)/getopt.$(O) \
$(BLD)/getopt1.$(O) \
$(BLD)/ntlib.$(O)
TRES = ../nt/$(BLD)/emacs.res
$(TRES): ../nt/emacs.rc
$(RC) $(RC_OUT)../nt/$(BLD)/emacs.res $(ALL_DEPS)
$(BLD)/emacsclient.exe: $(ECLIENTOBJS)
# put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
$(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(LIBS)
$(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(LIBS)
$(BLD)/emacsclientw.exe: $(ECLIENTOBJS)
$(BLD)/emacsclientw.exe: $(ECLIENTOBJS) $(TRES)
# put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
$(LINK) $(LINK_OUT)$@ -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(LIBS)
$(LINK) $(LINK_OUT)$@ $(TRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(LIBS)
$(BLD)/emacsclient.$(O): emacsclient.c
# emacsclient.$(O) depends on makefile.w32-in because makefile.w32-in
# can be edited to define VERSION string, which is part of ECLIENT_CFLAGS.
$(BLD)/emacsclient.$(O): emacsclient.c makefile.w32-in
$(CC) $(CFLAGS) $(ECLIENT_CFLAGS) $(CC_OUT)$@ emacsclient.c
ETAGSOBJ = $(BLD)/etags.$(O) \

643
lisp/ChangeLog
View file

@ -1,23 +1,533 @@
2006-12-05 J.D. Smith <jdsmith@as.arizona.edu>
* progmodes/idlwave.el (idlwave-xml-create-class-method-lists):
Trim out spurious class inheritance "None" entries.
2006-12-05 Kim F. Storm <storm@cua.dk>
* emulation/cua-base.el (cua-paste-pop-rotate-temporarily): Doc fix.
(cua-paste-pop): Rework last change for cua-paste-pop-rotate-temporarily,
so first M-y and C-y works alike, pasting the head of the kill-ring, and
prefix arg C-u M-y inserts the text inserted by the last M-y command.
2006-12-05 Micha,Ak(Bl Cadilhac <michael.cadilhac@lrde.org>
* cmuscheme.el (run-scheme, scheme-start-file): Search the start
file in ~/.emacs.d as `init_SCHEMENAME.scm' instead.
* shell.el (shell): Search the start file in ~/.emacs.d as
`init_SHELLNAME.sh' instead.
2006-12-05 Glenn Morris <rgm@gnu.org>
* progmodes/cperl-mode.el (cperl-mode)
* progmodes/f90.el (f90-mode-abbrev-table)
* progmodes/fortran.el (fortran-mode-abbrev-table)
* progmodes/octave-mod.el (octave-abbrev-table)
* progmodes/sql.el (sql-mode-abbrev-table): Define abbrevs even
if abbrev-table is non-nil (saved user abbrevs may have been
restored).
* progmodes/vhdl-mode.el (vhdl-mode-abbrev-table-init): Do not
clear abbrev table, else saved abbrevs will not be restored.
2006-12-04 Juanma Barranquero <lekktu@gmail.com>
* facemenu.el (facemenu-unlisted-faces): Put obsolescence info in
the call to `make-obsolete-variable', not in the docstring.
2006-12-04 Chong Yidong <cyd@stupidchicken.com>
* facemenu.el (facemenu-unlisted-faces): Define as obsolete variable.
2006-12-04 Vinicius Jose Latorre <viniciusjl@ig.com.br>
* progmodes/ebnf-abn.el:
* progmodes/ebnf-bnf.el:
* progmodes/ebnf-dtd.el:
* progmodes/ebnf-ebx.el:
* progmodes/ebnf-iso.el:
* progmodes/ebnf-otz.el:
* progmodes/ebnf-yac.el:
* progmodes/ebnf2ps.el:
* delim-col.el:
* printing.el:
* ps-bdf.el:
* ps-mule.el:
* ps-print.el: Remove 'Time-stamp' comment mark.
* printing.el (pr-menu-bind): Replace 'easy-menu-change' by
'easy-menu-add-item' when called in Emacs 21 or higher.
2006-12-04 Stephen Leake <stephen_leake@stephe-leake.org>
* progmodes/ada-xref.el (ada-check-current): Doc fix.
(ada-make-body-gnatstub): Doc fix. Remove redundant `progn'.
2006-12-04 Kim F. Storm <storm@cua.dk>
* bindings.el (global-map): Bind [signal t] to ignore, to have
user signals ignored by default.
2006-12-04 Juanma Barranquero <lekktu@gmail.com>
* descr-text.el (describe-char-unicode-data): Use a hidden buffer for
Unicode data file pointed to by `describe-char-unicodedata-file'.
2006-12-04 Stefan Monnier <monnier@iro.umontreal.ca>
* textmodes/sgml-mode.el (sgml-font-lock-keywords-1): Fix pathological
O(n^2) regexp-search by anchoring the search.
2006-12-04 Dan Nicolaescu <dann@ics.uci.edu>
* whitespace.el (whitespace-cleanup-internal): Use current
argument for recursive call.
2006-12-04 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-methods): Add "ControlPath" and
"ControlMaster" to scp, scp1 and scp2 methods. Suggested by
Andreas Schwab <schwab@suse.de>.
(tramp-do-copy-or-rename-file-out-of-band)
(tramp-open-connection-rsh): Compute format spec for ?t.
(tramp-process-actions): Trace command parameters.
2006-12-04 Nick Roberts <nickrob@snap.net.nz>
* simple.el (toggle-truncate-lines): Clarify doc string.
* progmodes/gdb-ui.el (gdb-var-delete-children): New function.
(gdb-speedbar-expand-node): Use it.
2006-12-04 Richard Stallman <rms@gnu.org>
* progmodes/python.el (python-indent): Add safe-local-variable prop.
* dired.el (dired-revert): Turn off dired-after-readin-hook
around call to dired-readin.
* menu-bar.el (menu-bar-make-toggle): Add "globally"
to echo area messages.
<indicate-empty-lines, case-fold-search>:
Add "globally" to Help string.
<case-fold-search>: MESSAGE arg need not say "globally".
(menu-bar-edit-menu <paste-from-menu>): Rename from select-and-paste.
2006-12-03 Liam Healy <lnp@healy.washington.dc.us> (tiny change)
* outline.el (outline-end-of-subtree): Don't leave an empty
line hidden as we would a real next heading.
2006-12-03 Ken Manheimer <ken.manheimer@gmail.com>
* allout.el (allout-ascend): Add an optional argument to preserve
original position of point when unsuccessful. Also, fix a
docstring error.
(allout-yank-processing): Fix depth shift of multiple-topic so yanks
work again, using allout-ascend's new option.
(allout-setup-mode-map): Extract from allout-mode to initialize
allout-mode-map. Call it on file load, so the mode docstring
substitutions work even if allout mode has not yet been invoked.
(allout-mode): Use new allout-setup-mode-map to track any keybinding
customizations since the map was last processed. Also, refine the
docstring so it's ship-shape for release.
(allout-default-layout, allout-beginning-of-line-cycles)
(allout-distinctive-bullets-string, allout-use-mode-specific-leader)
(allout-encrypt-unencrypted-on-saves, allout-inhibit-auto-fill)
(allout-version, allout-layout, allout-infer-body-reindent)
(allout-infer-header-lead-and-primary-bullet, allout-view-change-hook)
(allout-init, allout-mode, allout-next-heading, allout-chart-subtree)
(allout-previous-heading, allout-goto-prefix-doublechecked)
(allout-current-bullet-pos, allout-next-sibling-leap)
(allout-pre-command-business, allout-encrypted-type-prefix)
(allout-make-topic-prefix, allout-open-topic, allout-rebullet-heading)
(allout-rebullet-topic, allout-rebullet-topic-grunt)
(allout-flag-region, allout-expose-topic, allout-expose-topic)
(allout-old-expose-topic, allout-listify-exposed)
(allout-process-exposed, allout-latex-verb-quote)
(allout-latex-verbatim-quote-curr-line, allout-adjust-file-variable)
(allout-toggle-current-subtree-encryption)
(allout-toggle-subtree-encryption, allout-bullet-isearch):
Remove extraneous open-paren and close paren string escapes.
2006-12-03 Juanma Barranquero <lekktu@gmail.com>
* progmodes/ada-xref.el (is-windows, ada-find-in-src-path): Doc fixes.
(ada-xref-pos-ring-max, ada-xref-project-files, ada-xref-initialize)
(ada-prj-default-comp-cmd, ada-quote-cmd, ada-compile-current):
Fix typos in docstrings.
2006-12-03 Glenn Morris <rgm@gnu.org>
* progmodes/cc-align.el
* progmodes/cc-awk.el
* progmodes/cc-cmds.el
* progmodes/cc-compat.el
* progmodes/cc-defs.el
* progmodes/cc-engine.el
* progmodes/cc-langs.el
* progmodes/cc-menus.el
* progmodes/cc-mode.el
* progmodes/cc-styles.el
* progmodes/cc-vars.el
* progmodes/vhdl-mode.el: Fix Copyright format.
2006-12-02 Chong Yidong <cyd@stupidchicken.com>
* mouse.el (mouse-drag-track): Suppress automatic hscrolling for
initial down event.
2006-12-02 Kim F. Storm <storm@cua.dk>
* emulation/cua-base.el (cua-toggle-set-mark): Doc fix.
(cua-repeat-replace-region): Make M-v more robust.
(cua-paste-pop-rotate-temporarily): New defcustom.
(cua-paste-pop): Use it.
(cua-auto-mark-last-change): New defcustom.
(cua-pop-to-last-change): New helper function.
(cua-set-mark): Use them.
2006-12-01 Nick Roberts <nickrob@snap.net.nz>
* menu-bar.el (toggle-case-fold-search): Clarify doc/help string and
mini-buffer message.
2006-12-01 Juanma Barranquero <lekktu@gmail.com>
* descr-text.el (describe-char-unicodedata-file): Fix typo in docstring.
2006-12-01 Ben North <ben@redfrontdoor.org>
* paren.el: Fix the highlight overlay extension when the user types a
sequence of char very fast just before the open parenthesis.
2006-12-01 Vinicius Jose Latorre <viniciusjl@ig.com.br>
* ps-mule.el: Eliminate Emacs 20 compatibility.
* ps-print.el: Eliminate Emacs 20 & 21 compatibility.
(ps-print-version): New Version 6.7.
(ps-print-quote): Replace '?\ ' by '?\s'.
2006-11-30 Juanma Barranquero <lekktu@gmail.com>
* hexl.el (hexl-goto-address, hexl-forward-char, hexl-forward-short)
(hexl-forward-word, hexl-previous-line, hexl-beginning-of-1k-page)
(hexl-end-of-1k-page): Doc fixes.
(hexl-address-region, hexl-ascii-region, hexl-highlight-line-range):
Fix typos in docstrings.
2006-11-30 Micha,Ak(Bl Cadilhac <michael.cadilhac@lrde.org>
* ido.el (ido-local-file-exists-p): New. Tell if a file exists
locally, i.e. without using file name handlers.
(ido-read-internal): Allow mono letter host names, avoiding the
`c:' problem by testing if the file exists locally.
(ido-complete, ido-make-file-list, ido-exhibit): Ditto.
2006-11-30 Masatake YAMATO <jet@gyve.org>
* hexl.el (hl-line-range-function, hl-line-face): Declare variables
to avoid bytecomp warnings.
(hexl-mode-old-ruler-function): New variable.
(hexl-follow-line): Bind `hexl-mode-old-hl-line-range-function'
and `hl-line-range-function' after `require' hl-line.
Then bind `hl-line-range-function' and `hl-line-face'.
Don't require frame. Don't use `with-no-warnings'.
(hexl-activate-ruler): Store the original value of
`ruler-mode-ruler-function' to `hexl-mode-old-ruler-function'.
(hexl-mode-exit): Restore the original value of
`ruler-mode-ruler-function'.
2006-11-30 Alin C. Soare <alinsoar@voila.fr> (tiny change)
* hexl.el (hexl-mode-old-hl-line-range-function): New variable.
(hexl-mode-old-hl-line-face): New variable.
(hexl-mode, hexl-mode-exit): Fix the highlighting of the current
line when exit from the hexl-mode.
2006-11-30 Juanma Barranquero <lekktu@gmail.com>
* emacs-lisp/bytecomp.el (byte-optimize, byte-compile-warnings):
Doc fixes.
* international/fontset.el (create-fontset-from-ascii-font)
(create-fontset-from-fontset-spec, x-compose-font-name): Doc fixes.
(fontset-name-p): Fix typo in docstring.
* progmodes/cc-cmds.el (c-indent-exp): Fix typo in docstring.
2006-11-30 Vinicius Jose Latorre <viniciusjl@ig.com.br>
* ps-bdf.el: Fix maintainer email.
* ps-mule.el: Fix maintainer email. Define functions for Emacs 20
compatibility.
* ps-print.el: Fix maintainer email. Define functions for Emacs 20 &
21 compatibility.
(ps-print-quote): Replace '?\s' by '?\ ' to keep compatibility with
Emacs 20 & 21.
2006-11-29 J.D. Smith <jdsmith@as.arizona.edu>
* progmodes/idlwave.el (idlwave-auto-fill):
Remove paragraph-start let to prevent auto-fill giving up.
2006-11-28 Juanma Barranquero <lekktu@gmail.com>
* vt100-led.el (led-state): Fix typo in previous change.
2006-11-27 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de>
* emacs-lisp/easy-mmode.el (easy-mmode-define-navigation):
Fix interactive spec of the functions getting defined to make them
work as documented.
2006-11-28 Chong Yidong <cyd@stupidchicken.com>
* startup.el (fancy-splash-screens): Hide initial splash buffer.
2006-11-28 Kim F. Storm <storm@cua.dk>
* icomplete.el (icomplete-tidy, icomplete-exhibit): Check that
icomplete-mode is enabled.
2006-11-28 Carsten Dominik <dominik@science.uva.nl>
* textmodes/org.el (require): Require gnus-sum during compilation
to avoid problem with a macro call.
2006-11-28 Glenn Morris <rgm@gnu.org>
* emacs-lisp/authors.el (authors-aliases): Add new alias.
* progmodes/fortran.el (fortran-font-lock-keywords-4): Add `min'.
(fortran-window-create-momentarily): Do not need string-to-char.
2006-11-28 Richard Stallman <rms@gnu.org>
* emacs-lisp/bytecomp.el (byte-compile-get-constant):
Replace incorrect use of assoc-default with a loop.
* term.el (term-exec-1): Set envvar INSIDE_EMACS.
* simple.el (next-error-find-buffer): Improve messages.
* files.el (revert-buffer): Special error message if file
is now not readable.
* facemenu.el (facemenu-add-new-face): Improve doc strings of
constructed commands.
* comint.el (comint-exec-1): Provide Emacs version and `comint'
in INSIDE_EMACS.
2006-11-27 Stefan Monnier <monnier@iro.umontreal.ca>
* diff-mode.el (diff-mode-map): Add a binding for unified->context.
* server.el: Remove spurious * in docstrings.
(server-process-filter): Exit from recursive editing before processing
a new request.
2006-11-27 J.D. Smith <jdsmith@as.arizona.edu>
* progmodes/hideshow.el (hs-already-hidden-p): Move to end of
line so hidden blocks will be correctly identified.
2006-11-27 Juanma Barranquero <lekktu@gmail.com>
* ledit.el (ledit-save-defun, ledit-mode):
* resume.el (resume-emacs-args-buffer):
* rot13.el (rot13-display-table, rot13-translate-table, rot13)
(rot13-string, rot13-region, rot13-other-window, toggle-rot13-mode):
* vmsproc.el (subprocess-input, start-subprocess, subprocess-command)
(command-send-input, command-kill-line):
* vt100-led.el (led-state, led-on): Fix typos in docstrings.
* autoarg.el (autoarg-kp-mode): Doc fix.
* emacs-lock.el (toggle-emacs-lock): Doc fix. Simplify.
(emacs-lock-check-buffer-lock): Doc fix. Use `when'.
(check-emacs-lock): Doc fix. Simplify.
* iimage.el (iimage-mode-image-regex-alist): Doc fix.
(iimage-mode-buffer): Fix typos in docstring.
* misc.el (zap-up-to-char): Doc fix.
* time-stamp.el: Fix comment and obsolescence string for old
functions. Use `dolist' instead of `while'.
* userlock.el (ask-user-about-lock-help): Fix typos in output message.
* disp-table.el (standard-display-8bit, standard-display-default):
* ebuff-menu.el (electric-buffer-list):
* ehelp.el (electric-help-command-loop):
* font-core.el (font-lock-mode):
* help-macro.el (make-help-screen):
* help.el (describe-minor-mode-completion-table-for-indicator)
(lookup-minor-mode-from-indicator):
* indent.el (tab-to-tab-stop, move-to-tab-stop):
* info-look.el (info-lookup-guess-custom-symbol):
* locate.el (locate-main-listing-line-p, locate-mode, locate-do-setup):
* longlines.el (longlines-wrap-line):
* macros.el (insert-kbd-macro):
* menu-bar.el (menu-bar-update-buffers):
* misc.el (copy-from-above-command):
* mouse.el (mouse-popup-menubar, mouse-buffer-menu-alist):
* newcomment.el (comment-indent):
* novice.el (disabled-command-function):
* sort.el (sort-fields-syntax-table):
* subr.el (momentary-string-display):
* tar-mode.el (tar-header-block-summarize)
(tar-clear-modification-flags):
* terminal.el (terminal-cease-edit, te-more-break-unwind, te-newline)
(te-clear-rest-of-line, te-clear-rest-of-screen, te-clear-screen)
(te-insert-lines, te-delete-lines, te-delete, te-insert-spaces)
(te-delete-char, te-down-vertically-or-scroll):
* time-stamp.el (time-stamp-string-preprocess):
* tmm.el (tmm-add-one-shortcut): "?\ " -> "?\s".
2006-11-26 Nick Roberts <nickrob@snap.net.nz>
* speedbar.el (speedbar-timer-fn): Revert to old behaviour when not
in GUD mode.
* progmodes/gud.el (gud-install-speedbar-variables): Remove bindings:
speedbar-expand-line-descendants, speedbar-contract-line-descendants.
2006-11-26 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* progmodes/cc-vars.el (c-backslash-column): Add . at end of sentence.
2006-11-26 Stephen Leake <stephen_leake@stephe-leake.org>
* progmodes/ada-mode.el (ada-which-compiler): Fix typo in docstring.
(ada-compile-goto-error): Adapt to new argument profile of
compilation-goto-locus in Emacs 22. Don't check if the various
compile functions are defined; we already do "(require 'compile)".
2006-11-26 Kim F. Storm <storm@cua.dk>
* kmacro.el: Fix commentary.
2006-11-26 Nick Roberts <nickrob@snap.net.nz>
* progmodes/gud.el (gdb): Explain how to run in text command mode
more clearly. Say in error message that multiple debugging
requires restarting GDB.
2006-11-25 Juanma Barranquero <lekktu@gmail.com>
* international/fontset.el (create-fontset-from-fontset-spec): Doc fix.
2006-11-25 Pavel Kobiakov <pk_at_work@yahoo.com>
* progmodes/flymake.el (flymake-posn-at-point-as-event): New function.
(flymake-popup-menu): Use it instead of posn-at-point.
2006-11-25 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* progmodes/cc-vars.el (c-backslash-column):
Mention c-backslash-max-column in documentation for c-backslash-column.
2006-11-24 Lars Hansen <larsh@soem.dk>
* net/tramp.el (tramp-default-method): Under Windows, change from
plink to pscp.
(tramp-copy-failed-regexp, tramp-action-copy-failed): Add.
(tramp-actions-copy-out-of-band):
Add pair (tramp-copy-failed-regexp tramp-action-copy-failed).
(tramp-action-out-of-band): Move "Permission denied" handling to
tramp-action-copy-failed.
(tramp-do-copy-or-rename-file-out-of-band): unwind-protect killing of
process buffer.
2006-11-24 Stefan Monnier <monnier@iro.umontreal.ca>
* pgg-pgp.el (pgg-pgp-process-region): Change `args' from a list of
strings to a single string. Quote `errors-file-name'.
(pgg-pgp-encrypt-region, pgg-pgp-decrypt-region, pgg-pgp-sign-region)
(pgg-pgp-verify-region, pgg-pgp-insert-key, pgg-pgp-snarf-keys-region):
Adjust calls. Use `shell-quote-argument'.
* international/mule.el (load-with-code-conversion)
(with-category-table): Use with-current-buffer.
(after-insert-file-set-coding): Use restore-buffer-modified-p.
2006-11-24 Eli Zaretskii <eliz@gnu.org>
* mail/smtpmail.el (smtpmail-send-it):
Copy buffer-file-coding-system from the mail buffer. Possibly add a
MIME header for the message encoding.
Bind coding-system-for-write around the call to mail-do-fcc.
Use smtpmail-code-conv-from to encode queued mail messages.
2006-11-24 Juanma Barranquero <lekktu@gmail.com>
* tabify.el (tabify-regexp): Doc fix.
* net/rcirc.el (rcirc-buffer-maximum-lines):
* progmodes/gud.el (jdb): Fix space/tab mixup in docstrings.
* play/gomoku.el (gomoku-terminate-game, gomoku-human-takes-back)
(gomoku-prompt-for-move, gomoku-human-plays, gomoku-offer-a-draw):
Fix typos in output messages.
(gomoku-vector-length, gomoku-init-board): Fix typos in docstrings.
2006-11-23 Stefan Monnier <monnier@iro.umontreal.ca>
* hexl.el (hexl-mode): Don't try to guess the max-address: get it from
the horse's mouth.
(hexlify-buffer): Don't re-encode an arg that's already encoded.
2006-11-23 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-diff.el (ediff-exec-process, ediff-same-file-contents):
Remove condition-case.
2006-11-23 Glenn Morris <rgm@gnu.org>
* progmodes/f90.el (f90-comment-indent): Do not move point in
default case.
2006-11-21 Romain Francoise <romain@orebokech.com>
* emacs-lisp/find-func.el (find-library-name): Don't strip ".el"
from library name (reverts change of 2005-10-25).
2006-11-21 Lennart Borgman <lennart.borgman.073@student.lu.se>
* tutorial.el (tutorial--default-keys): Add newline and
delete-backward-char bindings.
(tutorial--detailed-help): Save excursion when finding keys.
Correct warning string for M-x FOO case.
(tutorial--display-changes): Print special keys in tutorial style.
Tweak search regexp for changed keys.
2006-11-21 Bob Rogers <rogers-emacs@rgrjr.dyndns.org> (tiny change)
* thingatpt.el (thing-at-point-url-at-point): Don't add a
* thingatpt.el (thing-at-point-url-at-point): Don't add a
redundant scheme.
2006-11-21 Diane Murray <disumu@x3y2z1.net> (tiny change)
* thingatpt.el (thing-at-point-uri-schemes): Added schemes that
* thingatpt.el (thing-at-point-uri-schemes): Add schemes that
are new to the list at IANA. Also added irc, mms, mmsh.
2006-11-20 J.D. Smith <jdsmith@as.arizona.edu>
* progmodes/idlw-help.el (idlwave-html-help-location): Fail
gracefully for missing help packages.
* progmodes/idlw-help.el (idlwave-html-help-location):
Fail gracefully for missing help packages.
(idlwave-help-assistant-open-link): Open full links.
(idlwave-help-assistant-help-with-topic): Direct help link.
* progmodes/idlwave.el (idlwave-mode): Set
add-log-current-defun-function.
(idlwave-current-routine-fullname): Added, to support add-log.
* progmodes/idlwave.el (idlwave-mode):
Set add-log-current-defun-function.
(idlwave-current-routine-fullname): Add, to support add-log.
(idlwave-convert-xml-system-routine-info): Simplify XML parsing
to reflect improvements to xml-parse-file.
(idlwave-mode-menu-def): New binding for help-with-topic.
@ -47,15 +557,15 @@
* emacs-lisp/regexp-opt.el (regexp-opt): Doc fix.
2006-11-19 Micha,bk(Bl Cadilhac <michael.cadilhac@lrde.org>
2006-11-19 Micha,Ak(Bl Cadilhac <michael.cadilhac@lrde.org>
* progmodes/glasses.el (glasses-separate-parentheses-exceptions): New.
Exceptions to the rule "add a space between an identifier and an
opening parenthesis". Defaulted to the `#define' problem of cpp.
(glasses-parenthesis-exception-p): New. Check if the region is an
(glasses-parenthesis-exception-p): New. Check if the region is an
exception regarding to that.
(glasses-make-readable): Use it.
(glasses-convert-to-unreadable): Ditto. Modify the file also if
(glasses-convert-to-unreadable): Ditto. Modify the file also if
`glasses-convert-on-write-p' and `glasses-separate-parentheses-p' are t.
2006-11-19 Chong Yidong <cyd@stupidchicken.com>
@ -99,7 +609,7 @@
2006-11-17 Carsten Dominik <dominik@science.uva.nl>
* textmodes/org.el (org-scan-tags): Re-align code fixed.
(org-detach-overlay): Renamed from `org-detatch-overlay'.
(org-detach-overlay): Rename from `org-detatch-overlay'.
(org-table-convert-region): Insert space after column separator.
(org-agenda-kill): New command.
(org-metaleft): Call `org-outdent-item' on bullets.
@ -120,7 +630,7 @@
2006-11-16 Kim F. Storm <storm@cua.dk>
* ido.el (ido-file-internal): Use current buffer's file name as default
* ido.el (ido-file-internal): Use current buffer's file name as default
choice for ido-find-alternate-file. Suggested by Matt Hodges.
2006-11-15 Ken Manheimer <ken.manheimer@gmail.com>
@ -256,8 +766,8 @@
Delete support for old versions of `align'.
(ada-search-prev-end-stmt): Handle additional keyword `private'.
(ada-check-defun-name): Simplify handling of `declare'.
(ada-goto-matching-start): Handle nested `begin ... end'. Handle
`declare', `protected', `procedure', `function'.
(ada-goto-matching-start): Handle nested `begin ... end'.
Handle `declare', `protected', `procedure', `function'.
(ada-create-menu): Presence of arm95 is not conditional on using
GNAT compiler.
@ -340,15 +850,14 @@
2006-11-10 Carsten Dominik <carsten.dominik@gmail.com>
* textmodes/org.el (org-show-hierarchy-above)
(org-show-following-heading): Fixed typo in default value.
(org-show-following-heading): Fix typo in default value.
(org-scan-tags): Make the search case-sensitive.
(org-tags-sparse-tree): Don't overrule
`org-show-following-heading' and `org-show-hierarchy-above'.
(org-reveal): New command.
(org-show-context): Renamed from `org-show-hierarchy-above'.
(org-show-context): Rename from `org-show-hierarchy-above'.
(org-fast-tag-selection-single-key): New option.
(org-fast-tag-show-exit, org-set-current-tags-overlay): New
functions.
(org-fast-tag-show-exit, org-set-current-tags-overlay): New functions.
(org-tags-overlay): New variable.
(org-agenda-todo-ignore-deadlines): New option.
("session"): Add circular data structure `org-mark-ring' to
@ -356,32 +865,29 @@
(org-agenda-window-setup, org-agenda-restore-windows-after-quit):
New options.
(org-agenda-quit): Use `org-agenda-restore-windows-after-quit'.
(org-prepare-agenda, org-agenda-quit): Use
`org-agenda-window-setup'.
(org-pre-agenda-window-conf, org-blank-before-new-entry): New
variables.
(org-prepare-agenda, org-agenda-quit): Use `org-agenda-window-setup'.
(org-pre-agenda-window-conf, org-blank-before-new-entry): New vars.
(org-finalize-agenda): Activate bracket links in agenda.
(org-at-timestamp-p, org-at-date-range-p): Additional argument
INACTIVE-OK.
(org-show-hierarchy-above, org-show-following-heading): List
values allowed for fine-tuned configuration.
(org-show-hierarchy-above, org-show-following-heading):
List values allowed for fine-tuned configuration.
(org-show-hierarchy-above): New argument CONTEXT, use the
fine-tuned settings in `org-show-hierarchy-above' and
`org-show-following-heading'.
(org-display-custom-time): New function.
(org-toggle-time-stamp-overlays, org-insert-time-stamp): New
function.
(org-toggle-time-stamp-overlays, org-insert-time-stamp): New function.
(org-display-custom-times, org-time-stamp-custom-formats):
(org-maybe-intangible): New macro.
(org-activate-bracket-links, org-hide-wide-columns): Use
`org-maybe-intangible'.
(org-activate-bracket-links, org-hide-wide-columns):
Use `org-maybe-intangible'.
(org-open-file): Use `shell-quote-argument'.
(org-display-internal-link-with-indirect-buffer): New option.
(org-file-remote-p): Get regexp from list.
(org-link-expand-abbrev): New function.
(org-link-abbrev-alist): New option.
(org-open-at-point, org-cleaned-string-for-export): Call
`org-link-expand-abbrev'.
(org-open-at-point, org-cleaned-string-for-export):
Call `org-link-expand-abbrev'.
(org-timeline, org-agenda-list, org-todo-list)
(org-tags-view): Remove the KEEP-MODES argument.
(org-finalize-agenda-hook): New hook.
@ -390,8 +896,7 @@
(org-open-at-point): Call `org-follow-timestamp-link'.
(org-log-note-marker, org-log-note-purpose)
(org-log-note-window-configuration): New variables.
(org-add-log-maybe, org-add-log-note, org-store-log-note): New
functions.
(org-add-log-maybe, org-add-log-note, org-store-log-note): New funs.
(org-log-note-headings): New option.
(org-dblock-write:clocktable): Bug fix, removed infinite loop.
(org-store-link): Support for dired-mode.
@ -406,14 +911,12 @@
the text property inticating the agenda type.
(org-agenda-post-command-hook): Get agenda type from text property
at point.
(org-agenda): Handle command sets. Set
`org-agenda-last-arguments' and obey
`org-agenda-overriding-arguments'.
(org-agenda-overriding-arguments, org-agenda-last-arguments): New
variables.
(org-agenda): Handle command sets. Set `org-agenda-last-arguments'
and obey `org-agenda-overriding-arguments'.
(org-agenda-overriding-arguments, org-agenda-last-arguments): New vars.
(org-agenda-goto-today, org-agenda-later, org-agenda-earlier)
(org-agenda-week-view, org-agenda-day-view): Use
`org-agenda-overriding-arguments' to make updating work with
(org-agenda-week-view, org-agenda-day-view):
Use `org-agenda-overriding-arguments' to make updating work with
multi-block agendas.
(org-agenda-prefix-format): Allow different formats for the
different agenda entry types.
@ -424,11 +927,11 @@
`org-select-agenda-window' instead.
(org-respect-restriction): Variable removed.
(org-cmp-tag): New function.
(org-agenda-sorting-strategy, org-entries-lessp): Implement
sorting by last tag.
(org-agenda-sorting-strategy, org-entries-lessp):
Implement sorting by last tag.
(org-complete): Better completion in in-buffer option lines.
(org-in-item-p): New function.
(org-org-menu): Added entries for checkboxes.
(org-org-menu): Add entries for checkboxes.
(org-cycle): Extra brouping in outline-regexp, because it is used
in a search with "^" prepended.
(org-provide-checkbox-statistics): New option.
@ -436,16 +939,16 @@
(org-update-checkbox-count-maybe)
(org-get-checkbox-statistics-face): New functions.
(org-update-checkbox-count): New command.
(org-insert-item, org-toggle-checkbox): Call
`org-update-checkbox-count-maybe'.
(org-insert-item, org-toggle-checkbox):
Call `org-update-checkbox-count-maybe'.
(org-export-as-html): XEmacs compatibility for coding system.
(org-force-cycle-archived): New command.
(org-cycle-hide-archived-subtrees): Display message when ARCHIVE
overrules cycling.
(org-fix-position-after-promote): If the line contains only a todo
keyword, add a final space.
(org-promote-subtree, org-demote-subtree): Call
`org-fix-position-after-promote'.
(org-promote-subtree, org-demote-subtree):
Call `org-fix-position-after-promote'.
2006-11-10 Glenn Morris <rgm@gnu.org>
@ -551,8 +1054,8 @@
2006-11-08 Kenichi Handa <handa@m17n.org>
* international/mule-cmds.el (set-default-coding-systems): Always
set default-file-name-coding-system to utf-8 for Mac Darwin.
* international/mule-cmds.el (set-default-coding-systems):
Always set default-file-name-coding-system to utf-8 for Mac Darwin.
2006-11-08 Juanma Barranquero <lekktu@gmail.com>
@ -787,8 +1290,7 @@
2006-11-04 Yoni Rabkin Katzenell <yoni-r@actcom.com> (tiny change)
* faces.el (faces-sample-overlay, describe-face): Revert last
changes.
* faces.el (faces-sample-overlay, describe-face): Revert last changes.
(faces-sample-overlay): Remove variable.
(describe-face): Insert sample text in the face being described.
@ -799,12 +1301,12 @@
(whitespace-buffer): Use `remove-overlays' instead of
`whitespace-unhighlight-the-space' and `overlay-recenter' to
speed up overlay handling.
(whitespace-buffer-leading, whitespace-buffer-trailing): Make
these functions highlight the text removed by
(whitespace-buffer-leading, whitespace-buffer-trailing):
Make these functions highlight the text removed by
`whitespace-buffer-leading-cleanup' and
`whitespace-buffer-trailing-cleanup' respectively.
(whitespace-buffer-search): Use `with-local-quit'. Move
`format' out of loop to speed up scanning larger buffers.
(whitespace-buffer-search): Use `with-local-quit'.
Move `format' out of loop to speed up scanning larger buffers.
(whitespace-unhighlight-the-space): Remove `remove-hook' since
that function is never added to a hook.
(whitespace-spacetab-regexp, whitespace-ateol-regexp)
@ -835,7 +1337,7 @@
(allout-deannotate-hidden): New function to remove was-hidden
annotation.
(allout-hide-by-annotation): Use new allout-deannotate-hidden.
(allout-remove-exposure-annotation): Replaced by
(allout-remove-exposure-annotation): Replace by
allout-deannotate-hidden.
(allout-yank-processing): Signal that yank processing is happening
with allout-during-yank-processing. Also, wrap
@ -961,10 +1463,10 @@
2006-10-30 Lennart Borgman <lennart.borgman.073@student.lu.se>
* help-fns.el (help-with-tutorial): Moved to tutorial.el.
* help-fns.el (help-with-tutorial): Move to tutorial.el.
* tutorial.el: New file.
(help-with-tutorial): Moved here from help-fns.el. Added help for
(help-with-tutorial): Move here from help-fns.el. Added help for
rebound keys. Fixed resume of tutorial.
(tutorial--describe-nonstandard-key, tutorial--sort-keys)
(tutorial--find-changed-keys, tutorial--display-changes)
@ -2201,7 +2703,7 @@
* select.el (xselect-convert-to-string): If UTF8_STRING is requested
and the data doesn't look like UTF8, send STRING instead.
2006-09-16 Agustin Martin <agustin.martin@hispalinux.es>
2006-09-16 Agust,Am(Bn Mart,Am(Bn <agustin.martin@hispalinux.es>
* textmodes/flyspell.el (flyspell-check-region-doublons):
New function to detect duplicated words.
@ -2646,7 +3148,7 @@
* dired.el (dired-log-summary): Add doc string.
* cus-edit.el (custom-menu-create): Bind deactivate-mark here
* cus-edit.el (custom-menu-create): Bind deactivate-mark here.
(custom-group-menu-create): Not here.
2006-09-08 Carsten Dominik <dominik@science.uva.nl>
@ -6939,8 +7441,7 @@
(defcustom, defface, defgroup): Replace reference to Customization
chapter in manual with hyperlink.
* cus-edit.el (customize-package-emacs-version-alist):
New variable.
* cus-edit.el (customize-package-emacs-version-alist): New variable.
(customize-changed-options): Add check for custom-package-version.
(customize-package-emacs-version): New function to look up Emacs
version corresponding to the given package version.
@ -7019,7 +7520,7 @@
* files.el (hack-local-variables-confirm) <offer-save>:
Clarify message text. Suggested by Ralf Angeli.
2006-04-08 Michael Cadilhac <michael.cadilhac@lrde.org>
2006-04-08 Micha,Ak(Bl Cadilhac <michael.cadilhac@lrde.org>
* rect.el (kill-rectangle): Don't barf if `kill-read-only-ok' is set.
(delete-extract-rectangle-line): Use `filter-buffer-substring'
@ -9873,7 +10374,7 @@
(find-variable-other-frame, find-variable-at-point):
Fix docstrings.
2006-01-21 Francesco Potorti` <pot@gnu.org>
2006-01-21 Francesco Potort,Al(B <pot@gnu.org>
* mail/rmailout.el (rmail-output): Don't use content-type if it is nil.
@ -13847,7 +14348,7 @@
since the last ping.
(rcirc-mode): Give rcirc-topic a local binding here.
2005-11-19 Michael Cadilhac <michael.cadilhac@lrde.org>
2005-11-19 Micha,Ak(Bl Cadilhac <michael.cadilhac@lrde.org>
* subr.el (read-passwd): Fontify the prompt as we do with other
prompts.
@ -15458,7 +15959,7 @@
* dired-x.el (dired-virtual): Don't use `dired-insert-headerline'.
2005-10-25 Michael Cadilhac <michael.cadilhac-@t-lrde.epita.fr>
2005-10-25 Micha,Ak(Bl Cadilhac <michael.cadilhac-@t-lrde.epita.fr>
* play/blackbox.el (blackbox-redefine-key): New function.
(blackbox-mode-map): Use it to remap existing bindings for cursor
@ -16722,7 +17223,7 @@
* progmodes/gdb-ui.el (gdb-fringe-width -> gdb-buffer-fringe-width):
Typo.
2005-10-06 Michael Cadilhac <michael.cadilhac-@t-lrde.epita.fr>
2005-10-06 Micha,Ak(Bl Cadilhac <michael.cadilhac-@t-lrde.epita.fr>
* play/zone.el (zone): Wrap body with save-window-excursion.
@ -17890,7 +18391,7 @@
* mail/sendmail.el (default-sendmail-coding-system): Doc fix.
2005-09-09 Emilio Lopes <eclig@gmx.net>
2005-09-09 Emilio C. Lopes <eclig@gmx.net>
* woman.el: Format- and whitespace-related changes.
@ -20142,7 +20643,7 @@
* server.el: Bind "C-x #" in a way that works even if C-x is
redefined to a command key, not a prefix key.
2005-07-16 Johan Bockgard <bojohan@users.sourceforge.net> (tiny change)
2005-07-16 Johan Bockg,Ae(Brd <bojohan@users.sourceforge.net> (tiny change)
* emacs-lisp/cl-macs.el (cl-make-type-test): Defer evaluation of
cl-make-type-test till execution time.
@ -20152,7 +20653,7 @@
* dired-x.el (dired-do-relsymlink-regexp): Add missing optional
arg ARG and use it.
2005-07-16 Johan Bockgard <bojohan@users.sourceforge.net> (tiny change)
2005-07-16 Johan Bockg,Ae(Brd <bojohan@users.sourceforge.net> (tiny change)
* emacs-lisp/cl-macs.el (cl-make-type-test): Add `atom' type.
@ -28222,7 +28723,7 @@
* emacs-lisp/lisp.el (buffer-end): Doc fix.
2005-02-05 Arne_J,Ax(Brgensen <arne@arnested.dk> (tiny change)
2005-02-05 Arne J,Ax(Brgensen <arne@arnested.dk> (tiny change)
* net/ldap.el (ldap-search-internal): Support attributes with
optional descriptions separated by a semi-colon, as in
@ -29339,7 +29840,7 @@
(calc-edit-macro-finish-edit): New functions.
(calc-user-define-edit): Use new functions to edit named calc macros.
2005-01-01 Stefan <monnier@iro.umontreal.ca>
2005-01-01 Stefan Monnier <monnier@iro.umontreal.ca>
* files.el (hack-local-variables): Cleanup prefix/suffix matching.

2
lisp/abbrev.el
View file

@ -1,6 +1,6 @@
;;; abbrev.el --- abbrev mode commands for Emacs
;; Copyright (C) 1985, 1986, 1987, 1992, 2002, 2003, 2004,
;; Copyright (C) 1985, 1986, 1987, 1992, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF

2
lisp/abbrevlist.el
View file

@ -1,6 +1,6 @@
;;; abbrevlist.el --- list one abbrev table alphabetically ordered
;; Copyright (C) 1986, 1992, 2002, 2003, 2004,
;; Copyright (C) 1986, 1992, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Suggested by a previous version by Gildea.

4
lisp/add-log.el
View file

@ -1,7 +1,7 @@
;;; add-log.el --- change log maintenance commands for Emacs
;; Copyright (C) 1985, 1986, 1988, 1993, 1994, 1997, 1998, 2000, 2002,
;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Copyright (C) 1985, 1986, 1988, 1993, 1994, 1997, 1998, 2000, 2001,
;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: tools

2
lisp/align.el
View file

@ -1,6 +1,6 @@
;;; align.el --- align text to a specific column, by regexp
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>

490
lisp/allout.el
View file

@ -162,7 +162,7 @@ The types of elements in the layout specification are:
: - repeat spec - apply the preceeding element to all siblings at
current level, *up to* those siblings that would be covered by specs
following the `:' on the list. Ie, apply to all topics at level but
trailing ones accounted for by trailing specs. \(Only the first of
trailing ones accounted for by trailing specs. (Only the first of
multiple colons at the same level is honored - later ones are ignored.)
* - completely exposes the topic, including bodies
+ - exposes all subtopics, but not the bodies
@ -230,9 +230,9 @@ advance as follows:
- if the cursor is on the headline and not the start of the headline:
then it goes to the start of the headline
- if the cursor is on the start of the headline:
then it goes to the bullet character \(for hotspot navigation\)
then it goes to the bullet character (for hotspot navigation)
- if the cursor is on the bullet character:
then it goes to the first column of that line \(the headline\)
then it goes to the first column of that line (the headline)
- if the cursor is on the first column of the headline:
then it goes to the start of the headline within the item body.
@ -324,14 +324,14 @@ of this var to take effect."
These bullets are used to distinguish topics from the run-of-the-mill
ones. They are not used in the standard topic headers created by
the topic-opening, shifting, and rebulleting \(eg, on topic shift,
the topic-opening, shifting, and rebulleting (eg, on topic shift,
topic paste, blanket rebulleting) routines, but are offered among the
choices for rebulleting. They are not altered by the above automatic
rebulleting, so they can be used to characterize topics, eg:
`?' question topics
`\(' parenthetic comment \(with a matching close paren inside)
`[' meta-note \(with a matching close ] inside)
`(' parenthetic comment (with a matching close paren inside)
`[' meta-note (with a matching close ] inside)
`\"' a quotation
`=' value settings
`~' \"more or less\"
@ -367,13 +367,13 @@ String values are used as literals, not regular expressions, so
do not escape any regulare-expression characters.
Value t means to first check for assoc value in `allout-mode-leaders'
alist, then use comment-start string, if any, then use default \(`.').
alist, then use comment-start string, if any, then use default (`.').
\(See note about use of comment-start strings, below.)
Set to the symbol for either of `allout-mode-leaders' or
`comment-start' to use only one of them, respectively.
Value nil means to always use the default \(`.') and leave
Value nil means to always use the default (`.') and leave
`allout-primary-bullet' unaltered.
comment-start strings that do not end in spaces are tripled in
@ -605,7 +605,7 @@ The idea is to prevent file-system exposure of any un-encrypted stuff, and
mostly covers both deliberate file writes and auto-saves.
- Yes: encrypt all topics pending encryption, even if it's the one
currently being edited. \(In that case, the currently edited topic
currently being edited. (In that case, the currently edited topic
will be automatically decrypted before any user interaction, so they
can continue editing but the copy on the file system will be
encrypted.)
@ -619,7 +619,7 @@ mostly covers both deliberate file writes and auto-saves.
- No: leave it to the user to encrypt any unencrypted topics.
For practical reasons, auto-saves always use the 'except-current policy
when auto-encryption is enabled. \(Otherwise, spurious passphrase prompts
when auto-encryption is enabled. (Otherwise, spurious passphrase prompts
and unavoidable timing collisions are too disruptive.) If security for a
file requires that even the current topic is never auto-saved in the clear,
disable auto-saves for that file."
@ -717,8 +717,8 @@ unless optional third, non-nil element is present.")
You can customize this setting to set it for all allout buffers, or set it
in individual buffers if you want to inhibit auto-fill only in particular
buffers. \(You could use a function on `allout-mode-hook' to inhibit
auto-fill according, eg, to the major mode.\)
buffers. (You could use a function on `allout-mode-hook' to inhibit
auto-fill according, eg, to the major mode.)
If you don't set this and auto-fill-mode is enabled, allout will use the
value that `normal-auto-fill-function', if any, when allout mode starts, or
@ -783,7 +783,7 @@ For details, see `allout-toggle-current-subtree-encryption's docstring."
;;;_ : Version
;;;_ = allout-version
(defvar allout-version "2.2.1"
"Version of currently loaded outline package. \(allout.el)")
"Version of currently loaded outline package. (allout.el)")
;;;_ > allout-version
(defun allout-version (&optional here)
"Return string describing the loaded outline version."
@ -800,7 +800,7 @@ For details, see `allout-toggle-current-subtree-encryption's docstring."
(defvar allout-layout nil ; LEAVE GLOBAL VALUE NIL - see docstring.
"Buffer-specific setting for allout layout.
In buffers where this is non-nil \(and if `allout-init' has been run, to
In buffers where this is non-nil (and if `allout-init' has been run, to
enable this behavior), `allout-mode' will be automatically activated. The
layout dictated by the value will be used to set the initial exposure when
`allout-mode' is activated.
@ -812,12 +812,12 @@ The value would typically be set by a file local variable. For
example, the following lines at the bottom of an Emacs Lisp file:
;;;Local variables:
;;;allout-layout: \(0 : -1 -1 0)
;;;allout-layout: (0 : -1 -1 0)
;;;End:
dictate activation of `allout-mode' mode when the file is visited
\(presuming allout-init was already run), followed by the
equivalent of `\(allout-expose-topic 0 : -1 -1 0)'. \(This is
equivalent of `(allout-expose-topic 0 : -1 -1 0)'. (This is
the layout used for the allout.el source file.)
`allout-default-layout' describes the specification format.
@ -930,7 +930,7 @@ Works according to settings of:
`allout-use-mode-specific-leader'
and `allout-mode-leaders'.
Apply this via \(re)activation of `allout-mode', rather than
Apply this via (re)activation of `allout-mode', rather than
invoking it directly."
(let* ((use-leader (and (boundp 'allout-use-mode-specific-leader)
(if (or (stringp allout-use-mode-specific-leader)
@ -977,7 +977,7 @@ invoking it directly."
(defun allout-infer-body-reindent ()
"Determine proper setting for `allout-reindent-bodies'.
Depends on default setting of `allout-reindent-bodies' \(which see)
Depends on default setting of `allout-reindent-bodies' (which see)
and presence of setting for `comment-start', to tell whether the
file is programming code."
(if (and allout-reindent-bodies
@ -1295,7 +1295,7 @@ their settings before allout-mode was started."
"Symbol for use as allout invisible-text overlay category.")
;;;_ x allout-view-change-hook
(defvar allout-view-change-hook nil
"*\(Deprecated\) A hook run after allout outline exposure changes.
"*(Deprecated) A hook run after allout outline exposure changes.
Switch to using `allout-exposure-change-hook' instead. Both hooks are
currently respected, but the other conveys the details of the exposure
@ -1531,12 +1531,12 @@ So `allout-post-command-business' should not reactivate it...")
MODE is one of the following symbols:
- nil \(or no argument) deactivate auto-activation/layout;
- nil (or no argument) deactivate auto-activation/layout;
- `activate', enable auto-activation only;
- `ask', enable auto-activation, and enable auto-layout but with
confirmation for layout operation solicited from user each time;
- `report', just report and return the current auto-activation state;
- anything else \(eg, t) for auto-activation and auto-layout, without
- anything else (eg, t) for auto-activation and auto-layout, without
any confirmation check.
Use this function to setup your Emacs session for automatic activation
@ -1598,7 +1598,7 @@ the following two lines in your Emacs init file:
((eq mode 'ask)
(message
(concat "Outline mode auto-activation and "
"-layout \(upon confirmation) enabled."))
"-layout (upon confirmation) enabled."))
'ask)
((message
"Outline mode auto-activation and -layout enabled.")
@ -1649,92 +1649,111 @@ symbol. Allout outline mode always runs as a minor mode.
Allout outline mode provides extensive outline oriented formatting and
manipulation. It enables structural editing of outlines, as well as
navigation and exposure. It also is specifically aimed at
accommodating syntax-sensitive text like programming languages. \(For
accommodating syntax-sensitive text like programming languages. (For
an example, see the allout code itself, which is organized as an allout
outline.)
In addition to outline navigation and exposure, allout includes:
In addition to typical outline navigation and exposure, allout includes:
- topic-oriented repositioning, promotion/demotion, cut, and paste
- integral outline exposure-layout
- topic-oriented authoring, including keystroke-based topic creation,
repositioning, promotion/demotion, cut, and paste
- incremental search with dynamic exposure and reconcealment of hidden text
- automatic topic-number maintenance
- adjustable format, so programming code can be developed in outline-structure
- easy topic encryption and decryption
- \"Hot-spot\" operation, for single-keystroke maneuvering and
exposure control. \(See the allout-mode docstring.)
- \"Hot-spot\" operation, for single-keystroke maneuvering and exposure control
- integral outline layout, for automatic initial exposure when visiting a file
- independent extensibility, using comprehensive exposure and authoring hooks
and many other features.
Below is a description of the bindings, and then explanation of
Below is a description of the key bindings, and then explanation of
special `allout-mode' features and terminology. See also the outline
menubar additions for quick reference to many of the features, and see
the docstring of the function `allout-init' for instructions on
priming your emacs session for automatic activation of `allout-mode'.
The bindings are dictated by the customizable `allout-keybindings-list'
variable. We recommend customizing `allout-command-prefix' to use just
`\\C-c' as the command prefix, if the allout bindings don't conflict with
any personal bindings you have on \\C-c. In any case, outline structure
navigation and authoring is simplified by positioning the cursor on an
item's bullet character, the \"hot-spot\" - then you can invoke allout
commands with just the un-prefixed, un-control-shifted command letters.
This is described further in the HOT-SPOT Operation section.
The bindings are dictated by the `allout-keybindings-list' and
`allout-command-prefix' variables.
Exposure Control:
----------------
\\[allout-hide-current-subtree] `allout-hide-current-subtree'
\\[allout-show-children] `allout-show-children'
\\[allout-show-current-subtree] `allout-show-current-subtree'
\\[allout-show-current-entry] `allout-show-current-entry'
\\[allout-show-all] `allout-show-all'
Navigation: Exposure Control:
---------- ----------------
\\[allout-next-visible-heading] allout-next-visible-heading | \\[allout-hide-current-subtree] allout-hide-current-subtree
\\[allout-previous-visible-heading] allout-previous-visible-heading | \\[allout-show-children] allout-show-children
\\[allout-up-current-level] allout-up-current-level | \\[allout-show-current-subtree] allout-show-current-subtree
\\[allout-forward-current-level] allout-forward-current-level | \\[allout-show-current-entry] allout-show-current-entry
\\[allout-backward-current-level] allout-backward-current-level | \\[allout-show-all] allout-show-all
\\[allout-end-of-entry] allout-end-of-entry
\\[allout-beginning-of-current-entry] allout-beginning-of-current-entry, alternately, goes to hot-spot
Navigation:
----------
\\[allout-next-visible-heading] `allout-next-visible-heading'
\\[allout-previous-visible-heading] `allout-previous-visible-heading'
\\[allout-up-current-level] `allout-up-current-level'
\\[allout-forward-current-level] `allout-forward-current-level'
\\[allout-backward-current-level] `allout-backward-current-level'
\\[allout-end-of-entry] `allout-end-of-entry'
\\[allout-beginning-of-current-entry] `allout-beginning-of-current-entry' (alternately, goes to hot-spot)
\\[allout-beginning-of-line] `allout-beginning-of-line' - like regular beginning-of-line, but
if immediately repeated cycles to the beginning of the current item
and then to the hot-spot (if `allout-beginning-of-line-cycles' is set).
Topic Header Production:
-----------------------
\\[allout-open-sibtopic] allout-open-sibtopic Create a new sibling after current topic.
\\[allout-open-subtopic] allout-open-subtopic ... an offspring of current topic.
\\[allout-open-supertopic] allout-open-supertopic ... a sibling of the current topic's parent.
Topic Level and Prefix Adjustment:
---------------------------------
\\[allout-shift-in] allout-shift-in Shift current topic and all offspring deeper.
\\[allout-shift-out] allout-shift-out ... less deep.
\\[allout-rebullet-current-heading] allout-rebullet-current-heading Prompt for alternate bullet for
current topic.
\\[allout-rebullet-topic] allout-rebullet-topic Reconcile bullets of topic and its offspring
- distinctive bullets are not changed, others
alternated according to nesting depth.
\\[allout-number-siblings] allout-number-siblings Number bullets of topic and siblings - the
offspring are not affected. With repeat
count, revoke numbering.
Topic Header Production:
-----------------------
\\[allout-open-sibtopic] `allout-open-sibtopic' Create a new sibling after current topic.
\\[allout-open-subtopic] `allout-open-subtopic' ... an offspring of current topic.
\\[allout-open-supertopic] `allout-open-supertopic' ... a sibling of the current topic's parent.
Topic-oriented Killing and Yanking:
----------------------------------
\\[allout-kill-topic] allout-kill-topic Kill current topic, including offspring.
\\[allout-copy-topic-as-kill] allout-copy-topic-as-kill Copy current topic, including offspring.
\\[allout-kill-line] allout-kill-line kill-line, attending to outline structure.
\\[allout-copy-line-as-kill] allout-copy-line-as-kill Copy line but don't delete it.
\\[allout-yank] allout-yank Yank, adjusting depth of yanked topic to
depth of heading if yanking into bare topic
heading (ie, prefix sans text).
\\[allout-yank-pop] allout-yank-pop Is to allout-yank as yank-pop is to yank
Topic Level and Prefix Adjustment:
---------------------------------
\\[allout-shift-in] `allout-shift-in' Shift current topic and all offspring deeper
\\[allout-shift-out] `allout-shift-out' ... less deep
\\[allout-rebullet-current-heading] `allout-rebullet-current-heading' Prompt for alternate bullet for
current topic
\\[allout-rebullet-topic] `allout-rebullet-topic' Reconcile bullets of topic and
its' offspring - distinctive bullets are not changed, others
are alternated according to nesting depth.
\\[allout-number-siblings] `allout-number-siblings' Number bullets of topic and siblings -
the offspring are not affected.
With repeat count, revoke numbering.
Topic-oriented Encryption:
-------------------------
\\[allout-toggle-current-subtree-encryption] allout-toggle-current-subtree-encryption Encrypt/Decrypt topic content
Topic-oriented Killing and Yanking:
----------------------------------
\\[allout-kill-topic] `allout-kill-topic' Kill current topic, including offspring.
\\[allout-copy-topic-as-kill] `allout-copy-topic-as-kill' Copy current topic, including offspring.
\\[allout-kill-line] `allout-kill-line' kill-line, attending to outline structure.
\\[allout-copy-line-as-kill] `allout-copy-line-as-kill' Copy line but don't delete it.
\\[allout-yank] `allout-yank' Yank, adjusting depth of yanked topic to
depth of heading if yanking into bare topic
heading (ie, prefix sans text).
\\[allout-yank-pop] `allout-yank-pop' Is to allout-yank as yank-pop is to yank
Misc commands:
-------------
M-x outlineify-sticky Activate outline mode for current buffer,
and establish a default file-var setting
for `allout-layout'.
\\[allout-mark-topic] allout-mark-topic
\\[allout-copy-exposed-to-buffer] allout-copy-exposed-to-buffer
Duplicate outline, sans concealed text, to
buffer with name derived from derived from that
of current buffer - \"*BUFFERNAME exposed*\".
\\[allout-flatten-exposed-to-buffer] allout-flatten-exposed-to-buffer
Like above 'copy-exposed', but convert topic
prefixes to section.subsection... numeric
format.
\\[eval-expression] (allout-init t) Setup Emacs session for outline mode
auto-activation.
Topic-oriented Encryption:
-------------------------
\\[allout-toggle-current-subtree-encryption] `allout-toggle-current-subtree-encryption'
Encrypt/Decrypt topic content
Misc commands:
-------------
M-x outlineify-sticky Activate outline mode for current buffer,
and establish a default file-var setting
for `allout-layout'.
\\[allout-mark-topic] `allout-mark-topic'
\\[allout-copy-exposed-to-buffer] `allout-copy-exposed-to-buffer'
Duplicate outline, sans concealed text, to
buffer with name derived from derived from that
of current buffer - \"*BUFFERNAME exposed*\".
\\[allout-flatten-exposed-to-buffer] `allout-flatten-exposed-to-buffer'
Like above 'copy-exposed', but convert topic
prefixes to section.subsection... numeric
format.
\\[eval-expression] (allout-init t) Setup Emacs session for outline mode
auto-activation.
Topic Encryption
@ -1742,17 +1761,22 @@ Outline mode supports gpg encryption of topics, with support for
symmetric and key-pair modes, passphrase timeout, passphrase
consistency checking, user-provided hinting for symmetric key
mode, and auto-encryption of topics pending encryption on save.
\(Topics pending encryption are, by default, automatically
encrypted during file saves; if you're editing the contents of
such a topic, it is automatically decrypted for continued
editing.) The aim is reliable topic privacy while preventing
accidents like neglected encryption before saves, forgetting
which passphrase was used, and other practical pitfalls.
See `allout-toggle-current-subtree-encryption' function docstring and
`allout-encrypt-unencrypted-on-saves' customization variable for details.
Topics pending encryption are, by default, automatically
encrypted during file saves. If the contents of the topic
containing the cursor was encrypted for a save, it is
automatically decrypted for continued editing.
HOT-SPOT Operation
The aim of these measures is reliable topic privacy while
preventing accidents like neglected encryption before saves,
forgetting which passphrase was used, and other practical
pitfalls.
See `allout-toggle-current-subtree-encryption' function docstring
and `allout-encrypt-unencrypted-on-saves' customization variable
for details.
HOT-SPOT Operation
Hot-spot operation provides a means for easy, single-keystroke outline
navigation and exposure control.
@ -1765,85 +1789,108 @@ would invoke the command typically bound to \"C-c<space>C-f\"
Thus, by positioning the cursor on a topic bullet, you can
execute the outline navigation and manipulation commands with a
single keystroke. Regular navigation keys (eg, \\[forward-char], \\[next-line]) never get
single keystroke. Regular navigation keys (eg, \\[forward-char], \\[next-line]) don't get
this special translation, so you can use them to get out of the
hot-spot and back to normal operation.
hot-spot and back to normal editing operation.
Note that the command `allout-beginning-of-current-entry' \(\\[allout-beginning-of-current-entry]\)
will move to the hot-spot when the cursor is already located at the
beginning of the current entry, so you usually can hit \\[allout-beginning-of-current-entry]
twice in a row to get to the hot-spot.
In allout-mode, the normal beginning-of-line command (\\[allout-beginning-of-line]]) is
replaced with one that makes it easy to get to the hot-spot. If you
repeat it immediately it cycles (if `allout-beginning-of-line-cycles'
is set) to the beginning of the item and then, if you hit it again
immediately, to the hot-spot. Similarly, `allout-beginning-of-current-entry'
\(\\[allout-beginning-of-current-entry]) moves to the hot-spot when the cursor is already located
at the beginning of the current entry.
Terminology
Extending Allout
Allout exposure and authoring activites all have associated
hooks, by which independent code can cooperate with allout
without changes to the allout core. Here are key ones:
`allout-mode-hook'
`allout-mode-deactivate-hook'
`allout-exposure-change-hook'
`allout-structure-added-hook'
`allout-structure-deleted-hook'
`allout-structure-shifted-hook'
Terminology
Topic hierarchy constituents - TOPICS and SUBTOPICS:
TOPIC: A basic, coherent component of an Emacs outline. It can
contain and be contained by other topics.
CURRENT topic:
The visible topic most immediately containing the cursor.
DEPTH: The degree of nesting of a topic; it increases with
containment. Also called the:
LEVEL: The same as DEPTH.
ITEM: A unitary outline element, including the HEADER and ENTRY text.
TOPIC: An ITEM and any ITEMs contained within it, ie having greater DEPTH
and with no intervening items of lower DEPTH than the container.
CURRENT ITEM:
The visible ITEM most immediately containing the cursor.
DEPTH: The degree of nesting of an ITEM; it increases with containment.
The DEPTH is determined by the HEADER PREFIX. The DEPTH is also
called the:
LEVEL: The same as DEPTH.
ANCESTORS:
The topics that contain a topic.
PARENT: A topic's immediate ancestor. It has a depth one less than
the topic.
Those ITEMs whose TOPICs contain an ITEM.
PARENT: An ITEM's immediate ANCESTOR. It has a DEPTH one less than that
of the ITEM.
OFFSPRING:
The topics contained by a topic;
The ITEMs contained within an ITEM's TOPIC.
SUBTOPIC:
An immediate offspring of a topic;
CHILDREN:
The immediate offspring of a topic.
An OFFSPRING of its ANCESTOR TOPICs.
CHILD:
An immediate SUBTOPIC of its PARENT.
SIBLINGS:
Topics having the same parent and depth.
TOPICs having the same PARENT and DEPTH.
Topic text constituents:
HEADER: The first line of a topic, include the topic PREFIX and header
text.
PREFIX: The leading text of a topic which distinguishes it from normal
text. It has a strict form, which consists of a prefix-lead
string, padding, and a bullet. The bullet may be followed by a
HEADER: The first line of an ITEM, include the ITEM PREFIX and HEADER
text.
ENTRY: The text content of an ITEM, before any OFFSPRING, but including
the HEADER text and distinct from the ITEM PREFIX.
BODY: Same as ENTRY.
PREFIX: The leading text of an ITEM which distinguishes it from normal
ENTRY text. Allout recognizes the outline structure according
to the strict PREFIX format. It consists of a PREFIX-LEAD string,
PREFIX-PADDING, and a BULLET. The BULLET might be followed by a
number, indicating the ordinal number of the topic among its
siblings, a space, and then the header text.
siblings, or an asterisk indicating encryption, plus an optional
space. After that is the ITEM HEADER text, which is not part of
the PREFIX.
The relative length of the PREFIX determines the nesting depth
of the topic.
The relative length of the PREFIX determines the nesting DEPTH
of the ITEM.
PREFIX-LEAD:
The string at the beginning of a topic prefix, normally a `.'.
It can be customized by changing the setting of
`allout-header-prefix' and then reinitializing `allout-mode'.
The string at the beginning of a HEADER PREFIX, by default a `.'.
It can be customized by changing the setting of
`allout-header-prefix' and then reinitializing `allout-mode'.
By setting the prefix-lead to the comment-string of a
programming language, you can embed outline structuring in
program code without interfering with the language processing
of that code. See `allout-use-mode-specific-leader'
docstring for more detail.
When the PREFIX-LEAD is set to the comment-string of a
programming language, outline structuring can be embedded in
program code without interfering with processing of the text
(by emacs or the language processor) as program code. This
setting happens automatically when allout mode is used in
programming-mode buffers. See `allout-use-mode-specific-leader'
docstring for more detail.
PREFIX-PADDING:
Spaces or asterisks which separate the prefix-lead and the
bullet, determining the depth of the topic.
BULLET: A character at the end of the topic prefix, it must be one of
the characters listed on `allout-plain-bullets-string' or
Spaces or asterisks which separate the PREFIX-LEAD and the
bullet, determining the ITEM's DEPTH.
BULLET: A character at the end of the ITEM PREFIX, it must be one of
the characters listed on `allout-plain-bullets-string' or
`allout-distinctive-bullets-string'. (See the documentation
for these variables for more details.) The default choice of
bullet when generating topics varies in a cycle with the depth of
the topic.
ENTRY: The text contained in a topic before any offspring.
BODY: Same as ENTRY.
BULLET when generating ITEMs varies in a cycle with the DEPTH of
the ITEM.
EXPOSURE:
The state of a topic which determines the on-screen visibility
of its offspring and contained text.
The state of a TOPIC which determines the on-screen visibility
of its OFFSPRING and contained ENTRY text.
CONCEALED:
Topics and entry text whose display is inhibited. Contiguous
units of concealed text is represented by `...' ellipses.
TOPICs and ENTRY text whose EXPOSURE is inhibited. Concealed
text is represented by \"...\" ellipses.
Concealed topics are effectively collapsed within an ancestor.
CLOSED: A topic whose immediate offspring and body-text is concealed.
OPEN: A topic that is not closed, though its offspring or body may be."
CONCEALED TOPICs are effectively collapsed within an ANCESTOR.
CLOSED: A TOPIC whose immediate OFFSPRING and body-text is CONCEALED.
OPEN: A TOPIC that is not CLOSED, though its OFFSPRING or BODY may be."
;;;_ . Code
(interactive "P")
@ -1934,22 +1981,8 @@ OPEN: A topic that is not closed, though its offspring or body may be."
extend))
;; Produce map from current version of allout-keybindings-list:
(setq allout-mode-map
(produce-allout-mode-map allout-keybindings-list))
(substitute-key-definition 'beginning-of-line
'allout-beginning-of-line
allout-mode-map global-map)
(substitute-key-definition 'move-beginning-of-line
'allout-beginning-of-line
allout-mode-map global-map)
(substitute-key-definition 'end-of-line
'allout-end-of-line
allout-mode-map global-map)
(substitute-key-definition 'move-end-of-line
'allout-end-of-line
allout-mode-map global-map)
(allout-setup-mode-map)
(produce-allout-mode-menubar-entries)
(fset 'allout-mode-map allout-mode-map)
;; Include on minor-mode-map-alist, if not already there:
(if (not (member '(allout-mode . allout-mode-map)
@ -2039,6 +2072,31 @@ OPEN: A topic that is not closed, though its offspring or body may be."
allout-mode
) ; let*
) ; defun
(defun allout-setup-mode-map ()
"Establish allout-mode bindings."
(setq-default allout-mode-map
(produce-allout-mode-map allout-keybindings-list))
(setq allout-mode-map
(produce-allout-mode-map allout-keybindings-list))
(substitute-key-definition 'beginning-of-line
'allout-beginning-of-line
allout-mode-map global-map)
(substitute-key-definition 'move-beginning-of-line
'allout-beginning-of-line
allout-mode-map global-map)
(substitute-key-definition 'end-of-line
'allout-end-of-line
allout-mode-map global-map)
(substitute-key-definition 'move-end-of-line
'allout-end-of-line
allout-mode-map global-map)
(fset 'allout-mode-map allout-mode-map))
;; ensure that allout-mode-map has some setting even if allout-mode hasn't
;; been invoked:
(allout-setup-mode-map)
;;;_ > allout-minor-mode
(defalias 'allout-minor-mode 'allout-mode)
@ -2453,7 +2511,7 @@ Outermost is first."
(t (allout-end-of-entry))))))
;;;_ > allout-next-heading ()
(defsubst allout-next-heading ()
"Move to the heading for the topic \(possibly invisible) after this one.
"Move to the heading for the topic (possibly invisible) after this one.
Returns the location of the heading, or nil if none found.
@ -2476,7 +2534,7 @@ We skip anomolous low-level topics, a la `allout-aberrant-container-p'."
(if (not (allout-goto-prefix-doublechecked)) (allout-next-heading)))
;;;_ > allout-previous-heading ()
(defun allout-previous-heading ()
"Move to the prior \(possibly invisible) heading line.
"Move to the prior (possibly invisible) heading line.
Return the location of the beginning of the heading, or nil if not found.
@ -2526,7 +2584,7 @@ We skip anomolous low-level topics, a la `allout-aberrant-container-p'."
(defun allout-chart-subtree (&optional levels visible orig-depth prev-depth)
"Produce a location \"chart\" of subtopics of the containing topic.
Optional argument LEVELS specifies a depth limit \(relative to start
Optional argument LEVELS specifies a depth limit (relative to start
depth) for the chart. Null LEVELS means no limit.
When optional argument VISIBLE is non-nil, the chart includes
@ -2663,7 +2721,7 @@ start point."
result))
;;;_ X allout-chart-spec (chart spec &optional exposing)
;; (defun allout-chart-spec (chart spec &optional exposing)
;; "Not yet \(if ever) implemented.
;; "Not yet (if ever) implemented.
;; Produce exposure directives given topic/subtree CHART and an exposure SPEC.
@ -2684,7 +2742,7 @@ start point."
;; - bare positive values indicate that this topic header should be
;; opened.
;; - Lists signify the beginning and end points of regions that should
;; be flagged, and the flag to employ. (For concealment: `\(\?r\)', and
;; be flagged, and the flag to employ. (For concealment: `(\?r)', and
;; exposure:"
;; (while spec
;; (cond ((listp spec)
@ -2721,7 +2779,7 @@ Returns the point at the beginning of the prefix, or nil if none."
(defun allout-goto-prefix-doublechecked ()
"Put point at beginning of immediately containing outline topic.
Like `allout-goto-prefix', but shallow topics \(according to
Like `allout-goto-prefix', but shallow topics (according to
`allout-doublecheck-at-and-shallower') are checked and
disqualified for child containment discontinuity, according to
`allout-aberrant-container-p'."
@ -2749,7 +2807,7 @@ otherwise skip white space between bullet and ensuing text."
(allout-current-depth)))
;;;_ > allout-current-bullet-pos ()
(defun allout-current-bullet-pos ()
"Return position of current \(visible) topic's bullet."
"Return position of current (visible) topic's bullet."
(if (not (allout-current-depth))
nil
@ -2887,19 +2945,31 @@ collapsed."
(if (interactive-p) (allout-end-of-prefix))
(and last-ascended allout-recent-depth))))
;;;_ > allout-ascend ()
(defun allout-ascend ()
"Ascend one level, returning t if successful, nil if not."
(defun allout-ascend (&optional dont-move-if-unsuccessful)
"Ascend one level, returning resulting depth if successful, nil if not.
Point is left at the beginning of the level whether or not
successful, unless optional DONT-MOVE-IF-UNSUCCESSFUL is set, in
which case point is returned to its original starting location."
(if dont-move-if-unsuccessful
(setq dont-move-if-unsuccessful (point)))
(prog1
(if (allout-beginning-of-level)
(let ((bolevel (point))
(bolevel-depth allout-recent-depth))
(allout-previous-heading)
(if (< allout-recent-depth bolevel-depth)
allout-recent-depth
;; some topic after file's first is at lower depth than first:
(goto-char bolevel)
(allout-depth)
nil)))
(cond ((< allout-recent-depth bolevel-depth)
allout-recent-depth)
((= allout-recent-depth bolevel-depth)
(if dont-move-if-unsuccessful
(goto-char dont-move-if-unsuccessful))
(allout-depth)
nil)
(t
;; some topic after very first is lower depth than first:
(goto-char bolevel)
(allout-depth)
nil))))
(if (interactive-p) (allout-end-of-prefix))))
;;;_ > allout-descend-to-depth (depth)
(defun allout-descend-to-depth (depth)
@ -2990,7 +3060,7 @@ Return the start point of the new topic if successful, nil otherwise.
Costs more than regular `allout-next-sibling' for short traversals:
- we have to check the prior \(next, if travelling backwards)
- we have to check the prior (next, if travelling backwards)
item to confirm connectivity with the prior topic, and
- if confirmed, we have to reestablish the allout-recent-* settings with
some extra navigation
@ -3219,7 +3289,7 @@ reinterpreted as the corresponding control-character in the
the cursor which has moved as a result of such reinterpretation is
positioned on the bullet character of the destination topic.
The upshot is that you can get easy, single \(ie, unmodified\) key
The upshot is that you can get easy, single (ie, unmodified) key
outline maneuvering operations by positioning the cursor on the bullet
char. When in this mode you can use regular cursor-positioning
command/keystrokes to relocate the cursor off of a bullet character to
@ -3329,7 +3399,7 @@ Offer one suitable for current depth DEPTH as default."
(allout-get-bullet)))))
;;;_ > allout-encrypted-type-prefix (&optional prefix)
(defun allout-encrypted-type-prefix (&optional prefix)
"True if current header prefix bullet is for an encrypted entry \(body)."
"True if current header prefix bullet is for an encrypted entry (body)."
(and allout-topic-encryption-bullet
(string= allout-topic-encryption-bullet
(if prefix
@ -3380,8 +3450,8 @@ the current topics' depth.
If SOLICIT is non-nil, then the choice of bullet is solicited from
user. If it's a character, then that character is offered as the
default, otherwise the one suited to the context \(according to
distinction or depth) is offered. \(This overrides other options,
default, otherwise the one suited to the context (according to
distinction or depth) is offered. (This overrides other options,
including, eg, a distinctive PRIOR-BULLET.) If non-nil, then the
context-specific bullet is used.
@ -3505,7 +3575,7 @@ whitespace - in which case open is done on the current line.
When adding an offspring, it will be added immediately after the parent if
the other offspring are exposed, or after the last child if the offspring
are hidden. \(The intervening offspring will be exposed in the latter
are hidden. (The intervening offspring will be exposed in the latter
case.)
If OFFER-RECENT-BULLET is true, offer to use the bullet of the prior sibling.
@ -3823,7 +3893,7 @@ All args are optional.
If SOLICIT is non-nil, then the choice of bullet is solicited from
user. If it's a character, then that character is offered as the
default, otherwise the one suited to the context \(according to
default, otherwise the one suited to the context (according to
distinction or depth) is offered. If non-nil, then the
context-specific bullet is just used.
@ -3921,7 +3991,7 @@ this function."
Descends into invisible as well as visible topics, however.
When optional sans-offspring is non-nil, subtopics are not
shifted. \(Shifting a topic outwards without shifting its
shifted. (Shifting a topic outwards without shifting its
offspring is disallowed, since this would create a \"containment
discontinuity\", where the depth difference between a topic and
its immediate offspring is greater than one.)
@ -3962,7 +4032,7 @@ Several subsequent args are for internal recursive use by the function
itself: STARTING-DEPTH, STARTING-POINT, and INDEX.
Finally, if optional SANS-OFFSPRING is non-nil then the offspring
are not shifted. \(Shifting a topic outwards without shifting
are not shifted. (Shifting a topic outwards without shifting
its offspring is disallowed, since this would create a
\"containment discontinuity\", where the depth difference between
a topic and its immediate offspring is greater than one..)"
@ -4445,7 +4515,7 @@ however, are left exactly like normal, non-allout-specific yanks."
(while more
(allout-back-to-current-heading)
; go as high as we can in each bunch:
(while (allout-ascend))
(while (allout-ascend t))
(save-excursion
(allout-unprotected
(allout-rebullet-topic-grunt (- adjust-to-depth
@ -4598,9 +4668,9 @@ by pops to non-distinctive yanks. Bug..."
"Conceal text between FROM and TO if FLAG is non-nil, else reveal it.
Exposure-change hook `allout-exposure-change-hook' is run with the same
arguments as this function, after the exposure changes are made. \(The old
arguments as this function, after the exposure changes are made. (The old
`allout-view-change-hook' is being deprecated, and eventually will not be
invoked.\)"
invoked.)"
;; We use outline invisibility spec.
(remove-overlays from to 'category 'allout-exposure-category)
@ -4900,7 +4970,7 @@ SPEC is either a number or a list.
Successive specs on a list are applied to successive sibling topics.
A simple spec \(either a number, one of a few symbols, or the null
A simple spec (either a number, one of a few symbols, or the null
list) dictates the exposure for the corresponding topic.
Non-null lists recursively designate exposure specs for respective
@ -4923,7 +4993,7 @@ Simple (numeric and null-list) specs are interpreted as follows:
apply prior element to all siblings at current level, *up to*
those siblings that would be covered by specs following the `:'
on the list. Ie, apply to all topics at level but the last
ones. \(Only first of multiple colons at same level is
ones. (Only first of multiple colons at same level is
respected - subsequent ones are discarded.)
* - completely opens the topic, including bodies.
+ - shows all the sub headers, but not the bodies
@ -5006,7 +5076,7 @@ Examples:
;;;_ > allout-old-expose-topic (spec &rest followers)
(defun allout-old-expose-topic (spec &rest followers)
"Deprecated. Use `allout-expose-topic' \(with different schema
"Deprecated. Use `allout-expose-topic' (with different schema
format) instead.
Dictate wholesale exposure scheme for current topic, according to SPEC.
@ -5203,7 +5273,7 @@ the prefix:
list - Present prefix as numeric section.subsection..., starting with
section indicated by the list, innermost nesting first.
`indent' \(symbol) - Convert header prefixes to all white space,
`indent' (symbol) - Convert header prefixes to all white space,
except for distinctive bullets.
The elements of the list produced are lists that represents a topic
@ -5332,7 +5402,7 @@ alternate presentation form:
X`flat-indented' - Prefix is like `flat' for first topic at each
X level, but subsequent topics have only leaf topic
X number, padded with blanks to line up with first.
`indent' \(symbol) - Convert header prefixes to all white space,
`indent' (symbol) - Convert header prefixes to all white space,
except for distinctive bullets.
Defaults:
@ -5484,7 +5554,7 @@ used verbatim."
;;;_ > allout-latex-verb-quote (string &optional flow)
(defun allout-latex-verb-quote (string &optional flow)
"Return copy of STRING for literal reproduction across LaTeX processing.
Expresses the original characters \(including carriage returns) of the
Expresses the original characters (including carriage returns) of the
string across LaTeX processing."
(mapconcat (function
(lambda (char)
@ -5496,9 +5566,9 @@ string across LaTeX processing."
""))
;;;_ > allout-latex-verbatim-quote-curr-line ()
(defun allout-latex-verbatim-quote-curr-line ()
"Express line for exact \(literal) representation across LaTeX processing.
"Express line for exact (literal) representation across LaTeX processing.
Adjust line contents so it is unaltered \(from the original line)
Adjust line contents so it is unaltered (from the original line)
across LaTeX processing, within the context of a `verbatim'
environment. Leaves point at the end of the line."
(let ((inhibit-field-text-motion t))
@ -5673,7 +5743,7 @@ With repeat count, copy the exposed portions of entire buffer."
"Encrypt clear or decrypt encoded text of visibly-containing topic's contents.
Optional FETCH-PASS universal argument provokes key-pair encryption with
single universal argument. With doubled universal argument \(value = 16),
single universal argument. With doubled universal argument (value = 16),
it forces prompting for the passphrase regardless of availability from the
passphrase cache. With no universal argument, the appropriate passphrase
is obtained from the cache, if available, else from the user.
@ -5684,10 +5754,10 @@ Currently only GnuPG encryption is supported.
encryption, include the option ``armor'' in your ~/.gnupg/gpg.conf file.
Both symmetric-key and key-pair encryption is implemented. Symmetric is
the default, use a single \(x4) universal argument for keypair mode.
the default, use a single (x4) universal argument for keypair mode.
Encrypted topic's bullet is set to a `~' to signal that the contents of the
topic \(body and subtopics, but not heading) is pending encryption or
topic (body and subtopics, but not heading) is pending encryption or
encrypted. `*' asterisk immediately after the bullet signals that the body
is encrypted, its' absence means the topic is meant to be encrypted but is
not. When a file with topics pending encryption is saved, topics pending
@ -5695,7 +5765,7 @@ encryption are encrypted. See allout-encrypt-unencrypted-on-saves for
auto-encryption specifics.
\**NOTE WELL** that automatic encryption that happens during saves will
default to symmetric encryption - you must manually \(re)encrypt key-pair
default to symmetric encryption - you must manually (re)encrypt key-pair
encrypted topics if you want them to continue to use the key-pair cipher.
Level-one topics, with prefix consisting solely of an `*' asterisk, cannot be
@ -5708,7 +5778,7 @@ The encryption passphrase is solicited if not currently available in the
passphrase cache from a recent encryption action.
The solicited passphrase is retained for reuse in a buffer-specific cache
for some set period of time \(default, 60 seconds), after which the string
for some set period of time (default, 60 seconds), after which the string
is nulled. The passphrase cache timeout is customized by setting
`pgg-passphrase-cache-expiry'.
@ -5731,7 +5801,7 @@ verifier across Emacs sessions.
Similarly, `allout-passphrase-hint-string' stores a user-provided reminder
about their passphrase, and `allout-passphrase-hint-handling' specifies
when the hint is presented, or if passphrase hints are disabled. If
enabled \(see the `allout-passphrase-hint-handling' docstring for details),
enabled (see the `allout-passphrase-hint-handling' docstring for details),
the hint string is stored in the local-variables section of the file, and
solicited whenever the passphrase is changed."
(interactive "P")
@ -5742,10 +5812,10 @@ solicited whenever the passphrase is changed."
)
;;;_ > allout-toggle-subtree-encryption (&optional fetch-pass)
(defun allout-toggle-subtree-encryption (&optional fetch-pass)
"Encrypt clear text or decrypt encoded topic contents \(body and subtopics.)
"Encrypt clear text or decrypt encoded topic contents (body and subtopics.)
Optional FETCH-PASS universal argument provokes key-pair encryption with
single universal argument. With doubled universal argument \(value = 16),
single universal argument. With doubled universal argument (value = 16),
it forces prompting for the passphrase regardless of availability from the
passphrase cache. With no universal argument, the appropriate passphrase
is obtained from the cache, if available, else from the user.
@ -6489,7 +6559,7 @@ This activity is inhibited if either `enable-local-variables'
When enabled, an entry for the variable is created if not already present,
or changed if established with a different value. The section for the file
variables, itself, is created if not already present. When created, the
section lines \(including the section line) exist as second-level topics in
section lines (including the section line) exist as second-level topics in
a top-level topic at the end of the file.
`enable-local-variables' must be true for any of this to happen."
@ -6818,7 +6888,7 @@ To ignore intangibility, bind `inhibit-point-motion-hooks' to t."
;;;_ #10 Unfinished
;;;_ > allout-bullet-isearch (&optional bullet)
(defun allout-bullet-isearch (&optional bullet)
"Isearch \(regexp) for topic with bullet BULLET."
"Isearch (regexp) for topic with bullet BULLET."
(interactive)
(if (not bullet)
(setq bullet (solicit-char-in-string

2
lisp/arc-mode.el
View file

@ -1,6 +1,6 @@
;;; arc-mode.el --- simple editing of archives
;; Copyright (C) 1995, 1997, 1998, 2002, 2003, 2004,
;; Copyright (C) 1995, 1997, 1998, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Morten Welinder <terra@gnu.org>

2
lisp/array.el
View file

@ -1,6 +1,6 @@
;;; array.el --- array editing commands for GNU Emacs
;; Copyright (C) 1987, 2000, 2002, 2003, 2004,
;; Copyright (C) 1987, 2000, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Author David M. Brown

4
lisp/autoarg.el
View file

@ -1,6 +1,6 @@
;;; autoarg.el --- make digit keys supply prefix args
;; Copyright (C) 1998, 2000, 2002, 2003, 2004,
;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Dave Love <fx@gnu.org>
@ -119,7 +119,7 @@ then invokes the normal binding of \\[autoarg-terminate].
With ARG, turn Autoarg mode on if ARG is positive, off otherwise.
\\<autoarg-kp-mode-map>
This is similar to \\[autoarg-mode] but rebinds the keypad keys `kp-1'
&c to supply digit arguments.
etc. to supply digit arguments.
\\{autoarg-kp-mode-map}"
nil " Aakp" autoarg-kp-mode-map :global t :group 'keyboard

4
lisp/autoinsert.el
View file

@ -1,7 +1,7 @@
;;; autoinsert.el --- automatic mode-dependent insertion of text into new files
;; Copyright (C) 1985, 1986, 1987, 1994, 1995, 1998, 2000, 2002, 2003,
;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Copyright (C) 1985, 1986, 1987, 1994, 1995, 1998, 2000, 2001, 2002,
;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Charlie Martin <crm@cs.duke.edu>
;; Adapted-By: Daniel Pfeiffer <occitan@esperanto.org>

2
lisp/avoid.el
View file

@ -1,6 +1,6 @@
;;; avoid.el --- make mouse pointer stay out of the way of editing
;; Copyright (C) 1993, 1994, 2000, 2002, 2003, 2004,
;; Copyright (C) 1993, 1994, 2000, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Boris Goldowsky <boris@gnu.org>

4
lisp/bindings.el
View file

@ -1058,6 +1058,10 @@ language you are using."
(define-key ctl-x-4-map "c" 'clone-indirect-buffer-other-window)
;; Signal handlers
(define-key global-map [signal] (make-sparse-keymap))
(define-key global-map [signal t] 'ignore)
;; Don't look for autoload cookies in this file.
;; Local Variables:
;; no-update-autoloads: t

2
lisp/case-table.el
View file

@ -1,6 +1,6 @@
;;; case-table.el --- code to extend the character set and support case tables
;; Copyright (C) 1988, 1994, 2002, 2003, 2004,
;; Copyright (C) 1988, 1994, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Howard Gayle

2
lisp/cdl.el
View file

@ -1,6 +1,6 @@
;;; cdl.el --- Common Data Language (CDL) utility functions for GNU Emacs
;; Copyright (C) 1993, 2002, 2003, 2004, 2005,
;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
;; 2006 Free Software Foundation, Inc.
;; Author: ATAE@spva.physics.imperial.ac.uk (Ata Etemadi)

2
lisp/chistory.el
View file

@ -1,6 +1,6 @@
;;; chistory.el --- list command history
;; Copyright (C) 1985, 2002, 2003, 2004, 2005,
;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
;; 2006 Free Software Foundation, Inc.
;; Author: K. Shane Hartman

13
lisp/cmuscheme.el
View file

@ -1,6 +1,6 @@
;;; cmuscheme.el --- Scheme process in a buffer. Adapted from tea.el
;; Copyright (C) 1988, 1994, 1997, 2002, 2003, 2004,
;; Copyright (C) 1988, 1994, 1997, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Olin Shivers <olin.shivers@cs.cmu.edu>
@ -244,7 +244,8 @@ Defaults to a regexp ignoring all inputs of 0, 1, or 2 letters."
If there is a process already running in `*scheme*', switch to that buffer.
With argument, allows you to edit the command line (default is value
of `scheme-program-name').
If a file `~/.emacs_SCHEMENAME' exists, it is given as initial input.
If the file `~/.emacs_SCHEMENAME' or `~/.emacs.d/init_SCHEMENAME.scm' exists,
it is given as initial input.
Note that this may lose due to a timing error if the Scheme processor
discards input when it starts up.
Runs the hook `inferior-scheme-mode-hook' \(after the `comint-mode-hook'
@ -268,12 +269,12 @@ is run).
"Return the name of the start file corresponding to PROG.
Search in the directories \"~\" and \"~/.emacs.d\", in this
order. Return nil if no start file found."
(let* ((name (concat ".emacs_" (file-name-nondirectory prog)))
(start-file (concat "~/" name)))
(let ((progname (file-name-nondirectory prog))
(start-file (concat "~/.emacs_" progname))
(alt-start-file (concat "~/.emacs.d/init_" progname ".scm")))
(if (file-exists-p start-file)
start-file
(let ((start-file (concat "~/.emacs.d/" name)))
(and (file-exists-p start-file) start-file)))))
(and (file-exists-p alt-start-file) alt-start-file))))
(defun scheme-send-region (start end)
"Send the current region to the inferior Scheme process."

2
lisp/comint.el
View file

@ -770,7 +770,7 @@ buffer. The hook `comint-exec-hook' is run after each exec."
(format "TERMCAP=emacs:co#%d:tc=unknown:" (window-width))))
(unless (getenv "EMACS")
(list "EMACS=t"))
(list "INSIDE_EMACS=t")
(list (format "INSIDE_EMACS=%s,comint" emacs-version))
process-environment))
(default-directory
(if (file-accessible-directory-p default-directory)

2
lisp/compare-w.el
View file

@ -1,6 +1,6 @@
;;; compare-w.el --- compare text between windows for Emacs
;; Copyright (C) 1986, 1989, 1993, 1997, 2002, 2003, 2004,
;; Copyright (C) 1986, 1989, 1993, 1997, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF

4
lisp/complete.el
View file

@ -1,7 +1,7 @@
;;; complete.el --- partial completion mechanism plus other goodies
;; Copyright (C) 1990, 1991, 1992, 1993, 1999, 2000, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Copyright (C) 1990, 1991, 1992, 1993, 1999, 2000, 2001, 2002, 2003,
;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Dave Gillespie <daveg@synaptics.com>
;; Keywords: abbrev convenience

2
lisp/completion.el
View file

@ -1,6 +1,6 @@
;;; completion.el --- dynamic word-completion code
;; Copyright (C) 1990, 1993, 1995, 1997, 2002, 2003, 2004,
;; Copyright (C) 1990, 1993, 1995, 1997, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF

2
lisp/cus-dep.el
View file

@ -1,6 +1,6 @@
;;; cus-dep.el --- find customization dependencies
;;
;; Copyright (C) 1997, 2002, 2003, 2004, 2005,
;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005,
;; 2006 Free Software Foundation, Inc.
;;
;; Author: Per Abrahamsen <abraham@dina.kvl.dk>

2
lisp/cvs-status.el
View file

@ -1,6 +1,6 @@
;;; cvs-status.el --- major mode for browsing `cvs status' output -*- coding: utf-8 -*-
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>

2
lisp/delim-col.el
View file

@ -1,6 +1,6 @@
;;; delim-col.el --- prettify all columns in a region or rectangle
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>

15
lisp/descr-text.el
View file

@ -206,13 +206,13 @@ otherwise."
(defcustom describe-char-unicodedata-file nil
"Location of Unicode data file.
This is the UnicodeData.txt file from the Unicode consortium, used for
This is the UnicodeData.txt file from the Unicode Consortium, used for
diagnostics. If it is non-nil `describe-char' will print data
looked up from it. This facility is mostly of use to people doing
multilingual development.
This is a fairly large file, not typically present on GNU systems. At
the time of writing it is at the URL
This is a fairly large file, not typically present on GNU systems.
At the time of writing it is at the URL
`http://www.unicode.org/Public/UNIDATA/UnicodeData.txt'."
:group 'mule
:version "22.1"
@ -234,11 +234,10 @@ This function is semi-obsolete. Use `get-char-code-property'."
(when describe-char-unicodedata-file
(unless (file-exists-p describe-char-unicodedata-file)
(error "`unicodedata-file' %s not found" describe-char-unicodedata-file))
(with-current-buffer
;; Find file in fundamental mode to avoid, e.g. flyspell turned
;; on for .txt. Don't use RAWFILE arg in case of DOS line endings.
(let ((auto-mode-alist))
(find-file-noselect describe-char-unicodedata-file))
(with-current-buffer (get-buffer-create " *Unicode Data*")
(when (zerop (buffer-size))
;; Don't use -literally in case of DOS line endings.
(insert-file-contents describe-char-unicodedata-file))
(goto-char (point-min))
(let ((hex (format "%04X" char))
found first last)

6
lisp/diff-mode.el
View file

@ -120,8 +120,8 @@ when editing big diffs)."
("\C-m" . diff-goto-source)
([mouse-2] . diff-goto-source)
;; From XEmacs' diff-mode.
;; Standard M-w is useful, so don't change M-W.
;; ("W" . widen)
;; Standard M-w is useful, so don't change M-W.
;;("W" . widen)
;;("." . diff-goto-source) ;display-buffer
;;("f" . diff-goto-source) ;find-file
("o" . diff-goto-source) ;other-window
@ -153,6 +153,8 @@ when editing big diffs)."
("\C-c\C-s" . diff-split-hunk)
("\C-c\C-t" . diff-test-hunk)
("\C-c\C-u" . diff-context->unified)
;; `d' because it duplicates the context :-( --Stef
("\C-c\C-d" . diff-unified->context)
("\C-c\C-w" . diff-refine-hunk)
("\C-c\C-f" . next-error-follow-minor-mode))
"Keymap for `diff-mode'. See also `diff-mode-shared-map'.")

4
lisp/dired.el
View file

@ -1045,9 +1045,9 @@ Preserves old cursor, marks/flags, hidden-p."
;; treat top level dir extra (it may contain wildcards)
(dired-uncache
(if (consp dired-directory) (car dired-directory) dired-directory))
(dired-readin)
;; Run dired-after-readin-hook just once, below.
(let ((dired-after-readin-hook nil))
;; don't run that hook for each subdir...
(dired-readin)
(dired-insert-old-subdirs old-subdir-alist))
(dired-mark-remembered mark-alist) ; mark files that were marked
;; ... run the hook for the whole buffer, and only after markers

2
lisp/dirtrack.el
View file

@ -1,6 +1,6 @@
;;; dirtrack.el --- Directory Tracking by watching the prompt
;; Copyright (C) 1996, 2002, 2003, 2004, 2005,
;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005,
;; 2006 Free Software Foundation, Inc.
;; Author: Peter Breton <pbreton@cs.umb.edu>

6
lisp/disp-table.el
View file

@ -1,6 +1,6 @@
;;; disp-table.el --- functions for dealing with char tables
;; Copyright (C) 1987, 1994, 1995, 1999, 2002, 2003, 2004,
;; Copyright (C) 1987, 1994, 1995, 1999, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Erik Naggum <erik@naggum.no>
@ -117,7 +117,7 @@ Valid symbols are `truncation', `wrap', `escape', `control',
(or standard-display-table
(setq standard-display-table (make-display-table)))
(while (<= l h)
(aset standard-display-table l (if (or (< l ?\ ) (>= l 127)) (vector l)))
(aset standard-display-table l (if (or (< l ?\s) (>= l 127)) (vector l)))
(setq l (1+ l))))
;;;###autoload
@ -126,7 +126,7 @@ Valid symbols are `truncation', `wrap', `escape', `control',
(or standard-display-table
(setq standard-display-table (make-display-table)))
(while (<= l h)
(if (and (>= l ?\ ) (characterp l))
(if (and (>= l ?\s) (characterp l))
(aset standard-display-table l nil))
(setq l (1+ l))))

2
lisp/dos-fns.el
View file

@ -1,6 +1,6 @@
;;; dos-fns.el --- MS-Dos specific functions
;; Copyright (C) 1991, 1993, 1995, 1996, 2002, 2003, 2004,
;; Copyright (C) 1991, 1993, 1995, 1996, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: Morten Welinder <terra@diku.dk>

2
lisp/dos-vars.el
View file

@ -1,6 +1,6 @@
;;; dos-vars.el --- MS-Dos specific user options
;; Copyright (C) 1998, 2002, 2003, 2004, 2005,
;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005,
;; 2006 Free Software Foundation, Inc.
;; Maintainer: FSF

2
lisp/dos-w32.el
View file

@ -1,6 +1,6 @@
;; dos-w32.el --- Functions shared among MS-DOS and W32 (NT/95) platforms
;; Copyright (C) 1996, 2002, 2003, 2004, 2005,
;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005,
;; 2006 Free Software Foundation, Inc.
;; Maintainer: Geoff Voelker <voelker@cs.washington.edu>

2
lisp/double.el
View file

@ -1,6 +1,6 @@
;;; double.el --- support for keyboard remapping with double clicking
;; Copyright (C) 1994, 1997, 1998, 2002, 2003, 2004,
;; Copyright (C) 1994, 1997, 1998, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Per Abrahamsen <abraham@dina.kvl.dk>

4
lisp/ebuff-menu.el
View file

@ -1,6 +1,6 @@
;;; ebuff-menu.el --- electric-buffer-list mode
;; Copyright (C) 1985, 1986, 1994, 2002, 2003, 2004,
;; Copyright (C) 1985, 1986, 1994, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Richard Mlynarik <mly@ai.mit.edu>
@ -73,7 +73,7 @@ Run hooks in `electric-buffer-menu-mode-hook' on entry.
(catch 'electric-buffer-menu-select
(message "<<< Press Return to bury the buffer list >>>")
(if (eq (setq unread-command-events (list (read-event)))
?\ )
?\s)
(progn (setq unread-command-events nil)
(throw 'electric-buffer-menu-select nil)))
(let ((start-point (point))

2
lisp/echistory.el
View file

@ -1,6 +1,6 @@
;;; echistory.el --- Electric Command History Mode
;; Copyright (C) 1985, 2002, 2003, 2004, 2005,
;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
;; 2006 Free Software Foundation, Inc.
;; Author: K. Shane Hartman

18
lisp/ediff-diff.el
View file

@ -1274,9 +1274,7 @@ delimiter regions"))
;; Similarly for Windows-*
;; In DOS, must synchronize because DOS doesn't have
;; asynchronous processes.
(condition-case nil
(apply 'call-process program nil buffer nil args)
(error (format "Cannot execute program %S." program)))
(apply 'call-process program nil buffer nil args)
;; On other systems, do it asynchronously.
(setq proc (get-buffer-process buffer))
(if proc (kill-process proc))
@ -1447,14 +1445,12 @@ arguments to `skip-chars-forward'."
"Return t if files F1 and F2 have identical contents."
(if (and (not (file-directory-p f1))
(not (file-directory-p f2)))
(condition-case nil
(let ((res
(apply 'call-process ediff-cmp-program nil nil nil
(append ediff-cmp-options (list (expand-file-name f1)
(expand-file-name f2))))
))
(and (numberp res) (eq res 0)))
(error (format "Cannot execute program %S." ediff-cmp-program)))
(let ((res
(apply 'call-process ediff-cmp-program nil nil nil
(append ediff-cmp-options (list (expand-file-name f1)
(expand-file-name f2))))
))
(and (numberp res) (eq res 0)))
))

2
lisp/ediff-vers.el
View file

@ -1,6 +1,6 @@
;;; ediff-vers.el --- version control interface to Ediff
;; Copyright (C) 1995, 1996, 1997, 2002, 2003, 2004,
;; Copyright (C) 1995, 1996, 1997, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>

2
lisp/edmacro.el
View file

@ -1,6 +1,6 @@
;;; edmacro.el --- keyboard macro editor
;; Copyright (C) 1993, 1994, 2002, 2003, 2004,
;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Dave Gillespie <daveg@synaptics.com>

2
lisp/ehelp.el
View file

@ -197,7 +197,7 @@ BUFFER is put into `default-major-mode' (or `fundamental-mode') when we exit."
(if (pos-visible-in-window-p (point-max))
(progn (message "%s" (substitute-command-keys "<<< Press Space to bury the help buffer, Press \\[electric-help-retain] to retain it >>>"))
(if (equal (setq unread-command-events (list (read-event)))
'(?\ ))
'(?\s))
(progn (setq unread-command-events nil)
(throw 'exit t)))))
(let (up down both neither

2
lisp/electric.el
View file

@ -1,6 +1,6 @@
;;; electric.el --- window maker and Command loop for `electric' modes
;; Copyright (C) 1985, 1986, 1995, 2002, 2003, 2004,
;; Copyright (C) 1985, 1986, 1995, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Author: K. Shane Hartman

2
lisp/elide-head.el
View file

@ -1,6 +1,6 @@
;;; elide-head.el --- hide headers in files
;; Copyright (C) 1999, 2002, 2003, 2004, 2005,
;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005,
;; 2006 Free Software Foundation, Inc.
;; Author: Dave Love <fx@gnu.org>

1
lisp/emacs-lisp/authors.el
View file

@ -43,6 +43,7 @@ files.")
(defconst authors-aliases
'(
("Andrew Csillag" "Drew Csillag")
("Anna M. Bigatti" "Anna Bigatti")
("Barry A. Warsaw" "Barry A. Warsaw, Century Computing, Inc."
"Barry A. Warsaw, ITB" "Barry Warsaw")
("Bj,Av(Brn Torkelsson" "Bjorn Torkelsson")

21
lisp/emacs-lisp/bytecomp.el
View file

@ -264,11 +264,12 @@ facilities that have been added more recently."
;; this way can never be run in Emacs 18, and may even cause it to crash.")
(defcustom byte-optimize t
"*Enables optimization in the byte compiler.
nil means don't do any optimization.
t means do all optimizations.
`source' means do source-level optimizations only.
`byte' means do code-level optimizations only."
"*Enable optimization in the byte compiler.
Possible values are:
nil - no optimization
t - all optimizations
`source' - source-level optimizations only
`byte' - code-level optimizations only"
:group 'bytecomp
:type '(choice (const :tag "none" nil)
(const :tag "all" t)
@ -336,7 +337,7 @@ If it is 'byte, then only byte-level optimizations will be logged."
(defcustom byte-compile-warnings t
"*List of warnings that the byte-compiler should issue (t for all).
Elements of the list may be be:
Elements of the list may be:
free-vars references to variables not in the current lexical scope.
unresolved calls to unknown functions.
@ -2864,8 +2865,12 @@ That command is designed for interactive use only" fn))
(defmacro byte-compile-get-constant (const)
`(or (if (stringp ,const)
(assoc-default ,const byte-compile-constants
'equal-including-properties nil)
;; In a string constant, treat properties as significant.
(let (result)
(dolist (elt byte-compile-constants)
(if (equal-including-properties (car elt) ,const)
(setq result elt)))
result)
(assq ,const byte-compile-constants))
(car (setq byte-compile-constants
(cons (list ,const) byte-compile-constants)))))

4
lisp/emacs-lisp/easy-mmode.el
View file

@ -500,7 +500,7 @@ found, do widen first and then call NARROWFUN with no args after moving."
,(concat "^No \\(previous\\|next\\) " (regexp-quote name)))
(defun ,next-sym (&optional count)
,(format "Go to the next COUNT'th %s." name)
(interactive)
(interactive "p")
(unless count (setq count 1))
(if (< count 0) (,prev-sym (- count))
(if (looking-at ,re) (setq count (1+ count)))
@ -523,7 +523,7 @@ found, do widen first and then call NARROWFUN with no args after moving."
(put ',next-sym 'definition-name ',base)
(defun ,prev-sym (&optional count)
,(format "Go to the previous COUNT'th %s" (or name base-name))
(interactive)
(interactive "p")
(unless count (setq count 1))
(if (< count 0) (,next-sym (- count))
(let (was-narrowed)

6
lisp/emacs-lisp/find-func.el
View file

@ -147,9 +147,9 @@ See the functions `find-function' and `find-variable'."
(defun find-library-name (library)
"Return the absolute file name of the Lisp source of LIBRARY."
;; Strip off the extension to take advantage of library suffixes in
;; the call to `locate-file'.
(if (string-match "\\.el\\(c\\(\\..*\\)?\\)?\\'" library)
;; If the library is byte-compiled, try to find a source library by
;; the same name.
(if (string-match "\\.el\\(c\\(\\..*\\)?\\)\\'" library)
(setq library (replace-match "" t t library)))
(or (locate-file library
(or find-function-source-path load-path)

38
lisp/emacs-lock.el
View file

@ -1,6 +1,6 @@
;;; emacs-lock.el --- prevents you from exiting emacs if a buffer is locked
;;; emacs-lock.el --- prevents you from exiting Emacs if a buffer is locked
;; Copyright (C) 1994, 1997, 2002, 2003, 2004,
;; Copyright (C) 1994, 1997, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc
;; Author: Tom Wurgler <twurgler@goodyear.com>
@ -27,12 +27,12 @@
;;; Commentary:
;; This code sets a buffer-local variable to t if toggle-emacs-lock is run,
;; then if the user attempts to exit emacs, the locked buffer name will be
;; then if the user attempts to exit Emacs, the locked buffer name will be
;; displayed and the exit aborted. This is just a way of protecting
;; yourself from yourself. For example, if you have a shell running a big
;; program and exiting emacs would abort that program, you may want to lock
;; program and exiting Emacs would abort that program, you may want to lock
;; that buffer, then if you forget about it after a while, you won't
;; accidentally exit emacs. To unlock the buffer, just goto the buffer and
;; accidentally exit Emacs. To unlock the buffer, just goto the buffer and
;; run toggle-emacs-lock again.
;;; Code:
@ -48,34 +48,30 @@
(defun check-emacs-lock ()
"Check if variable `emacs-lock-from-exiting' is t for any buffer.
If any t is found, signal error and display the locked buffer name."
(let ((buffers (buffer-list)))
(save-excursion
(while buffers
(set-buffer (car buffers))
(if emacs-lock-from-exiting
(error "Emacs is locked from exit due to buffer: %s" (buffer-name))
(setq buffers (cdr buffers)))))))
If any locked buffer is found, signal error and display the buffer's name."
(save-excursion
(dolist (buffer (buffer-list))
(set-buffer buffer)
(when emacs-lock-from-exiting
(error "Emacs is locked from exit due to buffer: %s" (buffer-name))))))
(defun toggle-emacs-lock ()
"Toggle `emacs-lock-from-exiting' between t and nil for the current buffer.
"Toggle `emacs-lock-from-exiting' for the current buffer.
See `check-emacs-lock'."
(interactive)
(if emacs-lock-from-exiting
(setq emacs-lock-from-exiting nil)
(setq emacs-lock-from-exiting t))
(setq emacs-lock-from-exiting (not emacs-lock-from-exiting))
(if emacs-lock-from-exiting
(message "Buffer is now locked")
(message "Buffer is now unlocked")))
(defun emacs-lock-check-buffer-lock ()
"Check if variable `emacs-lock-from-exiting' is t for a buffer.
If t is found, signal error and display the locked buffer name."
(if emacs-lock-from-exiting
(error "Buffer `%s' is locked, can't delete it" (buffer-name))))
If the buffer is locked, signal error and display its name."
(when emacs-lock-from-exiting
(error "Buffer `%s' is locked, can't delete it" (buffer-name))))
; These next defuns make it so if you exit a shell that is locked, the lock
; is shut off for that shell so you can exit emacs. Same for telnet.
; is shut off for that shell so you can exit Emacs. Same for telnet.
; Also, if a shell or a telnet buffer was locked and the process killed,
; turn the lock back on again if the process is restarted.

120
lisp/emulation/cua-base.el
View file

@ -317,11 +317,19 @@ If the value is nil, use a shifted prefix key to inhibit the override."
:group 'cua)
(defcustom cua-toggle-set-mark t
"*In non-nil, the `cua-set-mark' command toggles the mark."
"*If non-nil, the `cua-set-mark' command toggles the mark."
:type '(choice (const :tag "Disabled" nil)
(other :tag "Enabled" t))
:group 'cua)
(defcustom cua-auto-mark-last-change nil
"*If non-nil, set implicit mark at position of last buffer change.
This means that \\[universal-argument] \\[cua-set-mark] will jump to the position
of the last buffer change before jumping to the explicit marks on the mark ring.
See `cua-set-mark' for details."
:type 'boolean
:group 'cua)
(defcustom cua-enable-register-prefix 'not-ctrl-u
"*If non-nil, registers are supported via numeric prefix arg.
If the value is t, any numeric prefix arg in the range 0 to 9 will be
@ -358,6 +366,15 @@ managers, so try setting this to nil, if prefix override doesn't work."
:type 'boolean
:group 'cua)
(defcustom cua-paste-pop-rotate-temporarily nil
"*If non-nil, \\[cua-paste-pop] only rotates the kill-ring temporarily.
This means that both \\[yank] and the first \\[yank-pop] in a sequence always insert
the most recently killed text. Each immediately following \\[cua-paste-pop] replaces
the previous text with the next older element on the `kill-ring'.
With prefix arg, \\[universal-argument] \\[yank-pop] inserts the same text as the most
recent \\[yank-pop] (or \\[yank]) command."
:type 'boolean
:group 'cua)
;;; Rectangle Customization
@ -912,15 +929,53 @@ If global mark is active, copy from register or one character."
(clipboard-yank))
(t (yank arg)))))))
;; cua-paste-pop-rotate-temporarily == t mechanism:
;;
;; C-y M-y M-y => only rotates kill ring temporarily,
;; so next C-y yanks what previous C-y yanked,
;;
;; M-y M-y M-y => equivalent to C-y M-y M-y
;;
;; But: After another command, C-u M-y remembers the temporary
;; kill-ring position, so
;; C-u M-y => yanks what the last M-y yanked
;;
(defvar cua-paste-pop-count nil)
(defun cua-paste-pop (arg)
"Replace a just-pasted text or rectangle with a different text.
See `yank-pop' for details."
See `yank-pop' for details about the default behaviour. For an alternative
behaviour, see `cua-paste-pop-rotate-temporarily'."
(interactive "P")
(if (eq last-command 'cua--paste-rectangle)
(progn
(undo)
(yank arg))
(yank-pop (prefix-numeric-value arg))))
(cond
((eq last-command 'cua--paste-rectangle)
(undo)
(yank arg))
((not cua-paste-pop-rotate-temporarily)
(yank-pop (prefix-numeric-value arg)))
(t
(let ((rotate (if (consp arg) 1 (prefix-numeric-value arg))))
(cond
((or (null cua-paste-pop-count)
(eq last-command 'yank)
(eq last-command 'cua-paste))
(setq cua-paste-pop-count rotate)
(setq last-command 'yank)
(yank-pop cua-paste-pop-count))
((and (eq last-command 'cua-paste-pop) (not (consp arg)))
(setq cua-paste-pop-count (+ cua-paste-pop-count rotate))
(setq last-command 'yank)
(yank-pop cua-paste-pop-count))
(t
(setq cua-paste-pop-count
(if (consp arg) (+ cua-paste-pop-count rotate -1) 1))
(yank (1+ cua-paste-pop-count)))))
;; Undo rotating the kill-ring, so next C-y will
;; yank the original head.
(setq kill-ring-yank-pointer kill-ring)
(setq this-command 'cua-paste-pop))))
(defun cua-exchange-point-and-mark (arg)
"Exchanges point and mark, but don't activate the mark.
@ -961,14 +1016,14 @@ of text."
(if (and s (= (cdr u) s))
(setq s (car u))
(setq s (car u) e (cdr u)))))))
(setq cua--repeat-replace-text
(cond ((and s e (<= s e) (= s (mark t)))
(filter-buffer-substring s e nil t))
((and (null s) (eq u elt)) ;; nothing inserted
"")
(t
(message "Cannot locate replacement text")
nil))))))
(cond ((and s e (<= s e) (= s (mark t)))
(setq cua--repeat-replace-text
(filter-buffer-substring s e nil t)))
((and (null s) (eq u elt)) ;; nothing inserted
(setq cua--repeat-replace-text
""))
(t
(message "Cannot locate replacement text"))))))
(setq cua--last-deleted-region-pos nil))
(if (and cua--last-deleted-region-text
cua--repeat-replace-text
@ -985,6 +1040,28 @@ of text."
;;; Shift activated / extended region
(defun cua-pop-to-last-change ()
(let ((undo-list buffer-undo-list)
pos elt)
(while (and (not pos)
(consp undo-list))
(setq elt (car undo-list)
undo-list (cdr undo-list))
(cond
((integerp elt)
(setq pos elt))
((not (consp elt)))
((and (integerp (cdr elt))
(or (integerp (car elt)) (stringp (car elt))))
(setq pos (cdr elt)))
((and (eq (car elt) 'apply) (consp (cdr elt)) (integerp (cadr elt)))
(setq pos (nth 3 elt)))))
(when (and pos
(/= pos (point))
(>= pos (point-min)) (<= pos (point-max)))
(goto-char pos)
t)))
(defun cua-set-mark (&optional arg)
"Set mark at where point is, clear mark, or jump to mark.
@ -993,12 +1070,15 @@ mark, and push old mark position on local mark ring; also push mark on
global mark ring if last mark was set in another buffer.
With argument, jump to mark, and pop a new position for mark off
the local mark ring \(this does not affect the global mark ring\).
the local mark ring (this does not affect the global mark ring).
Use \\[pop-global-mark] to jump to a mark off the global mark ring
\(see `pop-global-mark'\).
\(see `pop-global-mark').
If `cua-auto-mark-last-change' is non-nil, this command behaves as if there
was an implicit mark at the position of the last buffer change.
Repeating the command without the prefix jumps to the next position
off the local \(or global\) mark ring.
off the local (or global) mark ring.
With a double \\[universal-argument] prefix argument, unconditionally set mark."
(interactive "P")
@ -1013,7 +1093,9 @@ With a double \\[universal-argument] prefix argument, unconditionally set mark."
(pop-global-mark))
(arg
(setq this-command 'pop-to-mark-command)
(pop-to-mark-command))
(or (and cua-auto-mark-last-change
(cua-pop-to-last-change))
(pop-to-mark-command)))
((and cua-toggle-set-mark mark-active)
(cua--deactivate)
(message "Mark Cleared"))

26
lisp/erc/ChangeLog
View file

@ -1,3 +1,29 @@
2006-11-28 Juanma Barranquero <lekktu@gmail.com>
* erc.el (erc-cmd-BANLIST, erc-cmd-MASSUNBAN): Simplify.
(erc-prompt-for-channel-key, erc-ignore-reply-list, erc-send-post-hook)
(erc-active-buffer, erc-join-buffer, erc-frame-alist, erc-with-buffer)
(erc-modules, erc-display-message-highlight, erc-process-input-line)
(erc-cmd-HELP, erc-server-hooks, erc-echo-notice-in-user-buffers)
(erc-format-my-nick, erc-echo-notice-in-user-and-target-buffers)
(erc-echo-notice-in-first-user-buffer, erc-connection-established)
(erc-update-user-nick, erc-update-channel-member, erc-highlight-notice)
(erc-command-symbol, erc-add-query, erc-process-script-line)
(erc-determine-parameters, erc-client-info, erc-popup-input-buffer):
(erc-script-echo): Fix typos in docstrings.
(erc-channel-user-op-p, erc-channel-user-voice-p, erc-startup-file-list)
(define-erc-module, erc-once-with-server-event)
(erc-once-with-server-event-global, erc-debug-irc-protocol)
(erc-log-irc-protocol, erc-cmd-LOAD, erc-update-user)
(erc-update-current-channel-member, erc-load-script):
(erc-mode-line-away-status-format): Doc fixes.
2006-11-24 Juanma Barranquero <lekktu@gmail.com>
* erc.el (erc-after-connect, erc-open-ssl-stream)
(erc-display-line-1, erc-display-line):
* erc-backend.el (005): Fix space/tab mixup in docstrings.
2006-11-20 Michael Olson <mwolson@gnu.org>
* erc.el (erc-version-string): Call this Version 5.2 stable

4
lisp/erc/erc-backend.el
View file

@ -1226,7 +1226,7 @@ add things to `%s' instead."
(when buffer
(with-current-buffer buffer
;; update the chat partner info. Add to the list if private
;; message. We will accumulate private identities indefinitely
;; message. We will accumulate private identities indefinitely
;; at this point.
(erc-update-channel-member (if privp nick tgt) nick nick
privp nil nil host login nil nil t)
@ -1341,7 +1341,7 @@ add things to `%s' instead."
According to RFC 2812, suggests alternate servers on the network.
Many servers, however, use this code to show which parameters they have set,
for example, the network identifier, maximum allowed topic length, whether
certain commands are accepted and more. See documentation for
certain commands are accepted and more. See documentation for
`erc-server-parameters' for more information on the parameters sent.
A server may send more than one 005 message."

126
lisp/erc/erc.el
View file

@ -474,7 +474,7 @@ Removes all users in the current channel. This is called by
(clrhash erc-channel-users)))
(defsubst erc-channel-user-op-p (nick)
"Return `t' if NICK is an operator in the current channel."
"Return t if NICK is an operator in the current channel."
(and nick
(hash-table-p erc-channel-users)
(let ((cdata (erc-get-channel-user nick)))
@ -482,7 +482,7 @@ Removes all users in the current channel. This is called by
(erc-channel-user-op (cdr cdata))))))
(defsubst erc-channel-user-voice-p (nick)
"Return `t' if NICK has voice in the current channel."
"Return t if NICK has voice in the current channel."
(and nick
(hash-table-p erc-channel-users)
(let ((cdata (erc-get-channel-user nick)))
@ -774,7 +774,7 @@ set if some hacker is trying to flood you away."
:type 'boolean)
(defcustom erc-prompt-for-channel-key nil
"Prompt for channel key when using `erc-join-channel' interactively"
"Prompt for channel key when using `erc-join-channel' interactively."
:group 'erc
:type 'boolean)
@ -807,7 +807,7 @@ whose identifier matches, the message will not be processed.
CAVEAT: ERC doesn't know about the user and host of anyone who
was already in the channel when you joined, but never said
anything, so it won't be able to match the user and host of those
people. You can update the ERC internal info using /WHO *."
people. You can update the ERC internal info using /WHO *."
:group 'erc-ignore
:type '(repeat regexp))
@ -827,9 +827,9 @@ See `erc-server-flood-margin' for other flood-related parameters.")
"List of files to try for a startup script.
The first existent and readable one will get executed.
If the filename ends with `.el' it is presumed to be an emacs-lisp
If the filename ends with `.el' it is presumed to be an Emacs Lisp
script and it gets (load)ed. Otherwise is is treated as a bunch of
regular IRC commands"
regular IRC commands."
:group 'erc-scripts
:type '(repeat file))
@ -841,7 +841,7 @@ directory in the list."
:type '(repeat directory))
(defcustom erc-script-echo t
"*If not-NIL, echo the IRC script commands locally."
"*If non-nil, echo the IRC script commands locally."
:group 'erc-scripts
:type 'boolean)
@ -1042,7 +1042,7 @@ At this point, all modifications from prior hook functions are done.
NOTE: The functions on this hook are called _before_ sending a command
to the server.
This function is called with narrowing, ala `erc-send-modify-hook'"
This function is called with narrowing, ala `erc-send-modify-hook'."
:group 'erc-hooks
:type 'hook
:options '(erc-make-read-only))
@ -1198,7 +1198,7 @@ DOC is the documentation string to use for the minor mode.
ENABLE-BODY is a list of expressions used to enable the mode.
DISABLE-BODY is a list of expressions used to disable the mode.
If LOCAL-P is non-nil, the mode will be created as a buffer-local
mode. Rather than a global one.
mode, rather than a global one.
This will define a minor mode called erc-NAME-mode, possibly
an alias erc-ALIAS-mode, as well as the helper functions
@ -1266,7 +1266,7 @@ You should make sure that `current-buffer' is a server buffer.
This function temporarily adds a function to EVENT's hook to
execute FORMS. After FORMS are run, the function is removed from
EVENT's hook. The last expression of FORMS should be either nil
or t. nil indicates that the other functions on EVENT's hook
or t, where nil indicates that the other functions on EVENT's hook
should be run too, and t indicates that other functions should
not be run.
@ -1294,7 +1294,7 @@ capabilities."
This function temporarily prepends a function to EVENT's hook to
execute FORMS. After FORMS are run, the function is removed from
EVENT's hook. The last expression of FORMS should be either nil
or t. nil indicates that the other functions on EVENT's hook
or t, where nil indicates that the other functions on EVENT's hook
should be run too, and t indicates that other functions should
not be run.
@ -1390,7 +1390,7 @@ If BUFFER is nil, the current buffer is used."
(defvar erc-active-buffer nil
"The current active buffer, the one where the user typed the last command.
Defaults to the server buffer, and should only be set in the
server buffer")
server buffer.")
(make-variable-buffer-local 'erc-active-buffer)
(defun erc-active-buffer ()
@ -1447,7 +1447,7 @@ Turning on `erc-mode' runs the hook `erc-mode-hook'."
'window-noselect - in another window, but don't select that one,
'frame - in another frame,
'bury - bury it in a new buffer,
any other value - in place of the current buffer"
any other value - in place of the current buffer."
:group 'erc-buffers
:type '(choice (const window)
(const window-noselect)
@ -1457,7 +1457,7 @@ any other value - in place of the current buffer"
(defcustom erc-frame-alist nil
"*Alist of frame parameters for creating erc frames.
A value of `nil means to use `default-frame-alist'."
A value of nil means to use `default-frame-alist'."
:group 'erc-buffers
:type '(repeat (cons :format "%v"
(symbol :tag "Parameter")
@ -1573,7 +1573,7 @@ SPEC should have the form
If TARGET is a buffer, use it. Otherwise, use the buffer
matching TARGET in the process specified by PROCESS.
If PROCESS is nil, use the current `erc-server-process'
If PROCESS is nil, use the current `erc-server-process'.
See `erc-get-buffer' for details.
See also `with-current-buffer'.
@ -1762,7 +1762,7 @@ all channel buffers on all servers."
(defcustom erc-modules '(netsplit fill button match track completion readonly
ring autojoin noncommands irccontrols
stamp list)
"A list of modules which erc should enable.
"A list of modules which ERC should enable.
If you set the value of this without using `customize' remember to call
\(erc-update-modules) after you change it. When using `customize', modules
removed from the list will be disabled."
@ -2022,7 +2022,7 @@ parameters, SERVER, PORT and NICK."
(defcustom erc-after-connect nil
"Hook called after connecting to a server.
This hook gets executed when an end of MOTD has been received. All
This hook gets executed when an end of MOTD has been received. All
functions in here get called with the parameters SERVER and NICK."
:group 'erc-hooks
:type 'hook)
@ -2119,7 +2119,7 @@ Arguments are the same as for `erc'."
(defun erc-open-ssl-stream (name buffer host port)
"Open an SSL stream to an IRC server.
The process will be given the name NAME, its target buffer will be
BUFFER. HOST and PORT specify the connection target."
BUFFER. HOST and PORT specify the connection target."
(when (require 'tls)
(let ((proc (open-tls-stream name buffer host port)))
;; Ugly hack, but it works for now. Problem is it is
@ -2137,7 +2137,7 @@ BUFFER. HOST and PORT specify the connection target."
The buffer is created if it doesn't exist.
NOTE: If this variable is non-nil, and you kill the the only
NOTE: If this variable is non-nil, and you kill the only
visible \"*erc-protocol*\" buffer, it will be recreated shortly,
but you won't see it.
@ -2152,7 +2152,7 @@ This only has any effect if `erc-debug-irc-protocol' is non-nil.
The buffer is created if it doesn't exist.
If OUTBOUND is non-nil, STRING is being sent to the IRC server
and appears in erc-input-face in the buffer."
and appears in face `erc-input-face' in the buffer."
(when erc-debug-irc-protocol
(let ((network-name (or (ignore-errors (erc-network-name))
"???")))
@ -2236,7 +2236,7 @@ I.e. any char in it has the `invisible' property set."
(defun erc-display-line-1 (string buffer)
"Display STRING in `erc-mode' BUFFER.
Auxiliary function used in `erc-display-line'. The line gets filtered to
Auxiliary function used in `erc-display-line'. The line gets filtered to
interpret the control characters. Then, `erc-insert-pre-hook' gets called.
If `erc-insert-this' is still t, STRING gets inserted into the buffer.
Afterwards, `erc-insert-modify' and `erc-insert-post-hook' get called.
@ -2320,8 +2320,8 @@ or omitted, the default ERC buffer for the `erc-session-server' is used.
The BUFFER can be an actual buffer, a list of buffers, 'all or 'active.
If BUFFER = 'all, the string is displayed in all the ERC buffers for the
current session. 'active means the current active buffer
\(`erc-active-buffer'). If the buffer can't be resolved, the current
buffer is used. `erc-display-line-1' is used to display STRING.
\(`erc-active-buffer'). If the buffer can't be resolved, the current
buffer is used. `erc-display-line-1' is used to display STRING.
If STRING is nil, the function does nothing."
(let ((inhibit-point-motion-hooks t)
@ -2347,9 +2347,9 @@ If STRING is nil, the function does nothing."
(erc-display-line-1 string (current-buffer))))))
(defun erc-display-message-highlight (type string)
"Highlight STRING according to TYPE, where erc-TYPE-face is an erc face.
"Highlight STRING according to TYPE, where erc-TYPE-face is an ERC face.
See also `erc-make-notice'"
See also `erc-make-notice'."
(cond ((eq type 'notice)
(erc-make-notice string))
(t
@ -2435,7 +2435,7 @@ Returns non-nil if the command is actually sent to the server, and nil
otherwise.
If the command in the LINE is not bound as a function `erc-cmd-<COMMAND>',
it is passed to `erc-cmd-default'. If LINE is not a command (ie. doesn't
it is passed to `erc-cmd-default'. If LINE is not a command (i.e. doesn't
start with /<COMMAND>) then it is sent as a message.
An optional FORCE argument forces sending the line when flood
@ -2661,7 +2661,7 @@ VERSION and so on. It is called with ARGS."
If FUNC contains a valid function or variable, help about that
will be displayed. If FUNC is empty, display an apropos about
erc commands. Otherwise, do apropos in the erc namespace
ERC commands. Otherwise, do `apropos' in the ERC namespace
\(\"erc-.*LINE\"\).
Examples:
@ -2787,9 +2787,9 @@ LINE has the format: \"#CHANNEL NICK REASON\" or \"NICK REASON\"."
(defun erc-cmd-LOAD (line)
"Load the script provided in the LINE.
If LINE continues beyond the file name,
the rest of it is put in a (local) variable
`erc-script-args', which can be used in elisp scripts.
If LINE continues beyond the file name, the rest of
it is put in a (local) variable `erc-script-args',
which can be used in Emacs Lisp scripts.
The optional FORCE argument is ignored here - you can't force loading
a script after exceeding the flood threshold."
@ -3356,7 +3356,7 @@ The ban list is fetched from the server if necessary."
(and (boundp 'fill-column)
fill-column)
(1- (window-width))))
(separator (make-string erc-fill-column (string-to-char "=")))
(separator (make-string erc-fill-column ?=))
(fmt (concat
"%-" (number-to-string (/ erc-fill-column 2)) "s"
"%" (number-to-string (/ erc-fill-column 2)) "s")))
@ -3422,7 +3422,7 @@ Unban all currently banned users in the current channel."
(lambda (x)
(erc-server-send
(format "MODE %s -%s %s" (erc-default-target)
(make-string (length x) (string-to-char "b"))
(make-string (length x) ?b)
(mapconcat 'identity x " "))))
(erc-group-list bans 3))))
t))))
@ -3800,7 +3800,7 @@ See also `erc-display-error-notice'."
(defgroup erc-server-hooks nil
"Server event callbacks.
Every server event - like numeric replies - has it's own hook.
Every server event - like numeric replies - has its own hook.
Those hooks are all called using `run-hook-with-args-until-success'.
They receive as first argument the process object from where the event
originated from,
@ -3879,7 +3879,7 @@ See also `erc-format-nick-function'."
(concat voice op (erc-server-user-nickname user)))))
(defun erc-format-my-nick ()
"Return the beginning of this user's message, correctly propertized"
"Return the beginning of this user's message, correctly propertized."
(if erc-show-my-nick
(let ((open "<")
(close "> ")
@ -3948,7 +3948,7 @@ returns non-nil iff there is at least one buffer for which the
sender is a member.
See also: `erc-echo-notice-in-first-user-buffer',
`erc-buffer-list-with-nick'"
`erc-buffer-list-with-nick'."
(let ((buffers (erc-buffer-list-with-nick sender erc-server-process)))
(if buffers
(progn (erc-display-message parsed nil buffers s) t)
@ -3963,7 +3963,7 @@ at least one buffer for which the sender is a member or the
default target.
See also: `erc-echo-notice-in-user-buffers',
`erc-buffer-list-with-nick'"
`erc-buffer-list-with-nick'."
(let ((buffers (erc-buffer-list-with-nick sender erc-server-process)))
(add-to-list 'buffers buffer)
(if buffers
@ -3978,7 +3978,7 @@ returns non-nil iff there is at least one buffer for which the
sender is a member.
See also: `erc-echo-notice-in-user-buffers',
`erc-buffer-list-with-nick'"
`erc-buffer-list-with-nick'."
(let ((buffers (erc-buffer-list-with-nick sender erc-server-process)))
(if buffers
(progn (erc-display-message parsed nil (car buffers) s) t)
@ -4061,7 +4061,7 @@ See also: `erc-echo-notice-in-user-buffers',
(defun erc-connection-established (proc parsed)
"Run just after connection.
Set user modes and run `erc-after-connect hook'."
Set user modes and run `erc-after-connect' hook."
(unless erc-server-connected ; only once per session
(let ((server (or erc-server-announced-name (erc-response.sender parsed)))
(nick (car (erc-response.command-args parsed ))))
@ -4391,7 +4391,7 @@ The buffer where the change happened is current while this hook is called."
"Updates the stored user information for the user with nickname
NICK.
See also: `erc-update-user'"
See also: `erc-update-user'."
(erc-update-user (erc-get-server-user nick) new-nick
host login full-name info))
@ -4402,9 +4402,9 @@ struct. Any of NEW-NICK, HOST, LOGIN, FULL-NAME, INFO which are
non-nil and not equal to the existing values for USER are used to
replace the stored values in USER.
If, any only if a change is made,
If, and only if, a change is made,
`erc-channel-members-changed-hook' is run for each channel for
which USER is a member, and `t' is returned."
which USER is a member, and t is returned."
(let (changed)
(when user
(when (and new-nick
@ -4441,10 +4441,10 @@ which USER is a member, and `t' is returned."
update-message-time)
"Updates the stored user information for the user with nickname
NICK. `erc-update-user' is called to handle changes to nickname,
host, login, full-name, and info. If `op' or `voice' are
non-nil, they must be equal to either `on' or `off', in which
case the operator or voice status of USER in the current channel
is changed accordingly. If `update-message-time' is non-nil, the
HOST, LOGIN, FULL-NAME, and INFO. If OP or VOICE are non-nil,
they must be equal to either `on' or `off', in which case the
operator or voice status of the user in the current channel is
changed accordingly. If UPDATE-MESSAGE-TIME is non-nil, the
last-message-time of the user in the current channel is set
to (current-time).
@ -4453,7 +4453,7 @@ information if it is not already present in the user or channel
lists.
If, and only if, changes are made, or the user is added,
`erc-channel-members-updated-hook' is run, and `t' is returned.
`erc-channel-members-updated-hook' is run, and t is returned.
See also: `erc-update-user' and `erc-update-channel-member'."
(let* (changed user-changed
@ -4519,7 +4519,7 @@ See also: `erc-update-user' and `erc-update-channel-member'."
"Updates user and channel information for the user with
nickname NICK in channel CHANNEL.
See also: `erc-update-current-channel-member'"
See also: `erc-update-current-channel-member'."
(erc-with-buffer
(channel)
(erc-update-current-channel-member nick new-nick add op voice host
@ -4527,8 +4527,8 @@ See also: `erc-update-current-channel-member'"
update-message-time)))
(defun erc-remove-current-channel-member (nick)
"Remove NICK from current channel membership list. Runs
`erc-channel-members-changed-hook'."
"Remove NICK from current channel membership list.
Runs `erc-channel-members-changed-hook'."
(let ((channel-data (erc-get-channel-user nick)))
(when channel-data
(erc-remove-channel-user nick)
@ -4733,7 +4733,7 @@ So far the following TYPE/L pairs are supported:
(defun erc-highlight-notice (s)
"Highlight notice message S and return it.
See also variable `erc-notice-highlight-type'"
See also variable `erc-notice-highlight-type'."
(cond
((eq erc-notice-highlight-type 'prefix)
(erc-put-text-property 0 (length erc-notice-prefix)
@ -4950,7 +4950,7 @@ current position."
(run-hooks 'erc-send-post-hook))))))
(defun erc-command-symbol (command)
"Return the erc command symbol for COMMAND if it exists and is bound."
"Return the ERC command symbol for COMMAND if it exists and is bound."
(let ((cmd (intern-soft (format "erc-cmd-%s" (upcase command)))))
(when (fboundp cmd) cmd)))
@ -5049,7 +5049,7 @@ See also `erc-downcase'."
(defun erc-add-query (nickname)
"Add QUERY'd NICKNAME to the default channel list.
The previous default target of QUERY type gets removed"
The previous default target of QUERY type gets removed."
(let ((d1 (car erc-default-recipients))
(d2 (cdr erc-default-recipients))
(qt (cons 'QUERY (downcase nickname))))
@ -5274,8 +5274,8 @@ See also `erc-startup-file-list'."
FILE must be the full name, it is not searched in the
`erc-script-path'. If the filename ends with `.el', then load it
as a emacs-lisp program. Otherwise, treat it as a regular IRC
script"
as an Emacs Lisp program. Otherwise, treat it as a regular IRC
script."
(erc-log (concat "erc-load-script: " file))
(cond
((string-match "\\.el$" file)
@ -5287,13 +5287,13 @@ script"
"Process an IRC script LINE.
Does script-specific substitutions (script arguments, current nick,
server, etc.) in LINE and returns it.
server, etc.) in LINE and returns it.
Substitutions are: %C and %c = current target (channel or nick),
%S %s = current server, %N %n = my current nick, and %x is x verbatim,
where x is any other character;
$* = the entire argument string, $1 = the first argument, $2 = the second,
end so on."
and so on."
(if (not args) (setq args ""))
(let* ((arg-esc-regexp "\\(\\$\\(\\*\\|[1-9][0-9]*\\)\\)\\([^0-9]\\|$\\)")
(percent-regexp "\\(%.\\)")
@ -5418,10 +5418,10 @@ user input."
"Determine the connection and authentication parameters.
Sets the buffer local variables:
- erc-session-server
- erc-session-port
- erc-session-full-name
- erc-server-current-nick"
- `erc-session-server'
- `erc-session-port'
- `erc-session-full-name'
- `erc-server-current-nick'"
(setq erc-session-server (erc-compute-server server)
erc-session-port (or port erc-default-port)
erc-session-user-full-name (erc-compute-full-name name))
@ -5563,7 +5563,7 @@ See also `erc-emacs-time-to-erc-time'."
(defun erc-client-info (s)
"Return CTCP CLIENTINFO on command S.
If S is NIL or an empty string then return general CLIENTINFO"
If S is nil or an empty string then return general CLIENTINFO."
(if (or (not s) (string= s ""))
(concat
(apply #'concat
@ -5701,7 +5701,7 @@ displayed hostnames."
"(AWAY since %a %b %d %H:%M) "
"When you're away on a server, this is shown in the mode line.
This should be a string with substitution variables recognized by
format-time-message."
`format-time-string'."
:group 'erc-mode-line-and-header
:type 'string)
@ -5918,7 +5918,7 @@ All windows are opened in the current frame."
(balance-windows)))))
(defun erc-popup-input-buffer ()
"Provide a input buffer."
"Provide an input buffer."
(interactive)
(let ((buffer-name (generate-new-buffer-name "*ERC input*"))
(mode (intern

2
lisp/expand.el
View file

@ -1,6 +1,6 @@
;;; expand.el --- make abbreviations more usable
;; Copyright (C) 1995, 1996, 2002, 2003, 2004,
;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Frederic Lepied <Frederic.Lepied@sugix.frmug.org>

16
lisp/facemenu.el
View file

@ -132,6 +132,15 @@ just before \"Other\" at the end."
:type 'boolean
:group 'facemenu)
(defvar facemenu-unlisted-faces
`(modeline region secondary-selection highlight scratch-face
,(purecopy "^font-lock-") ,(purecopy "^gnus-") ,(purecopy "^message-")
,(purecopy "^ediff-") ,(purecopy "^term-") ,(purecopy "^vc-")
,(purecopy "^widget-") ,(purecopy "^custom-") ,(purecopy "^vm-"))
"*List of faces that are of no interest to the user.")
(make-obsolete-variable 'facemenu-unlisted-faces 'facemenu-listed-faces
"since 22.1,\nand has no effect on the Face menu")
(defcustom facemenu-listed-faces nil
"*List of faces to include in the Face menu.
Each element should be a symbol, the name of a face.
@ -685,8 +694,11 @@ This is called whenever you create a new face, and at other times."
symbol (intern name)))
(setq menu 'facemenu-face-menu)
(setq docstring
(format "Select face `%s' for subsequent insertion."
name))
(format "Select face `%s' for subsequent insertion.
If the mark is active and there is no prefix argument,
apply face `%s' to the region instead.
This command was defined by `facemenu-add-new-face'."
name name))
(cond ((facemenu-iterate ; check if equivalent face is already in the menu
(lambda (m) (and (listp m)
(symbolp (car m))

2
lisp/ffap.el
View file

@ -1,6 +1,6 @@
;;; ffap.el --- find file (or url) at point
;; Copyright (C) 1995, 1996, 1997, 2000, 2002, 2003, 2004,
;; Copyright (C) 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Michelangelo Grigni <mic@mathcs.emory.edu>

2
lisp/filecache.el
View file

@ -4,7 +4,7 @@
;; Created: Sun Nov 10 1996
;; Keywords: convenience
;;
;; Copyright (C) 1996, 2000, 2002, 2003, 2004,
;; Copyright (C) 1996, 2000, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.

5
lisp/files.el
View file

@ -4081,6 +4081,11 @@ non-nil, it is called instead of rereading visited file contents."
"File %s no longer exists!"
"Cannot revert nonexistent file %s")
file-name))
((not (file-readable-p file-name))
(error (if buffer-file-number
"File %s no longer readable!"
"Cannot revert unreadable file %s")
file-name))
(t
;; Bind buffer-file-name to nil
;; so that we don't try to lock the file.

2
lisp/find-dired.el
View file

@ -1,6 +1,6 @@
;;; find-dired.el --- run a `find' command and dired the output
;; Copyright (C) 1992, 1994, 1995, 2000, 2002, 2003, 2004,
;; Copyright (C) 1992, 1994, 1995, 2000, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Roland McGrath <roland@gnu.org>,

2
lisp/find-file.el
View file

@ -4,7 +4,7 @@
;; Maintainer: FSF
;; Keywords: c, matching, tools
;; Copyright (C) 1994, 1995, 2002, 2003, 2004,
;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.

3
lisp/find-lisp.el
View file

@ -3,9 +3,8 @@
;; Author: Peter Breton
;; Created: Fri Mar 26 1999
;; Keywords: unix
;; Time-stamp: <2006-02-06 13:40:10 ttn>
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.

2
lisp/flow-ctrl.el
View file

@ -1,6 +1,6 @@
;;; flow-ctrl.el --- help for lusers on cu(1) or ttys with wired-in ^S/^Q flow control
;; Copyright (C) 1990, 1991, 1994, 2002, 2003, 2004,
;; Copyright (C) 1990, 1991, 1994, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Author Kevin Gallagher

2
lisp/foldout.el
View file

@ -1,6 +1,6 @@
;;; foldout.el --- folding extensions for outline-mode and outline-minor-mode
;; Copyright (C) 1994, 2002, 2003, 2004, 2005,
;; Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
;; 2006 Free Software Foundation, Inc.
;; Author: Kevin Broadey <KevinB@bartley.demon.co.uk>

2
lisp/font-core.el
View file

@ -149,7 +149,7 @@ your own function which is called when `font-lock-mode' is toggled via
nil nil nil
;; Don't turn on Font Lock mode if we don't have a display (we're running a
;; batch job) or if the buffer is invisible (the name starts with a space).
(when (or noninteractive (eq (aref (buffer-name) 0) ?\ ))
(when (or noninteractive (eq (aref (buffer-name) 0) ?\s))
(setq font-lock-mode nil))
(funcall font-lock-function font-lock-mode)
;; Arrange to unfontify this buffer if we change major mode later.

2
lisp/format.el
View file

@ -1,6 +1,6 @@
;;; format.el --- read and save files in multiple formats
;; Copyright (C) 1994, 1995, 1997, 1999, 2002, 2003, 2004,
;; Copyright (C) 1994, 1995, 1997, 1999, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Boris Goldowsky <boris@gnu.org>

2
lisp/forms.el
View file

@ -1,6 +1,6 @@
;;; forms.el --- Forms mode: edit a file as a form to fill in
;; Copyright (C) 1991, 1994, 1995, 1996, 1997, 2002, 2003,
;; Copyright (C) 1991, 1994, 1995, 1996, 1997, 2001, 2002, 2003,
;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Johan Vromans <jvromans@squirrel.nl>

2
lisp/generic-x.el
View file

@ -1,6 +1,6 @@
;;; generic-x.el --- A collection of generic modes
;; Copyright (C) 1997, 1998, 2002, 2003, 2004,
;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004,
;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Peter Breton <pbreton@cs.umb.edu>

40
lisp/gnus/ChangeLog
View file

@ -1,3 +1,43 @@
2006-12-06 Chris Moore <dooglus@gmail.com> (tiny change)
* gnus-sum.el (gnus-sort-threads, gnus-summary-limit-children):
Use `max' to avoid the value of `max-lisp-eval-depth' decreasing.
2006-12-04 Jouni K. Sepp,Ad(Bnen <jks@iki.fi> (tiny change)
* mm-url.el (mm-url-predefined-programs): Call curl with correct
options.
2006-11-30 Katsumi Yamaoka <yamaoka@jpl.org>
* mml2015.el (mml2015-pgg-clear-verify): Replace encode-coding-string
with mm-encode-coding-string.
2006-11-29 Katsumi Yamaoka <yamaoka@jpl.org>
* nneething.el (nneething-decode-file-name): Replace
decode-coding-string with mm-decode-coding-string.
2006-11-24 Juanma Barranquero <lekktu@gmail.com>
* gnus-agent.el (gnus-agent-expire-unagentized-dirs)
(gnus-agent-regenerate-group): Fix space/tab mixup in messages.
* gnus-art.el (gnus-article-x-face-command, gnus-numeric-save-name):
* gnus-group.el (gnus-group-sort-function, gnus-group-line-format)
(gnus-group-mode, gnus-group-read-group, gnus-group-delete-group)
(gnus-group-make-directory-group, gnus-group-transpose-groups):
* gnus-start.el (gnus-options-subscribe, gnus-options-not-subscribe)
(gnus-subscribe-newsgroup, gnus-1):
* gnus-sum.el (gnus-summary-make-false-root, gnus-make-threads):
* gnus.el (gnus-nntp-server, gnus-use-cross-reference)
(gnus-valid-select-methods, total-expire, gnus-summary-line-format)
(gnus-group-read-only-p): Fix space/tab mixup in docstrings.
2006-11-21 Katsumi Yamaoka <yamaoka@jpl.org>
* mm-util.el (mm-string-to-multibyte): Alias to identity in XEmacs.
2006-11-18 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de>
* mm-uu.el (mm-uu-pgp-signed-extract-1): Make last fix more thorough

16
lisp/gnus/gnus-agent.el
View file

@ -13,7 +13,7 @@
;; 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
;; 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
@ -1167,7 +1167,7 @@ downloadable."
;; For each article that I processed that is no longer
;; undownloaded, remove its processable mark.
(mapc #'gnus-summary-remove-process-mark
(mapc #'gnus-summary-remove-process-mark
(gnus-sorted-ndifference gnus-newsgroup-processable gnus-newsgroup-undownloaded))
;; The preceeding call to (gnus-agent-summary-fetch-group)
@ -1972,11 +1972,11 @@ doesn't exist, to valid the overview buffer."
;; First, we'll fix the sort.
(sort-numeric-fields 1 (point-min) (point-max))
;; but now we have to consider that we may have duplicate rows...
;; but now we have to consider that we may have duplicate rows...
;; so reset to beginning of file
(goto-char (point-min))
(setq last -134217728)
;; and throw a code that restarts this scan
(throw 'problems t))
nil))))))
@ -3470,7 +3470,7 @@ articles in every agentized group? "))
(or gnus-expert-user
(gnus-y-or-n-p
"gnus-agent-expire has identified local directories that are\
not currently required by any agentized group. Do you wish to consider\
not currently required by any agentized group. Do you wish to consider\
deleting them?")))
(while to-remove
(let ((dir (pop to-remove)))
@ -3756,7 +3756,7 @@ If REREAD is not nil, downloaded articles are marked as unread."
(dir (file-name-directory file))
point
(downloaded (if (file-exists-p dir)
(sort (delq nil (mapcar (lambda (name)
(sort (delq nil (mapcar (lambda (name)
(and (not (file-directory-p (nnheader-concat dir name)))
(string-to-number name)))
(directory-files dir nil "^[0-9]+$" t)))
@ -3802,7 +3802,7 @@ If REREAD is not nil, downloaded articles are marked as unread."
((= l1 l2)
(forward-line -1)
(gnus-message 4 "gnus-agent-regenerate-group: NOV\
entries contained duplicate of article %s. Duplicate deleted." l1)
entries contained duplicate of article %s. Duplicate deleted." l1)
(gnus-delete-line)
(setq nov-arts (cdr nov-arts))))))
(t
@ -3923,7 +3923,7 @@ If REREAD is not nil, downloaded articles are marked as unread."
(gnus-agent-possibly-alter-active group group-active)))))
(when (and reread gnus-agent-article-alist)
(gnus-agent-synchronize-group-flags
(gnus-agent-synchronize-group-flags
group
(list (list
(if (listp reread)

6
lisp/gnus/gnus-art.el
View file

@ -15,7 +15,7 @@
;; 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
;; 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
@ -265,7 +265,7 @@ regexp. If it matches, the text in question is not a signature."
display -"))
"*String or function to be executed to display an X-Face header.
If it is a string, the command will be executed in a sub-shell
asynchronously. The compressed face will be piped to this command."
asynchronously. The compressed face will be piped to this command."
:type `(choice string
(function-item gnus-display-x-face-in-from)
function)
@ -3641,7 +3641,7 @@ Otherwise, it is like ~/News/news/group/num."
(defun gnus-numeric-save-name (newsgroup headers &optional last-file)
"Generate file name from NEWSGROUP, HEADERS, and optional LAST-FILE.
If variable `gnus-use-long-file-name' is non-nil, it is
~/News/news.group/num. Otherwise, it is like ~/News/news/group/num."
~/News/news.group/num. Otherwise, it is like ~/News/news/group/num."
(let ((default
(expand-file-name
(concat (if (gnus-use-long-file-name 'not-save)

16
lisp/gnus/gnus-group.el
View file

@ -131,7 +131,7 @@ for the groups to be sorted. Pre-made functions include
`gnus-group-sort-by-score', `gnus-group-sort-by-method',
`gnus-group-sort-by-server', and `gnus-group-sort-by-rank'.
This variable can also be a list of sorting functions. In that case,
This variable can also be a list of sorting functions. In that case,
the most significant sort function should be the last function in the
list."
:group 'gnus-group-listing
@ -193,7 +193,7 @@ with some simple extensions.
Note that this format specification is not always respected. For
reasons of efficiency, when listing killed groups, this specification
is ignored altogether. If the spec is changed considerably, your
is ignored altogether. If the spec is changed considerably, your
output may end up looking strange when listing both alive and killed
groups.
@ -1115,7 +1115,7 @@ When FORCE, rebuild the tool bar."
All normal editing commands are switched off.
\\<gnus-group-mode-map>
The group buffer lists (some of) the groups available. For instance,
The group buffer lists (some of) the groups available. For instance,
`\\[gnus-group-list-groups]' will list all subscribed groups with unread articles, while `\\[gnus-group-list-zombies]'
lists all zombie groups.
@ -2006,7 +2006,7 @@ and with point over the group in question."
If the prefix argument ALL is non-nil, already read articles become
readable. IF ALL is a number, fetch this number of articles. If the
optional argument NO-ARTICLE is non-nil, no article will be
auto-selected upon group entry. If GROUP is non-nil, fetch that
auto-selected upon group entry. If GROUP is non-nil, fetch that
group."
(interactive "P")
(let ((no-display (eq all 0))
@ -2446,7 +2446,7 @@ ADDRESS."
"Delete the current group. Only meaningful with editable groups.
If FORCE (the prefix) is non-nil, all the articles in the group will
be deleted. This is \"deleted\" as in \"removed forever from the face
of the Earth\". There is no undo. The user will be prompted before
of the Earth\". There is no undo. The user will be prompted before
doing the deletion.
Note that you also have to specify FORCE if you want the group to
be removed from the server, even when it's empty."
@ -2825,7 +2825,7 @@ Given a prefix, create a full group."
(defun gnus-group-make-directory-group (dir)
"Create an nndir group.
The user will be prompted for a directory. The contents of this
directory will be used as a newsgroup. The directory should contain
directory will be used as a newsgroup. The directory should contain
mail messages or news articles in files that have numeric names."
(interactive
(list (read-file-name "Create group from directory: ")))
@ -3495,7 +3495,7 @@ group line."
(defun gnus-group-transpose-groups (n)
"Move the current newsgroup up N places.
If given a negative prefix, move down instead. The difference between
If given a negative prefix, move down instead. The difference between
N and the number of steps taken is returned."
(interactive "p")
(unless (gnus-group-group-name)
@ -4211,7 +4211,7 @@ and the second element is the address."
(unless entry
(error "Trying to change non-existent group %s" method-only-group))
;; We have received parts of the actual group info - either the
;; select method or the group parameters. We first check
;; select method or the group parameters. We first check
;; whether we have to extend the info, and if so, do that.
(let ((len (length info))
(total (if (eq part 'method) 5 6)))

10
lisp/gnus/gnus-start.el
View file

@ -15,7 +15,7 @@
;; 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
;; 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
@ -352,7 +352,7 @@ be subscribed using `gnus-subscribe-options-newsgroup-method'."
(defcustom gnus-options-subscribe nil
"*All new groups matching this regexp will be subscribed unconditionally.
Note that this variable deals only with new newsgroups. This variable
Note that this variable deals only with new newsgroups. This variable
does not affect old newsgroups.
New groups that match this regexp will not be handled by
@ -364,7 +364,7 @@ be subscribed using `gnus-subscribe-options-newsgroup-method'."
(defcustom gnus-options-not-subscribe nil
"*All new groups matching this regexp will be ignored.
Note that this variable deals only with new newsgroups. This variable
Note that this variable deals only with new newsgroups. This variable
does not affect old (already subscribed) newsgroups."
:group 'gnus-group-new
:type '(choice regexp
@ -622,7 +622,7 @@ it is killed."
(defun gnus-subscribe-newsgroup (newsgroup &optional next)
"Subscribe new NEWSGROUP.
If NEXT is non-nil, it is inserted before NEXT. Otherwise it is made
If NEXT is non-nil, it is inserted before NEXT. Otherwise it is made
the first newsgroup."
(save-excursion
(goto-char (point-min))
@ -734,7 +734,7 @@ will not connect to the local server."
(defun gnus-1 (&optional arg dont-connect slave)
"Read network news.
If ARG is non-nil and a positive number, Gnus will use that as the
startup level. If ARG is non-nil and not a positive number, Gnus will
startup level. If ARG is non-nil and not a positive number, Gnus will
prompt the user for the name of an NNTP server to use."
(interactive "P")

16
lisp/gnus/gnus-sum.el
View file

@ -15,7 +15,7 @@
;; 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
;; 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
@ -110,7 +110,7 @@ have all the sub-threads as children.
If this variable is `adopt', Gnus will make one of the \"children\"
the parent and mark all the step-children as such.
If this variable is `empty', the \"children\" are printed with empty
subject fields. (Or rather, they will be printed with a string
subject fields. (Or rather, they will be printed with a string
given by the `gnus-summary-same-subject' variable.)"
:group 'gnus-thread
:type '(choice (const :tag "off" nil)
@ -3975,7 +3975,7 @@ If NO-DISPLAY, don't generate a summary buffer."
infloop))
(defun gnus-make-threads ()
"Go through the dependency hashtb and find the roots. Return all threads."
"Go through the dependency hashtb and find the roots. Return all threads."
(let (threads)
(while (catch 'infloop
(mapatoms
@ -4481,7 +4481,7 @@ If LINE, insert the rebuilt thread starting on line LINE."
;; First go up in this thread until we find the root.
(setq last-id (gnus-root-id id)
headers (message-flatten-list (gnus-id-to-thread last-id)))
;; We have now found the real root of this thread. It might have
;; We have now found the real root of this thread. It might have
;; been gathered into some loose thread, so we have to search
;; through the threads to find the thread we wanted.
(let ((threads gnus-newsgroup-threads)
@ -4561,7 +4561,7 @@ If LINE, insert the rebuilt thread starting on line LINE."
(if (not gnus-thread-sort-functions)
threads
(gnus-message 8 "Sorting threads...")
(let ((max-lisp-eval-depth 5000))
(let ((max-lisp-eval-depth (max 5000 max-lisp-eval-depth)))
(prog1 (gnus-sort-threads-1
threads
(gnus-make-sort-function gnus-thread-sort-functions))
@ -5927,7 +5927,7 @@ The resulting hash table is returned, or nil if no Xrefs were found."
(let ((case-fold-search t)
in-reply-to header p lines chars)
(goto-char (point-min))
;; Search to the beginning of the next header. Error messages
;; Search to the beginning of the next header. Error messages
;; do not begin with 2 or 3.
(while (re-search-forward "^[23][0-9]+ " nil t)
(setq id nil
@ -5935,7 +5935,7 @@ The resulting hash table is returned, or nil if no Xrefs were found."
;; This implementation of this function, with nine
;; search-forwards instead of the one re-search-forward and
;; a case (which basically was the old function) is actually
;; about twice as fast, even though it looks messier. You
;; about twice as fast, even though it looks messier. You
;; can't have everything, I guess. Speed and elegance
;; doesn't always go hand in hand.
(setq
@ -8165,7 +8165,7 @@ fetch-old-headers verbiage, and so on."
;; will really go down to a leaf article first, before slowly
;; working its way up towards the root.
(when thread
(let* ((max-lisp-eval-depth 5000)
(let* ((max-lisp-eval-depth (max 5000 max-lisp-eval-depth))
(children
(if (cdr thread)
(apply '+ (mapcar 'gnus-summary-limit-children

16
lisp/gnus/gnus.el
View file

@ -16,7 +16,7 @@
;; 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
;; 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
@ -1335,7 +1335,7 @@ non-numeric prefix - `C-u M-x gnus', in short."
(defcustom gnus-nntp-server nil
"*The name of the host running the NNTP server.
This variable is semi-obsolete. Use the `gnus-select-method'
This variable is semi-obsolete. Use the `gnus-select-method'
variable instead."
:group 'gnus-server
:type '(choice (const :tag "disable" nil)
@ -1478,7 +1478,7 @@ group."
(defcustom gnus-use-cross-reference t
"*Non-nil means that cross referenced articles will be marked as read.
If nil, ignore cross references. If t, mark articles as read in
subscribed newsgroups. If neither t nor nil, mark as read in all
subscribed newsgroups. If neither t nor nil, mark as read in all
newsgroups."
:group 'gnus-server
:type '(choice (const :tag "off" nil)
@ -1697,7 +1697,7 @@ of the select method. The other elements may be the category of
this method (i. e., `post', `mail', `none' or whatever) or other
properties that this method has (like being respoolable).
If you implement a new select method, all you should have to change is
this variable. I think."
this variable. I think."
:group 'gnus-server
:type '(repeat (group (string :tag "Name")
(radio-button-choice (const :format "%v " post)
@ -1851,7 +1851,7 @@ which to perform auto-expiry. This only makes sense for mail groups."
"*Groups in which to perform expiry of all read articles.
Use with extreme caution. All groups that match this regexp will be
expiring - which means that all read articles will be deleted after
\(say) one week. (This only goes for mail groups and the like, of
\(say) one week. (This only goes for mail groups and the like, of
course.)"
:variable-group nnmail-expire
:variable-type '(choice (const nil)
@ -2983,7 +2983,7 @@ with some simple extensions.
The %U (status), %R (replied) and %z (zcore) specs have to be handled
with care. For reasons of efficiency, Gnus will compute what column
these characters will end up in, and \"hard-code\" that. This means that
it is invalid to have these specs after a variable-length spec. Well,
it is invalid to have these specs after a variable-length spec. Well,
you might not be arrested, but your summary buffer will look strange,
which is bad enough.
@ -3368,7 +3368,7 @@ GROUP can either be a string (a group name) or a select method."
(defun gnus-group-read-only-p (&optional group)
"Check whether GROUP supports editing or not.
If GROUP is nil, `gnus-newsgroup-name' will be checked instead. Note
If GROUP is nil, `gnus-newsgroup-name' will be checked instead. Note
that that variable is buffer-local to the summary buffers."
(let ((group (or group gnus-newsgroup-name)))
(not (gnus-check-backend-function 'request-replace-article group))))
@ -4043,7 +4043,7 @@ If NEWSGROUP is nil, return the global kill file name instead."
(not method)))
(defun gnus-server-extend-method (group method)
;; This function "extends" a virtual server. If the server is
;; This function "extends" a virtual server. If the server is
;; "hello", and the select method is ("hello" (my-var "something"))
;; in the group "alt.alt", this will result in a new virtual server
;; called "hello+alt.alt".

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