Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 09:14:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

upstream

Browse source
This commit is contained in:
Joakim Verona 2012-10-20 18:14:08 +02:00
commit 6d3ae67115
360 changed files with 8385 additions and 5143 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

227
ChangeLog
View file

@ -1,15 +1,46 @@
2012-10-18 Stefan Monnier <monnier@iro.umontreal.ca>
* Makefile.in ($(MAKEFILE_NAME)): Depend on src/lisp.mk as well.
2012-10-15 Glenn Morris <rgm@gnu.org>
* Makefile.in (install-man, install-etc):
Apply $TRANSFORM. (Bug#12536#34)
(clean): Delete etc/emacs.tmpdesktop.
2012-10-11 Kenichi Handa <handa@gnu.org>
* .bzrignore: Add several files under admin/charsets.
2012-10-08 Daniel Colascione <dancol@dancol.org>
* configure.ac: Add --with-w32 as a window system option.
Limit it to Cygwin for now. Integrate w32 into the refactored window
system configuration and set TERM_HEADER to w32term.h when w32 is
configured.
(CYGWIN_OBJ): Add cygw32.o.
2012-10-07 Jan Djärv <jan.h.d@swipnet.se>
* configure.ac: Check that OSX is 10.4 or newer.
2012-10-07 Paul Eggert <eggert@cs.ucla.edu>
Improve sys_siglist detection.
* configure.ac (sys_siglist): Look for its decl in <signal.h>.
Otherwise, it's not found in either Fedora 17 or Solaris 11.
2012-10-04 Paul Eggert <eggert@cs.ucla.edu>
Port timers to OpenBSD, plus check for timer failures.
OpenBSD problem reported by Han Boetes.
* profiler.c (setup_cpu_timer): Check for failure of timer_settime
and/or setitimer.
(Fprofiler_cpu_stop): Don't assume HAVE_SETITIMER.
* syssignal.h (HAVE_ITIMERSPEC): New macro. This is for platforms
like OpenBSD, which has timer_settime but does not declare it.
OpenBSD does not define SIGEV_SIGNAL, so use that when deciding
whether to use itimerspec-related primitives. All uses of
HAVE_TIMER_SETTIME replaced with HAVE_ITIMERSPEC.
Merge from gnulib, incorporating:
2012-10-02 pselect: reject invalid file descriptors
2012-10-02 ptsname: reject invalid file descriptors
2012-10-02 manywarnings: cater to more gcc infelicities
2012-09-30 sockets, sys_stat: restore AC_C_INLINE
* lib/pselect.c, lib/stdlib.in.h, m4/manywarnings.m4, m4/pselect.m4:
* m4/stdlib_h.m4, m4/sys_stat_h.m4: Update from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
2012-09-30 Paul Eggert <eggert@cs.ucla.edu>
@ -737,7 +768,7 @@
2012-06-28 Dmitry Antipov <dmantipov@yandex.ru>
* configure.in: Fix previous change. Remove --enable-asserts.
* configure.in: Fix previous change. Remove --enable-asserts.
(CPPFLAGS): Remove conditional -DXASSERTS=1.
Add --enable-link-time-optimization.
* INSTALL: Mention this.
@ -769,8 +800,8 @@
2012-06-26 Eli Zaretskii <eliz@gnu.org>
* lib/makefile.w32-in ($(GNULIBOBJS)): Depend on stamp_BLD. This
replaces separate dependency for each object file, which required
* lib/makefile.w32-in ($(GNULIBOBJS)): Depend on stamp_BLD.
This replaces separate dependency for each object file, which required
the same object file to be mentioned twice, causing failures in
parallel builds.
@ -915,7 +946,7 @@
2012-06-03 Ulrich Müller <ulm@gentoo.org>
* configure.in (PAXCTL): Check for paxctl. (Bug#11398)
* configure.in (PAXCTL): Check for paxctl. (Bug#11398)
2012-06-01 Paul Eggert <eggert@cs.ucla.edu>
@ -968,8 +999,8 @@
The build procedure now creates <stdalign.h> and <sys/types.h> for
older hosts that lack a working <stdalign.h> or whose
<sys/types.h> does not define pid_t, size_t, ssize_t, mode_t. New
symbols such as WINDOWS_64_BIT_OFF_T may require attention in the
<sys/types.h> does not define pid_t, size_t, ssize_t, mode_t.
New symbols such as WINDOWS_64_BIT_OFF_T may require attention in the
msdos and nt builds.
Here is a precis of gnulib changes that seem relevant; please see
@ -1367,7 +1398,7 @@
2012-04-17 Dmitry Antipov <dmantipov@yandex.ru>
* configure.in (AC_CHECK_FUNCS):
Add getpwent, endpwent, getgrent, endgrent. (Bug#7900)
Add getpwent, endpwent, getgrent, endgrent. (Bug#7900)
2012-04-16 Glenn Morris <rgm@gnu.org>
@ -1544,7 +1575,7 @@
2011-11-04 Glenn Morris <rgm@gnu.org>
* configure.in: Increase minimum GnuTLS version to 2.6.6. (Bug#9929)
* configure.in: Increase minimum GnuTLS version to 2.6.6. (Bug#9929)
Do not include GnuTLS version info in final summary message.
2011-10-31 Eli Zaretskii <eliz@gnu.org>
@ -2264,8 +2295,8 @@
* .bzrignore: Ignore new lib/*.in-h files.
* config.bat: Rename stdint.in.h and sys_stat.in.h. Call
depfiles.bat even if lib/deps already exist.
* config.bat: Rename stdint.in.h and sys_stat.in.h.
Call depfiles.bat even if lib/deps already exist.
2011-02-25 Paul Eggert <eggert@cs.ucla.edu>
@ -2292,7 +2323,7 @@
2011-02-21 Christoph Scholtes <cschol2112@gmail.com>
* lib/makefile.w32-in ($(BLD)/md5.$(O)): Added dependency on
* lib/makefile.w32-in ($(BLD)/md5.$(O)): Add dependency on
$(EMACS_ROOT)/nt/inc/stdint.h.
2011-02-21 Eli Zaretskii <eliz@gnu.org>
@ -2393,7 +2424,7 @@
2011-02-13 Bruno Haible <bruno@clisp.org>
Consistent macro naming for macros that use GCC __attribute__.
* lib/ignore-value.h (_GL_ATTRIBUTE_DEPRECATED): Renamed from
* lib/ignore-value.h (_GL_ATTRIBUTE_DEPRECATED): Rename from
ATTRIBUTE_DEPRECATED.
2011-02-12 Bruno Haible <bruno@clisp.org>
@ -2454,7 +2485,7 @@
2011-02-05 Paul Eggert <eggert@cs.ucla.edu>
sync from gnulib to remove HAVE_STDBOOL_H
* m4/stdbool.m4 (AC_CHECK_HEADER_STDBOOL): Renamed from
* m4/stdbool.m4 (AC_CHECK_HEADER_STDBOOL): Rename from
AC_HEADER_STDBOOL. All uses changed. Do not define
HAVE_STDBOOL_H, as gnulib does not need this. This change is
imported from the latest Autoconf git. It was motivated by Emacs,
@ -2539,8 +2570,8 @@
* lib/mktime.c (isdst_differ): New function.
(__mktime_internal): Use it systematically for all isdst comparisons.
This completes the fix for libc BZ #6723, and removes the need for
normalizing tm_isdst. See
<http://sourceware.org/bugzilla/show_bug.cgi?id=6723>
normalizing tm_isdst.
See <http://sourceware.org/bugzilla/show_bug.cgi?id=6723>
(not_equal_tm) [DEBUG]: Use isdst_differ here, too.
mktime: fix some integer overflow issues and sidestep the rest
@ -2614,7 +2645,7 @@
2011-01-28 Paul Eggert <eggert@cs.ucla.edu>
improve fix for MS-DOS file name clash
* Makefile.in (DOS_gnulib_comp.m4): Renamed from DOS-gnulib-comp.m4,
* Makefile.in (DOS_gnulib_comp.m4): Rename from DOS-gnulib-comp.m4,
for portability to POSIX make. Reported by Bruno Haible.
(sync-from-gnulib): Copy gl-comp.m4 (if present) back to
gnulib-comp.m4 before running gnulib-tool, to prevent old gnulib
@ -2905,8 +2936,8 @@
2010-12-04 Andreas Schwab <schwab@linux-m68k.org>
* configure.in: Remove reference to removed machine description
files and allow $machine and $machfile to be empty. Substitute
M_FILE/S_FILE instead of machfile/opsysfile.
files and allow $machine and $machfile to be empty.
Substitute M_FILE/S_FILE instead of machfile/opsysfile.
2010-12-03 Glenn Morris <rgm@gnu.org>
@ -2939,8 +2970,8 @@
2010-10-31 Ken Brown <kbrown@cornell.edu>
* configure.in (checking whether localtime caches TZ): Use
unsetenv instead of modifying environment directly.
* configure.in (checking whether localtime caches TZ):
Use unsetenv instead of modifying environment directly.
2010-10-25 Andreas Schwab <schwab@linux-m68k.org>
@ -2973,8 +3004,8 @@
2010-10-12 Dan Nicolaescu <dann@ics.uci.edu>
* configure (ns_appdir, OLDXMENU, TOOLTIP_SUPPORT): Remove
trailing / from directory names.
* configure (ns_appdir, OLDXMENU, TOOLTIP_SUPPORT):
Remove trailing / from directory names.
2010-10-12 Glenn Morris <rgm@gnu.org>
@ -4185,8 +4216,8 @@
2008-08-21 Christian Faulhammer <opfer@gentoo.org> (tiny change)
* configure.in (GNUSTEP_SYSTEM_HEADERS): Define
GNUSTEP_SYSTEM_HEADERS and GNUSTEP_SYSTEM_LIBRARIES.
* configure.in (GNUSTEP_SYSTEM_HEADERS):
Define GNUSTEP_SYSTEM_HEADERS and GNUSTEP_SYSTEM_LIBRARIES.
* configure: Regenerate.
@ -4227,8 +4258,8 @@
2008-08-06 Adrian Robert <Adrian.B.Robert@gmail.com>
* configure.in (NS_HAVE_INTEGER): Rename to NS_HAVE_NSINTEGER.
(C_SWITCH_X_SYSTEM): Drop -MMD -MP under NS_IMPL_GNUstep. Don't
bother undef'ing since won't have desired effect.
(C_SWITCH_X_SYSTEM): Drop -MMD -MP under NS_IMPL_GNUstep.
Don't bother undef'ing since won't have desired effect.
2008-08-06 Andreas Schwab <schwab@suse.de>
@ -5125,8 +5156,8 @@
2007-03-19 Deanna Phillips <deanna@sixbit.org> (tiny change)
* configure.in (arm-*-openbsd*, hppa-*-openbsd*)
(m88k-*-openbsd*, mips64-*-openbsd*, sh-*-openbsd*): Added.
(ns32k-*-openbsd*, ns32k-*-openbsd*): Deleted.
(m88k-*-openbsd*, mips64-*-openbsd*, sh-*-openbsd*): Add.
(ns32k-*-openbsd*, ns32k-*-openbsd*): Delete.
2007-03-19 Chong Yidong <cyd@stupidchicken.com>
@ -5456,7 +5487,7 @@
* configure.in: Use GZIP_PROG instead of GZIP.
* Makefile.in (GZIP_PROG): Renamed from GZIP.
* Makefile.in (GZIP_PROG): Rename from GZIP.
(install-arch-indep): Adjust.
2005-11-01 Andreas Schwab <schwab@suse.de>
@ -5569,8 +5600,8 @@
2005-05-13 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* configure.in: Don't check HAVE_CARBON if HAVE_X11 is set to yes.
Check HAVE_CARBON before USE_TOOLKIT_SCROLL_BARS. Define
USE_TOOLKIT_SCROLL_BARS by default if HAVE_CARBON is set to yes.
Check HAVE_CARBON before USE_TOOLKIT_SCROLL_BARS.
Define USE_TOOLKIT_SCROLL_BARS by default if HAVE_CARBON is set to yes.
2005-05-07 Jérôme Marant <jerome@marant.org>
@ -6664,8 +6695,8 @@
* Makefile.in (uninstall): Ignore exit code of `rm'.
* Makefile.in (uninstall): Remove more info files. Remove
${libexecdir}/emacs/${version}. Remove ${archlibdir}/fns-*.
* Makefile.in (uninstall): Remove more info files.
Remove ${libexecdir}/emacs/${version}. Remove ${archlibdir}/fns-*.
2001-01-31 Gerd Moellmann <gerd@gnu.org>
@ -6673,7 +6704,7 @@
2001-01-28 Gerd Moellmann <gerd@gnu.org>
* Makefile.in (extraclean): Added -f to -rm config-tmp-* to keep
* Makefile.in (extraclean): Add -f to -rm config-tmp-* to keep
it quiet.
2001-01-24 Colin Walters <walters@cis.ohio-state.edu>
@ -6868,7 +6899,7 @@
(NON-TIT-CNS, JAPANESE, KOREAN, THAI, VIETNAMESE, LAO, INDIAN)
(TIBETAN, LATIN, SLAVIC, GREEK, RUSSIAN, MISC): Rename all .el
files to .elc.
(${TIT}): Adjusted for the above change.
(${TIT}): Adjust for the above change.
(clean mostlyclean): Likewise.
(.el.elc): New target.
@ -6955,7 +6986,7 @@
2000-07-26 Dave Love <fx@gnu.org>
* configure.in (AC_SYS_LARGEFILE): Moved earlier.
* configure.in (AC_SYS_LARGEFILE): Move earlier.
2000-07-24 Dave Love <fx@gnu.org>
@ -7127,8 +7158,8 @@
* Makefile.in (bootstrap-lisp-1, bootstrap-lisp, bootstrap-src):
New targets.
(bootstrap): Rewritten in terms of the new targets above. Make
info files, too.
(bootstrap): Rewritten in terms of the new targets above.
Make info files, too.
2000-03-12 Gerd Moellmann <gerd@gnu.org>
@ -7207,8 +7238,8 @@
2000-01-03 Andreas Schwab <schwab@suse.de>
* Makefile.in (install-arch-indep): Install autotype*. Run
install-info on autotype and emacs-faq.info.
* Makefile.in (install-arch-indep): Install autotype*.
Run install-info on autotype and emacs-faq.info.
1999-12-04 Dave Love <fx@gnu.org>
@ -7284,7 +7315,7 @@
1999-09-07 Gerd Moellmann <gerd@gnu.org>
* configure.in (--with-sound): Removed.
* configure.in (--with-sound): Remove.
1999-08-30 Gerd Moellmann <gerd@gnu.org>
@ -7381,7 +7412,7 @@
* configure.in: Use epaths.h and epaths-force instead of paths...
* Makefile.in (epaths-force): Renamed from paths-force;
* Makefile.in (epaths-force): Rename from paths-force;
operate on epaths.in and produce epaths.h.
1999-02-24 Richard Stallman <rms@gnu.org>
@ -7726,8 +7757,8 @@
1997-08-24 NIIBE Yutaka <gniibe@mri.co.jp>
* configure.in (x_default_search_path): Corrected
'${x_library}' to '${x_library}/X11'.
* configure.in (x_default_search_path):
Corrected '${x_library}' to '${x_library}/X11'.
1997-08-22 Richard Stallman <rms@psilocin.gnu.ai.mit.edu>
@ -8427,7 +8458,7 @@
1995-12-24 Richard Stallman <rms@mole.gnu.ai.mit.edu>
* configure.in: Determine HAVE_X11R6.
(HAVE_MENUS): Renamed from HAVE_X_MENU.
(HAVE_MENUS): Rename from HAVE_X_MENU.
1995-12-21 Richard Stallman <rms@whiz-bang.gnu.ai.mit.edu>
@ -8620,8 +8651,8 @@
1995-07-06 David J. MacKenzie <djm@geech.gnu.ai.mit.edu>
* configure.in: Put back archlibdir initialization. Require
autoconf 2.4.1 or later.
* configure.in: Put back archlibdir initialization.
Require autoconf 2.4.1 or later.
1995-07-01 Richard Stallman <rms@mole.gnu.ai.mit.edu>
@ -8749,7 +8780,7 @@
* make-dist: Put src/makefile.nt in dist.
* configure.in (i[345]86-*-bsdi2*): New configuration.
(vax-dec-bsd386*): Deleted.
(vax-dec-bsd386*): Delete.
1995-05-06 David J. MacKenzie <djm@geech.gnu.ai.mit.edu>
@ -8759,7 +8790,7 @@
1995-05-03 Richard Stallman <rms@mole.gnu.ai.mit.edu>
* configure.in (m68*-apollo-*): Renamed from m68*-apollo*.
* configure.in (m68*-apollo-*): Rename from m68*-apollo*.
Use bsd4-3. Don't set NON_GNU_CPP.
* make-dist: Don't copy in src/s/*.inp. Don't copy nt/src.
@ -8836,7 +8867,7 @@
1995-02-07 Richard Stallman <rms@pogo.gnu.ai.mit.edu>
* Makefile.in (maintainer-clean): Renamed from realclean.
* Makefile.in (maintainer-clean): Rename from realclean.
1995-02-02 David J. MacKenzie <djm@geech.gnu.ai.mit.edu>
@ -9005,8 +9036,8 @@
* Makefile.in: Use libexecdir and sharedstatedir as appropriate.
* configure.in (libexecdir): Renamed from libdir. New default.
(sharedstatedir): Renamed from statedir. New default.
* configure.in (libexecdir): Rename from libdir. New default.
(sharedstatedir): Rename from statedir. New default.
(datadir): New default.
* make-dist: Don't distribute subdirs.el.
@ -9556,7 +9587,7 @@
1994-02-14 Frederic Pierresteguy (fp@mole.gnu.ai.mit.edu)
* configure.in (rs6000-bull-bosx*): Added support for BULL dpx20.
* configure.in (rs6000-bull-bosx*): Add support for BULL dpx20.
1994-02-11 Karl Heuer (kwzh@mole.gnu.ai.mit.edu)
@ -9709,7 +9740,7 @@
* Makefile.in (mkdir): Make only the lockdir writable.
* configure.in (i860-*-sysv4): Renamed from i860-*-sysvr4.
* configure.in (i860-*-sysv4): Rename from i860-*-sysvr4.
1993-12-11 Richard Stallman (rms@srarc2)
@ -9823,8 +9854,8 @@
1993-09-28 Brian J. Fox (bfox@cubit)
* configure.in: Don't copy ${srcdir}/src/Makefile.in; that file
doesn't exist. Just copy src/Makefile.in instead. Touch
all of the Makefiles after editing config.status.
doesn't exist. Just copy src/Makefile.in instead.
Touch all of the Makefiles after editing config.status.
* INSTALL: Update documentation to match new configuration
mechanism.
@ -9905,8 +9936,8 @@
1993-09-10 Roland McGrath (roland@churchy.gnu.ai.mit.edu)
* configure.in: Remove check for $srcdir being configured. This
pretty much works now.
* configure.in: Remove check for $srcdir being configured.
This pretty much works now.
Grok {m68*-hp,i[34]86-*}-netbsd* and set opsys=netbsd.
Check for XFree86 (/usr/X386/include) independent of whether
-lXbsd exists.
@ -9947,7 +9978,7 @@
1993-08-10 Richard Stallman (rms@mole.gnu.ai.mit.edu)
* configure.in (m88k-tektronix-sysv3*): Added the missing *.
* configure.in (m88k-tektronix-sysv3*): Add the missing *.
Use tekxd88, not tekXD88.
1993-08-10 Roland McGrath (roland@churchy.gnu.ai.mit.edu)
@ -10322,8 +10353,8 @@
* INSTALL: Mention its usage.
* configure.in (hppa-hp-hpux): Use uname -r instead of uname -m;
the former gives you the operating system rev directly. Use
s/hpux.h if we don't recognize what we got.
the former gives you the operating system rev directly.
Use s/hpux.h if we don't recognize what we got.
* Makefile.in (do-install): Don't remove a destination directory
if it's the same as the source. If ${srcdir}/info == ${infodir},
@ -10370,8 +10401,8 @@
* Makefile.in (install): Split this into `install' and
`do-install', to give people more control over exactly what gets
done.
(do-install): New target, containing the guts of `install'. Don't
remove and recreate the directories inside the copying loop - do
(do-install): New target, containing the guts of `install'.
Don't remove and recreate the directories inside the copying loop - do
it all before the copying loop. Pass more flags to the lib-src
make.
(mkdir): Create ${infodir}, ${mandir}, and ${sitelispdir} here, to
@ -10428,7 +10459,7 @@
* configure.in: Make the first line of the configure script be
"#!/bin/sh". Leaving the first line blank didn't work.
* configure.in (long_usage): Removed; made short_usage describe
* configure.in (long_usage): Remove; made short_usage describe
the options briefly.
* configure.in: Implement the --prefix option.
@ -10500,11 +10531,11 @@
* PROBLEMS: Some updates from David J. Mackenzie.
More changes from David J. Mackenzie.
* Makefile.in (install.sysv, install.xenix, install.aix): Targets
removed; autoconf and config.h should specify all these
* Makefile.in (install.sysv, install.xenix, install.aix):
Targets removed; autoconf and config.h should specify all these
differences.
(buildlisppath): Make this path depend on ${srcdir}.
(INSTALLFLAGS): Removed.
(INSTALLFLAGS): Remove.
(INSTALL): Include the -c flag.
(install): Change the way we invoke install accordingly.
@ -10547,14 +10578,14 @@
1993-05-09 Jim Blandy (jimb@totoro.cs.oberlin.edu)
* Makefile.in (DEFS): Deleted; since we're using AC_CONFIG_HEADER,
* Makefile.in (DEFS): Delete; since we're using AC_CONFIG_HEADER,
this is always just -DHAVE_CONFIG_H.
The GNU coding standards specify that CFLAGS should be left for
users to set.
* Makefile.in (CFLAGS): Let configure determine the default value
for this. Don't
have it default to DEFS.
for this.
Don't have it default to DEFS.
(${SUBDIR}): Pass CFLAGS down to submakes, not DEFS.
(lib-src/Makefile, src/Makefile): Edit the default value for
CFLAGS into these files, not DEFS.
@ -10680,17 +10711,17 @@
Use autoconf to produce Makefile and src/config.h.
Remove the Makefile-style comment that autoconf places at the top
of src/config.h.
(config_h_opts): Removed - no longer necessary.
* Makefile.in (configname): Renamed to configuration.
(CONFIG_CFLAGS): Renamed to DEFS.
(CC, DEFS, C_SWITCH_SYSTEM, version, configuration): Adjusted to
(config_h_opts): Remove - no longer necessary.
* Makefile.in (configname): Rename to configuration.
(CONFIG_CFLAGS): Rename to DEFS.
(CC, DEFS, C_SWITCH_SYSTEM, version, configuration): Adjust to
get values via autoload @cookies@.
(libsrc_libs): Get this from autoconf. We used to do nothing
about this.
(${SUBDIR}): Pass DEFS to submakes instead of CONFIG_CFLAGS.
* Makefile.in (src/paths.h, lib-src/Makefile, src/Makefile): Don't
echo the move-if-change command.
* Makefile.in (src/paths.h, lib-src/Makefile, src/Makefile):
Don't echo the move-if-change command.
1993-04-08 Jim Blandy (jimb@churchy.gnu.ai.mit.edu)
@ -10745,8 +10776,8 @@
* configure: Properly handle extracting values of LIBS_MACHINE and
LIBS_SYSTEM that contain spaces.
* configure: Add `--x-includes' and `--x-libraries' options. I
think these are dopey, but no less than three alpha testers, at
* configure: Add `--x-includes' and `--x-libraries' options.
I think these are dopey, but no less than three alpha testers, at
large sites, have said they have their X files installed in odd
places. Implement them by setting C_SWITCH_X_SITE and
LD_SWITCH_X_SITE in src/config.h.
@ -10951,8 +10982,8 @@
* Makefile.in (datadir, statedir, libdir): Make these all default
to ${prefix}/lib.
(lispdir, locallisppath, etcdir, lockdir, archlibdir): Adjusted
to compensate.
(lispdir, locallisppath, etcdir, lockdir, archlibdir):
Adjust to compensate.
* Makefile.in (install, install.sysv, install.xenix, install.aix):
Install the etags and ctags man pages too.
@ -10967,7 +10998,7 @@
* configure (long_usage): Remove all traces of old arguments from
usage messages, and document the options we do accept in more
detail: -with-x... and --srcdir.
(options, boolean_opts): Deleted; we don't have enough options to
(options, boolean_opts): Delete; we don't have enough options to
make this worthwhile.
(prefix, bindir, lisppath, datadir, libdir, lockdir): Deleted,
along with the code which supported them; these should be set as
@ -10992,8 +11023,8 @@
compile in don't exist yet, create them under the current directory.
Note that the rest of the build process doesn't really support
this.
Edit only the top Makefile. That should edit the others. Edit
into the makefile: `version', from lisp/version.el, `configname'
Edit only the top Makefile. That should edit the others.
Edit into the makefile: `version', from lisp/version.el, `configname'
and `srcdir' from the configuration arguments, `CC' and
`CONFIG_CFLAGS' as guessed from the presence or absence of GCC in
the user's path, and LOADLIBES as gleaned from the system
@ -11236,8 +11267,8 @@
* make-dist: When setting up etc/COPYING, always nuke whatever is
there, and then copy it in, to make sure we get a real file.
* make-dist: Don't try to distribute *.defns files any more. The
only such file was for simula.el, which has been superseded by a
* make-dist: Don't try to distribute *.defns files any more.
The only such file was for simula.el, which has been superseded by a
version which doesn't have a separate .defns file.
1992-05-28 Ken Raeburn (Raeburn@Cygnus.COM)
@ -11408,10 +11439,10 @@
(mostlyclean): New target, synonymous with clean.
(realclean): New target. Currently, this just calls the
subdirectories's makefiles and then deletes config.status.
(INSTALL, INSTALLFLAGS, INSTALL_PROGRAM, INSTALL_DATA): New
variables.
(INSTALL, INSTALLFLAGS, INSTALL_PROGRAM, INSTALL_DATA):
New variables.
Installation directory variables changed to conform.
(install, install.sysv, install.xenix, install.aix): Changed the
(install, install.sysv, install.xenix, install.aix): Change the
code which copies the directories into their installed location to
allow the installed locations to be in several different
directories; the old version assumed that they would all be in

22
Makefile.in
View file

@ -361,7 +361,7 @@ blessmail: Makefile src FRC
# etc. to be built without running into similar recursion problems.
MAKEFILE_NAME = Makefile
$(MAKEFILE_NAME): config.status $(srcdir)/src/config.in \
$(srcdir)/Makefile.in $(SUBDIR_MAKEFILES_IN)
$(srcdir)/Makefile.in $(SUBDIR_MAKEFILES_IN) $(srcdir)/src/lisp.mk
MAKE='$(MAKE)' ./config.status
# Don't erase these files if make is interrupted while refreshing them.
@ -622,18 +622,24 @@ install-man:
thisdir=`/bin/pwd`; \
cd ${mansrcdir}; \
for page in *.1; do \
dest=`echo "$${page}" | sed '$(TRANSFORM)'`; \
(cd $${thisdir}; \
${INSTALL_DATA} ${mansrcdir}/$${page} $(DESTDIR)${man1dir}/$${page}); \
${INSTALL_DATA} ${mansrcdir}/$${page} $(DESTDIR)${man1dir}/$${dest}); \
( [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ] ) || continue ; \
rm -f $(DESTDIR)${man1dir}/$${page}.gz; \
${GZIP_PROG} -9n $(DESTDIR)${man1dir}/$${page}; \
rm -f $(DESTDIR)${man1dir}/$${dest}.gz; \
${GZIP_PROG} -9n $(DESTDIR)${man1dir}/$${dest}; \
done
## Install those items from etc/ that need to end up elsewhere.
install-etc:
umask 022; ${MKDIR_P} $(DESTDIR)${desktopdir}
${INSTALL_DATA} ${srcdir}/etc/emacs.desktop \
$(DESTDIR)${desktopdir}/emacs.desktop
dest=`echo emacs | sed '$(TRANSFORM)'`; \
tmp=etc/emacs.tmpdesktop; rm -f $${tmp}; \
sed -e "/^Exec=emacs/ s/emacs/$${dest}/" \
-e "/^Icon=emacs/ s/emacs/$${dest}/" \
${srcdir}/etc/emacs.desktop > $${tmp}; \
${INSTALL_DATA} $${tmp} $(DESTDIR)${desktopdir}/$${dest}.desktop; \
rm -f $${tmp}
thisdir=`/bin/pwd`; \
cd ${iconsrcdir} || exit 1; umask 022 ; \
for dir in */*/apps */*/mimetypes; do \
@ -641,8 +647,9 @@ install-etc:
( cd $${thisdir}; ${MKDIR_P} $(DESTDIR)${icondir}/$${dir} ) ; \
for icon in $${dir}/*.*; do \
[ -r $${icon} ] || continue ; \
dest=`echo "$${icon}" | sed -e 's|.*/||' -e '$(TRANSFORM)'` ; \
( cd $${thisdir}; \
${INSTALL_DATA} ${iconsrcdir}/$${icon} $(DESTDIR)${icondir}/$${icon} ) \
${INSTALL_DATA} ${iconsrcdir}/$${icon} $(DESTDIR)${icondir}/$${dir}/$${dest} ) \
|| exit 1; \
done ; \
done
@ -729,6 +736,7 @@ mostlyclean: FRC
###
### Delete `.dvi' files here if they are not part of the distribution.
clean: FRC
-rm -f etc/emacs.tmpdesktop
(cd src; $(MAKE) $(MFLAGS) clean)
(cd oldXMenu; $(MAKE) $(MFLAGS) clean)
(cd lwlib; $(MAKE) $(MFLAGS) clean)

49
admin/ChangeLog
View file

@ -1,3 +1,52 @@
2012-10-12 Kenichi Handa <handa@gnu.org>
* charsets/Makefile (JISC6226.map): Add missing mappings.
2012-10-11 Kenichi Handa <handa@gnu.org>
* charsets/mapconv: Adjusted for the change of mapfiles/*.gz to
mapfiles/*.
* charsets/gb180302.awk: Handle 4-byte sequences in the input file.
* charsets/Makefile: Be sure to call mapconv script of the current
directory. Adjusted for the change of mapfiles/*.gz to
mapfiles/*.
(SED_SCRIPT): New variable.
(jisx2131-filter): New target.
(JISX2131.map): Use jisx2131-filter to filter out characters added
for the 2004 year version.
(clear): Remove ${SED_SCRIPT} too.
* charsets/mapfiles/MULE-ethiopic.map,
charsets/mapfiles/MULE-ipa.map,
charsets/mapfiles/MULE-is13194.map,
charsets/mapfiles/MULE-lviscii.map,
charsets/mapfiles/MULE-sisheng.map,
charsets/mapfiles/MULE-tibetan.map,
charsets/mapfiles/MULE-uviscii.map: Fix typo.
2012-10-09 Glenn Morris <rgm@gnu.org>
* admin.el (cusver-scan-cus-start): New function.
(cusver-check): Scan old cus-start.el.
2012-10-07 Glenn Morris <rgm@gnu.org>
* admin.el (cusver-new-version): Set default.
(cusver-check): Improve interactive argument reading.
2012-10-06 Glenn Morris <rgm@gnu.org>
* admin.el (cusver-new-version): New variable.
(cusver-scan): Check if containing group has a :version.
(cusver-check): Add VERSION argument.
2012-10-01 David Engster <deng@randomsample.de>
* grammars/bovine-grammar.el:
* grammars/wisent-grammar.el: Move to lisp directory.
2012-10-01 David Engster <deng@randomsample.de>
* grammars/bovine-grammar.el (bovine--grammar-newstyle-unquote):

62
admin/admin.el
View file

@ -442,8 +442,10 @@ If optional OLD is non-nil, also include defvars."
))
"{}" "+"))
;; TODO if a defgroup with a version tag, apply to all customs in that
;; group (eg for new files).
(defvar cusver-new-version (format "%s.%s" emacs-major-version
(1+ emacs-minor-version))
"Version number that new defcustoms should have.")
(defun cusver-scan (file &optional old)
"Scan FILE for `defcustom' calls.
Return a list with elements of the form (VAR . VER),
@ -452,8 +454,8 @@ a :version tag having value VER (may be nil).
If optional argument OLD is non-nil, also scan for defvars."
(let ((m (format "Scanning %s..." file))
(re (format "^[ \t]*\\((def%s\\)[ \t\n]"
(if old "\\(?:custom\\|var\\)" "custom")))
alist var ver form)
(if old "\\(custom\\|var\\)" "\\(custom\\|group\\)")))
alist var ver form glist grp)
(message "%s" m)
(with-temp-buffer
(insert-file-contents file)
@ -461,15 +463,42 @@ If optional argument OLD is non-nil, also scan for defvars."
(while (re-search-forward re nil t)
(goto-char (match-beginning 1))
(if (and (setq form (ignore-errors (read (current-buffer))))
(setq var (car-safe (cdr-safe form)))
(setq var (car-safe (cdr-safe form)))
;; Exclude macros, eg (defcustom ,varname ...).
(symbolp var))
(setq ver (car (cdr-safe (memq :version form)))
alist (cons (cons var ver) alist))
(progn
(setq ver (car (cdr-safe (memq :version form))))
(if (equal "group" (match-string 2))
;; Group :version could be old.
(if (equal ver cusver-new-version)
(setq glist (cons (cons var ver) glist)))
;; If it specifies a group and the whole group has a
;; version. use that.
(unless ver
(setq grp (car (cdr-safe (memq :group form))))
(and grp
(setq grp (car (cdr-safe grp))) ; (quote foo) -> foo
(setq ver (assq grp glist))))
(setq alist (cons (cons var ver) alist))))
(if form (message "Malformed defcustom: `%s'" form)))))
(message "%sdone" m)
alist))
(defun cusver-scan-cus-start (file)
"Scan cus-start.el and return an alist with elements (VAR . VER)."
(if (file-readable-p file)
(with-temp-buffer
(insert-file-contents file)
(when (search-forward "(let ((all '(" nil t)
(backward-char 1)
(let (var ver alist)
(dolist (elem (ignore-errors (read (current-buffer))))
(when (symbolp (setq var (car-safe elem)))
(or (stringp (setq ver (nth 3 elem)))
(setq ver nil))
(setq alist (cons (cons var ver) alist))))
alist)))))
(define-button-type 'cusver-xref 'action #'cusver-goto-xref)
(defun cusver-goto-xref (button)
@ -485,12 +514,10 @@ If optional argument OLD is non-nil, also scan for defvars."
(pop-to-buffer (current-buffer))))))
;; You should probably at least do a grep over the old directory
;; to check the results of this look sensible. Eg cus-start if
;; something moved from C to Lisp.
;; TODO handle renamed things with aliases to the old names.
;; What to do about new files? Does everything in there need a :version,
;; or eg just the defgroup?
(defun cusver-check (newdir olddir)
;; to check the results of this look sensible.
;; TODO Check cus-start if something moved from C to Lisp.
;; TODO Handle renamed things with aliases to the old names.
(defun cusver-check (newdir olddir version)
"Check that defcustoms have :version tags where needed.
NEWDIR is the current lisp/ directory, OLDDIR is that from the previous
release. A defcustom that is only in NEWDIR should have a :version
@ -499,11 +526,16 @@ just converting a defvar to a defcustom does not require a :version bump.
Note that a :version tag should also be added if the value of a defcustom
changes (in a non-trivial way). This function does not check for that."
(interactive "DNew Lisp directory: \nDOld Lisp directory: ")
(interactive (list (read-directory-name "New Lisp directory: ")
(read-directory-name "Old Lisp directory: ")
(number-to-string
(read-number "New version number: "
(string-to-number cusver-new-version)))))
(or (file-directory-p (setq newdir (expand-file-name newdir)))
(error "Directory `%s' not found" newdir))
(or (file-directory-p (setq olddir (expand-file-name olddir)))
(error "Directory `%s' not found" olddir))
(setq cusver-new-version version)
(let* ((newfiles (progn (message "Finding new files with defcustoms...")
(cusver-find-files newdir)))
(oldfiles (progn (message "Finding old files with defcustoms...")
@ -516,6 +548,8 @@ changes (in a non-trivial way). This function does not check for that."
(message "Reading old defcustoms...")
(dolist (file oldfiles)
(setq oldcus (append oldcus (cusver-scan file t))))
(setq oldcus (append oldcus (cusver-scan-cus-start
(expand-file-name "cus-start.el" olddir))))
;; newcus has elements (FILE (VAR VER) ... ).
;; oldcus just (VAR . VER).
(message "Checking for version tags...")

127
admin/charsets/Makefile
View file

@ -77,6 +77,7 @@ MULE = MULE-ethiopic.map MULE-ipa.map MULE-is13194.map \
MULE-lviscii.map MULE-uviscii.map
TRANS_TABLE = cp51932.el eucjp-ms.el
SED_SCRIPT = jisx2131-filter
all: ${CHARSETS} ${TRANS_TABLE}
@ -86,11 +87,11 @@ AWK = gawk
VSCII.map: ${GLIBC_CHARMAPS}/TCVN5712-1.gz mapconv compact.awk
# Generating $@...
@mapconv $< '/^<.*[ ]\/x[0-9a-f].[ ]/' GLIBC-1 compact.awk > $@
@./mapconv $< '/^<.*[ ]\/x[0-9a-f].[ ]/' GLIBC-1 compact.awk > $@
VSCII-2.map: ${GLIBC_CHARMAPS}/TCVN5712-1.gz mapconv compact.awk
# Generating $@...
@mapconv $< '/^<.*[ ]\/x[2-7a-f].[ ]/' GLIBC-1 compact.awk \
@./mapconv $< '/^<.*[ ]\/x[2-7a-f].[ ]/' GLIBC-1 compact.awk \
| sed 's/0x20-0x7F.*/0x00-0x7F 0x0000/' > $@
ALTERNATIVNYJ.map: IBM866.map
@ -110,45 +111,45 @@ ALTERNATIVNYJ.map: IBM866.map
-e '/0xFA/ s/ .*/ 0x00B1/' \
-e '/0xFB/ s/ .*/ 0x00F7/' < $< >> $@
MIK.map: mapfiles/bulgarian-mik.txt.gz mapconv compact.awk
MIK.map: mapfiles/bulgarian-mik.txt mapconv compact.awk
# Generating $@...
@mapconv $< '1,$$' CZYBORRA compact.awk > $@
@./mapconv $< '1,$$' CZYBORRA compact.awk > $@
PTCP154.map: mapfiles/PTCP154.gz mapconv compact.awk
PTCP154.map: mapfiles/PTCP154 mapconv compact.awk
# Generating $@...
@mapconv $< '/^0x/' IANA compact.awk > $@
@./mapconv $< '/^0x/' IANA compact.awk > $@
stdenc.map: mapfiles/stdenc.txt.gz mapconv compact.awk
stdenc.map: mapfiles/stdenc.txt mapconv compact.awk
# Generating $@...
@mapconv $< '/^[0-9A-Fa-f]/' UNICODE compact.awk > $@
@./mapconv $< '/^[0-9A-Fa-f]/' UNICODE compact.awk > $@
symbol.map: mapfiles/symbol.txt.gz mapconv compact.awk
symbol.map: mapfiles/symbol.txt mapconv compact.awk
# Generating $@...
@mapconv $< '/^[0-9A-Fa-f]/' UNICODE compact.awk > $@
@./mapconv $< '/^[0-9A-Fa-f]/' UNICODE compact.awk > $@
CP720.map: mapfiles/CP720.map.gz
CP720.map: mapfiles/CP720.map
# Generating $@...
@zcat $< > $@
@cp $< $@
CP858.map: mapfiles/CP858.map.gz
CP858.map: mapfiles/CP858.map
# Generating $@...
@zcat $< > $@
@cp $< $@
CP949-2BYTE.map: ${GLIBC_CHARMAPS}/CP949.gz mapconv compact.awk
# Generating $@...
@mapconv $< '/^<.*[ ]\/x[89a-f]/' GLIBC-2 compact.awk > $@
@./mapconv $< '/^<.*[ ]\/x[89a-f]/' GLIBC-2 compact.awk > $@
GB2312.map: ${GLIBC_CHARMAPS}/GB2312.gz mapconv compact.awk
# Generating $@...
@mapconv $< '/^<.*[ ]\/x[a-f]/' GLIBC-2-7 compact.awk > $@
@./mapconv $< '/^<.*[ ]\/x[a-f]/' GLIBC-2-7 compact.awk > $@
GBK.map: ${GLIBC_CHARMAPS}/GBK.gz mapconv compact.awk
# Generating $@...
@mapconv $< '/^<.*[ ]\/x[89a-f]/' GLIBC-2 compact.awk > $@
@./mapconv $< '/^<.*[ ]\/x[89a-f]/' GLIBC-2 compact.awk > $@
GB180302.map: ${GLIBC_CHARMAPS}/GB18030.gz mapconv gb180302.awk
# Generating $@...
@mapconv $< '/^<.*[ ]\/x..\/x..[ ]/' GLIBC-2 gb180302.awk > $@
@./mapconv $< '/^<.*[ ]\/x..\/x..[ ]/' GLIBC-2 gb180302.awk > $@
GB180304.map: GB180302.map gb180304.awk
# Generating $@...
@ -156,35 +157,39 @@ GB180304.map: GB180302.map gb180304.awk
JISX0201.map: ${GLIBC_CHARMAPS}/JIS_X0201.gz mapconv compact.awk
# Generating $@...
@mapconv $< '/^<.*[ ]\/x[0-9]/' GLIBC-1 compact.awk > $@
@./mapconv $< '/^<.*[ ]\/x[0-9]/' GLIBC-1 compact.awk > $@
@echo "# Generated by hand" >> $@
@echo "0xA1-0xDF 0xFF61" >> $@
JISX0208.map: ${GLIBC_CHARMAPS}/EUC-JP.gz mapconv
# Generating $@...
@mapconv $< '/^<.*[ ]\/x[a-f]/' GLIBC-2-7 \
@./mapconv $< '/^<.*[ ]\/x[a-f]/' GLIBC-2-7 \
| sed 's/0x2015/0x2014/' > $@
JISX0212.map: ${GLIBC_CHARMAPS}/EUC-JP.gz mapconv compact.awk
# Generating $@...
@mapconv $< '/^<.*[ ]\/x8f/ s,/x8f,,' GLIBC-2-7 compact.awk > $@
@./mapconv $< '/^<.*[ ]\/x8f/ s,/x8f,,' GLIBC-2-7 compact.awk > $@
JISX2131.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz mapconv
jisx2131-filter: mapfiles/JISX213A.map
@sed -n -e '/^#/d' -e 's,.*0x\([0-9A-Z]*\)$$,/0x0*\1$$/d,p' < $< > $@
JISX2131.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz mapconv jisx2131-filter
# Generating $@...
@mapconv $< '/^<.*[ ]\/x[a-f]/' GLIBC-2-7 \
@./mapconv $< '/^<.*[ ]\/x[a-f]/' GLIBC-2-7 \
| sed -f jisx2131-filter \
| sed -e 's/0x2015/0x2014/' -e 's/0x2299/0x29BF/' > $@
JISX2132.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz mapconv
# Generating $@...
@mapconv $< '/^<.*[ ]\/x8f/ s,/x8f,,' GLIBC-2-7 > $@
@./mapconv $< '/^<.*[ ]\/x8f/ s,/x8f,,' GLIBC-2-7 > $@
JISX213A.map: mapfiles/JISX213A.map.gz
JISX213A.map: mapfiles/JISX213A.map
# Generating $@
@zcat $< > $@
@cp $< $@
CP932-2BYTE.map: mapfiles/CP932.TXT.gz mapconv cp932.awk
CP932-2BYTE.map: mapfiles/CP932.TXT mapconv cp932.awk
# Generating $@...
@mapconv $< '/^0x[89A-F][0-9A-F][0-9A-F]/' UNICODE2 cp932.awk > $@
@./mapconv $< '/^0x[89A-F][0-9A-F][0-9A-F]/' UNICODE2 cp932.awk > $@
cp51932.el: CP932-2BYTE.map cp51932.awk
@$(AWK) -f cp51932.awk < CP932-2BYTE.map > $@
@ -192,17 +197,27 @@ cp51932.el: CP932-2BYTE.map cp51932.awk
eucjp-ms.el: ${GLIBC_CHARMAPS}/EUC-JP-MS.gz eucjp-ms.awk
@zcat $< | $(AWK) -f eucjp-ms.awk > $@
JISC6226.map : mapfiles/Uni2JIS.gz mapconv kuten.awk
JISC6226.map: mapfiles/Uni2JIS mapconv kuten.awk
# Generating $@...
@mapconv $< '/^[^#].*0-/' YASUOKA kuten.awk > $@
# As Uni2JIS doesn't contain mappings of characters added to Unicode
# recently, we add them manually here (including one correction for
# U+005C vs U+FF3C). These changes are based on bogytech's blog at
# http://bogytech.blogspot.jp/search/label/emacs.
@./mapconv $< '/^[^#].*0-/' YASUOKA kuten.awk \
| sed -e '/0x2140/s/005C/FF3C/' \
-e '$$ a 0x3442 0x3D4E' \
-e '$$ a 0x374E 0x25874' \
-e '$$ a 0x3764 0x28EF6' \
-e '$$ a 0x513D 0x2F80F' \
-e '$$ a 0x7045 0x9724' > $@
KSC5601.map: ${GLIBC_CHARMAPS}/EUC-KR.gz mapconv compact.awk
# Generating $@...
@mapconv $< '/^<.*[ ]\/x[a-f]/' GLIBC-2-7 compact.awk > $@
@./mapconv $< '/^<.*[ ]\/x[a-f]/' GLIBC-2-7 compact.awk > $@
BIG5.map: ${GLIBC_CHARMAPS}/BIG5.gz mapconv compact.awk
# Generating $@...
@mapconv $< '/^<.*[ ]\/x[a-f]/' GLIBC-2 > $@
@./mapconv $< '/^<.*[ ]\/x[a-f]/' GLIBC-2 > $@
BIG5-1.map: BIG5.map mapconv big5.awk
# Generating $@...
@ -216,52 +231,52 @@ BIG5-2.map: BIG5.map mapconv big5.awk
BIG5-HKSCS.map: ${GLIBC_CHARMAPS}/BIG5-HKSCS.gz mapconv compact.awk
# Generating $@...
@mapconv $< '/^<.*[ ]\/x[89a-f].\//' GLIBC-2 compact.awk > $@
@./mapconv $< '/^<.*[ ]\/x[89a-f].\//' GLIBC-2 compact.awk > $@
JOHAB.map: ${GLIBC_CHARMAPS}/JOHAB.gz mapconv compact.awk
# Generating $@...
@mapconv $< '/^<.*[ ]\/x[89a-f]/' GLIBC-2 compact.awk > $@
@./mapconv $< '/^<.*[ ]\/x[89a-f]/' GLIBC-2 compact.awk > $@
CNS-1.map: ${GLIBC_CHARMAPS}/EUC-TW.gz mapconv compact.awk
# Generating $@...
@mapconv $< '/^<.*[ ]\/x[a-f]/' GLIBC-2-7 compact.awk > $@
@./mapconv $< '/^<.*[ ]\/x[a-f]/' GLIBC-2-7 compact.awk > $@
# CNS-1.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
# # Generating $@...
# @mapconv $< '/^C1/' KANJI-DATABASE compact.awk > $@
# @./mapconv $< '/^C1/' KANJI-DATABASE compact.awk > $@
CNS-2.map: mapfiles/cns2ucsdkw.txt.gz mapconv compact.awk
CNS-2.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
# Generating $@...
@mapconv $< '/^C2/' KANJI-DATABASE compact.awk > $@
@./mapconv $< '/^C2/' KANJI-DATABASE compact.awk > $@
CNS-3.map: mapfiles/cns2ucsdkw.txt.gz mapconv compact.awk
CNS-3.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
# Generating $@...
@mapconv $< '/^C3/' KANJI-DATABASE compact.awk > $@
@./mapconv $< '/^C3/' KANJI-DATABASE compact.awk > $@
CNS-4.map: mapfiles/cns2ucsdkw.txt.gz mapconv compact.awk
CNS-4.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
# Generating $@...
@mapconv $< '/^C4/' KANJI-DATABASE compact.awk > $@
@./mapconv $< '/^C4/' KANJI-DATABASE compact.awk > $@
CNS-5.map: mapfiles/cns2ucsdkw.txt.gz mapconv compact.awk
CNS-5.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
# Generating $@...
@mapconv $< '/^C5/' KANJI-DATABASE compact.awk > $@
@./mapconv $< '/^C5/' KANJI-DATABASE compact.awk > $@
CNS-6.map: mapfiles/cns2ucsdkw.txt.gz mapconv compact.awk
CNS-6.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
# Generating $@...
@mapconv $< '/^C6/' KANJI-DATABASE compact.awk > $@
@./mapconv $< '/^C6/' KANJI-DATABASE compact.awk > $@
CNS-7.map: mapfiles/cns2ucsdkw.txt.gz mapconv compact.awk
CNS-7.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
# Generating $@...
@mapconv $< '/^C7/' KANJI-DATABASE compact.awk > $@
@./mapconv $< '/^C7/' KANJI-DATABASE compact.awk > $@
CNS-F.map: ${GLIBC_CHARMAPS}/EUC-TW.gz mapconv compact.awk
# Generating $@...
@mapconv $< '/^<.*\/x8e\/xaf/ s,/x8e/xaf,,' GLIBC-2-7 compact.awk > $@
@./mapconv $< '/^<.*\/x8e\/xaf/ s,/x8e/xaf,,' GLIBC-2-7 compact.awk > $@
# General target to produce map files for mule charsets.
MULE-%.map: mapfiles/MULE-%.map.gz
MULE-%.map: mapfiles/MULE-%.map
# Generating $@...
@zcat $< > $@
@cp $< $@
# General target to produce map files for ISO-8859, GEORGIAN, and
# EBCDIC charsets. We can not use the original file name because of
@ -269,21 +284,21 @@ MULE-%.map: mapfiles/MULE-%.map.gz
8859-%.map: ${GLIBC_CHARMAPS}/ISO-8859-%.gz mapconv compact.awk
# Generating $@...
@mapconv $< '/^<.*[ ]\/x/' GLIBC-1 compact.awk > $@
@./mapconv $< '/^<.*[ ]\/x/' GLIBC-1 compact.awk > $@
KA-%.map: ${GLIBC_CHARMAPS}/GEORGIAN-%.gz mapconv compact.awk
# Generating $@...
@mapconv $< '/^<.*[ ]\/x/' GLIBC-1 compact.awk > $@
@./mapconv $< '/^<.*[ ]\/x/' GLIBC-1 compact.awk > $@
EBCDIC%.map: ${GLIBC_CHARMAPS}/EBCDIC-%.gz mapconv compact.awk
# Generating $@...
@mapconv $< '/^<.*[ ]\/x/' GLIBC-1 compact.awk > $@
@./mapconv $< '/^<.*[ ]\/x/' GLIBC-1 compact.awk > $@
# General target to produce map files for single-byte charsets.
%.map: ${GLIBC_CHARMAPS}/%.gz mapconv compact.awk
# Generating $@...
@mapconv $< '/^<.*[ ]\/x/' GLIBC-1 compact.awk > $@
@./mapconv $< '/^<.*[ ]\/x/' GLIBC-1 compact.awk > $@
install:
@for f in ${CHARSETS}; do \
@ -305,5 +320,5 @@ install:
# Clear files that are automatically generated.
clean:
rm -f ${CHARSETS} ${TRANS_TABLE}
rm -f ${CHARSETS} ${TRANS_TABLE} ${SED_SCRIPT}

21
admin/charsets/gb180302.awk
View file

@ -74,19 +74,30 @@ function index_to_gb(idx) {
{
gb = gb_to_index(decode_hex(substr($1, 3, 4)));
unicode = decode_hex(substr($2, 3, 4));
unicode = decode_hex(substr($2, 3));
if ((gb == to_gb + 1) && (unicode == to_unicode + 1))
{
to_gb++;
to_unicode++;
}
else
else if (gb > to_gb) # ignore the case gb == to_gb that is a duplication
{
if (from_gb == to_gb)
printf "0x%04X 0x%04X\n", index_to_gb(from_gb), from_unicode;
{
if (from_unicode <= 65535)
printf "0x%04X 0x%04X\n", index_to_gb(from_gb), from_unicode;
else
printf "0x%04X 0x%08X\n", index_to_gb(from_gb), from_unicode;
}
else if (from_gb < to_gb)
printf "0x%04X-0x%04X 0x%04X\n",
index_to_gb(from_gb), index_to_gb(to_gb), from_unicode;
{
if (from_unicode <= 65535)
printf "0x%04X-0x%04X 0x%04X\n",
index_to_gb(from_gb), index_to_gb(to_gb), from_unicode;
else
printf "0x%04X-0x%04X 0x%08X\n",
index_to_gb(from_gb), index_to_gb(to_gb), from_unicode;
}
from_gb = to_gb = gb;
from_unicode = to_unicode = unicode;
}

13
admin/charsets/mapconv
View file

@ -98,18 +98,17 @@ elif [ "$3" = "GLIBC-2-7" ] ; then
| sed -e 's/xa/x2/g' -e 's/xb/x3/g' -e 's/xc/x4/g' \
-e 's/xd/x5/g' -e 's/xe/x6/g' -e 's/xf/x7/g' \
-e 's,<U\([^>]*\)>[ ]*/x\(..\)/x\(..\).*,0x\2\3 0x\1,' \
| tee temp \
| sort | ${AWKPROG}
elif [ "$3" = "CZYBORRA" ] ; then
# Source format is:
# =XX U+YYYY
zcat $1 | sed -n -e "$2 p" \
sed -n -e "$2 p" < $1 \
| sed -e 's/=\(..\)[^U]*U+\([0-9A-F]*\).*/0x\1 0x\2/' \
| sort | ${AWKPROG}
elif [ "$3" = "IANA" ] ; then
# Source format is:
# 0xXX 0xYYYY
zcat $1 | sed -n -e "$2 p" \
sed -n -e "$2 p" < $1 \
| sed -e 's/\(0x[0-9A-Fa-f]*\)[^0]*\(0x[0-9A-Fa-f]*\).*/\1 \2/' \
| sort | ${AWKPROG}
elif [ "$3" = "UNICODE" ] ; then
@ -117,25 +116,25 @@ elif [ "$3" = "UNICODE" ] ; then
# YYYY XX
# We perform reverse sort to prefer the first one in the
# duplicated mappings (e.g. 0x20->U+0020, 0x20->U+00A0).
zcat $1 | sed -n -e "$2 p" \
sed -n -e "$2 p" < $1 \
| sed -e 's/\([0-9A-F]*\)[^0-9A-F]*\([0-9A-F]*\).*/0x\2 0x\1/' \
| sort -r
elif [ "$3" = "UNICODE2" ] ; then
# Source format is:
# 0xXXXX 0xYYYY # ...
zcat $1 | sed -n -e "$2 p" \
sed -n -e "$2 p" < $1 \
| sed -e 's/\([0-9A-Fx]*\)[^0]*\([0-9A-Fx]*\).*/\1 \2/' \
| ${AWKPROG} | sort -n -k 4,4
elif [ "$3" = "YASUOKA" ] ; then
# Source format is:
# YYYY 0-XXXX (XXXX is a Kuten code)
zcat $1 | sed -n -e "$2 p" \
sed -n -e "$2 p" < $1 \
| sed -e 's/\([0-9A-F]*\)[^0]*0-\([0-9]*\).*/0x\2 0x\1/' \
| sort | ${AWKPROG}
elif [ "$3" = "KANJI-DATABASE" ] ; then
# Source format is:
# C?-XXXX U+YYYYY .....
zcat $1 | sed -n -e "$2 p" \
sed -n -e "$2 p" < $1 \
| sed -e 's/...\(....\) U+\([0-9A-F]*\).*/0x\1 0x\2/' \
| sort | ${AWKPROG}
else

2
admin/charsets/mapfiles/MULE-ethiopic.map
View file

@ -1,4 +1,4 @@
# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3.
0x2121 0x1200
0x2122 0x1201
0x2123 0x1202

2
admin/charsets/mapfiles/MULE-ipa.map
View file

@ -1,4 +1,4 @@
# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3.
0x20 0x0069
0x21 0x026A
0x22 0x0065

2
admin/charsets/mapfiles/MULE-is13194.map
View file

@ -1,4 +1,4 @@
# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3.
0x21 0x0901
0x22 0x0902
0x23 0x0903

2
admin/charsets/mapfiles/MULE-lviscii.map
View file

@ -1,4 +1,4 @@
# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3.
0x21 0x1EAF
0x22 0x1EB1
0x23 0x1EB7

2
admin/charsets/mapfiles/MULE-sisheng.map
View file

@ -1,4 +1,4 @@
# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3.
0x21 0x0101
0x22 0x00E1
0x23 0x01CE

2
admin/charsets/mapfiles/MULE-tibetan.map
View file

@ -1,4 +1,4 @@
# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3.
0x2130 0x0F00
0x2131 0x0F01
0x2132 0x0F02

2
admin/charsets/mapfiles/MULE-uviscii.map
View file

@ -1,4 +1,4 @@
# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3.
0x21 0x1EAE
0x22 0x1EB0
0x23 0x1EB6

4
admin/grammars/README
View file

@ -3,8 +3,8 @@ generate the parser data in the lisp/semantic/bovine/ and
lisp/semantic/wisent/ directories. You can run the parser generators
with
emacs -batch -Q -l bovine-grammar.el -f bovine-make-parsers
emacs -batch -Q -l wisent-grammar.el -f wisent-make-parsers
emacs -batch -Q -l semantic/bovine/grammar -f bovine-make-parsers
emacs -batch -Q -l semantic/wisent/grammar -f wisent-make-parsers
Currently, the parser files in lisp/ are not generated directly from
these grammar files when making Emacs. This state of affairs, and the

2
admin/grammars/srecode-template.wy
View file

@ -212,7 +212,7 @@ section-dictionary
;
dictionary-entry-list
: ;; emtpy
: ;; empty
()
| dictionary-entry-list dictionary-entry
(append $1 $2)

29
admin/notes/bugtracker
View file

@ -270,32 +270,35 @@ to a bug. There are two differences between normal tags and user tags:
1) Anyone can define any valid usertag they like. In contrast, only a
limited, predefined set of normal tags are available (see above).
2) A usertag is associated with a specific email address.
2) A usertag is associated with a specific user. This is normally
an email address (with an "@" sign and least 4 characters after the "@"),
but on debbugs.gnu.org, the definition is less strict - anything with
5 or more alphanumeric characters will work. For personal tags,
using an email address is still recommended. Please only use the
"emacs" user, or other short users, for "official" tags.
You set usertags in the same way as tags, by talking to the control
server. One difference is that you can also specify the associated
email address. If you don't explicitly specify an address, then it
will use the one from which you send the control message. The address
must have the form of an email address (with an "@" sign and least 4
characters after the "@").
You set usertags in the same way as tags, by talking to the control server.
One difference is that you can also specify the associated user.
If you don't explicitly specify a user, then it will use the email
address from which you send the control message.
*** Setting usertags
a) In a control message:
user bug-gnu-emacs@gnu.org
user emacs # or email@example.com
usertags 1234 any-tag-you-like
This will add a usertag "any-tag-you-like" to bug 1234. The tag will
be associated with the address "bug-gnu-emacs@gnu.org". If you omit
the first line, the tag will be associated with your email address.
be associated with the user "emacs". If you omit the first line,
the tag will be associated with your email address.
The syntax of the usertags command is the same as that of tags (eg wrt
the optional [=+-] argument).
b) In an initial submission, in the pseudo-header:
User: bug-gnu-emacs@gnu.org
User: emacs
Usertags: a-new-tag
Again, the "User" is optional.
@ -312,7 +315,7 @@ http://debbugs.gnu.org/cgi/pkgindex.cgi?indexon=users
**** To find all bugs usertagged by a given email address:
http://debbugs.gnu.org/cgi/pkgreport.cgi?users=bug-gnu-emacs@gnu.org
http://debbugs.gnu.org/cgi/pkgreport.cgi?users=emacs
(Supposedly, the "users" field can be a comma-separated list of more
than one email address, but it does not seem to work for me.)
@ -322,7 +325,7 @@ than one email address, but it does not seem to work for me.)
This works just like a normal tags search, but with the addition of a
"users" field. Eg:
http://debbugs.gnu.org/cgi/pkgreport.cgi?users=bug-gnu-emacs@gnu.org;tag=calendar
http://debbugs.gnu.org/cgi/pkgreport.cgi?users=emacs;tag=calendar
*** To merge bugs:
Eg when bad replies create a bunch of new bugs for the same report.

4
autogen/Makefile.in
View file

@ -683,6 +683,7 @@ REPLACE_PREAD = @REPLACE_PREAD@
REPLACE_PRINTF = @REPLACE_PRINTF@
REPLACE_PSELECT = @REPLACE_PSELECT@
REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@
REPLACE_PTSNAME = @REPLACE_PTSNAME@
REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
REPLACE_PUTENV = @REPLACE_PUTENV@
REPLACE_PWRITE = @REPLACE_PWRITE@
@ -752,6 +753,8 @@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
VERSION = @VERSION@
VMLIMIT_OBJ = @VMLIMIT_OBJ@
W32_LIBS = @W32_LIBS@
W32_OBJ = @W32_OBJ@
WARN_CFLAGS = @WARN_CFLAGS@
WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
WERROR_CFLAGS = @WERROR_CFLAGS@
@ -1633,6 +1636,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
-e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \
-e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \
-e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
-e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \
-e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \
-e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
-e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \

3
autogen/config.in
View file

@ -692,6 +692,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
Mac OS X. */
#undef HAVE_NS
/* Define to use native MS Windows GUI. */
#undef HAVE_NTGUI
/* Define to 1 if libotf has OTF_get_variation_glyphs. */
#undef HAVE_OTF_GET_VARIATION_GLYPHS

303
autogen/configure vendored
View file

@ -909,6 +909,7 @@ REPLACE_REALLOC
REPLACE_RANDOM_R
REPLACE_PUTENV
REPLACE_PTSNAME_R
REPLACE_PTSNAME
REPLACE_MKSTEMP
REPLACE_MBTOWC
REPLACE_MALLOC
@ -1203,6 +1204,8 @@ LIB_PTHREAD
VMLIMIT_OBJ
GMALLOC_OBJ
HAVE_XSERVER
W32_LIBS
W32_OBJ
LIB_STANDARD
NS_OBJC_OBJ
NS_OBJ
@ -1361,6 +1364,7 @@ with_toolkit_scroll_bars
with_xaw3d
with_xim
with_ns
with_w32
with_gpm
with_dbus
with_gconf
@ -2080,6 +2084,7 @@ Optional Packages:
--without-xaw3d don't use Xaw3d
--without-xim don't use X11 XIM
--with-ns use NeXTstep (Cocoa or GNUstep) windowing system
--with-w32 use native MS Windows GUI
--without-gpm don't use -lgpm for mouse support on a GNU/Linux
console
--without-dbus don't compile with D-Bus support
@ -4092,6 +4097,14 @@ else
fi
# Check whether --with-w32 was given.
if test "${with_w32+set}" = set; then :
withval=$with_w32;
else
with_w32=no
fi
# Check whether --with-gpm was given.
if test "${with_gpm+set}" = set; then :
@ -7295,8 +7308,41 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_nomfi_needed" >&5
$as_echo "$gl_cv_cc_nomfi_needed" >&6; }
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wuninitialized is supported" >&5
$as_echo_n "checking whether -Wuninitialized is supported... " >&6; }
if test "${gl_cv_cc_uninitialized_supported+set}" = set; then :
$as_echo_n "(cached) " >&6
else
gl_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -Werror -Wuninitialized"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
main ()
{
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
gl_cv_cc_uninitialized_supported=yes
else
gl_cv_cc_uninitialized_supported=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$gl_save_CFLAGS"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_uninitialized_supported" >&5
$as_echo "$gl_cv_cc_uninitialized_supported" >&6; }
fi
# List all gcc warning categories.
gl_manywarn_set=
for gl_manywarn_item in \
-W \
@ -7415,11 +7461,15 @@ $as_echo "$gl_cv_cc_nomfi_needed" >&6; }
gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item"
done
# Disable the missing-field-initializers warning if needed
# Disable specific options as needed.
if test "$gl_cv_cc_nomfi_needed" = yes; then
gl_manywarn_set="$gl_manywarn_set -Wno-missing-field-initializers"
fi
if test "$gl_cv_cc_uninitialized_supported" = no; then
gl_manywarn_set="$gl_manywarn_set -Wno-uninitialized"
fi
ws=$gl_manywarn_set
@ -8776,7 +8826,9 @@ $as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
fi
ac_fn_c_check_decl "$LINENO" "sys_siglist" "ac_cv_have_decl_sys_siglist" "$ac_includes_default"
ac_fn_c_check_decl "$LINENO" "sys_siglist" "ac_cv_have_decl_sys_siglist" "#include <signal.h>
"
if test "x$ac_cv_have_decl_sys_siglist" = x""yes; then :
ac_have_decl=1
else
@ -8789,7 +8841,9 @@ _ACEOF
if test $ac_cv_have_decl_sys_siglist != yes; then
# For Tru64, at least:
ac_fn_c_check_decl "$LINENO" "__sys_siglist" "ac_cv_have_decl___sys_siglist" "$ac_includes_default"
ac_fn_c_check_decl "$LINENO" "__sys_siglist" "ac_cv_have_decl___sys_siglist" "#include <signal.h>
"
if test "x$ac_cv_have_decl___sys_siglist" = x""yes; then :
ac_have_decl=1
else
@ -9472,6 +9526,32 @@ else
fi
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <AppKit/AppKit.h>
int
main ()
{
#ifdef MAC_OS_X_VERSION_MAX_ALLOWED
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040
; /* OK */
#else
#error "OSX 10.4 or newer required"
#endif
#endif
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
ns_osx_have_104=yes
else
ns_osx_have_104=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <Foundation/NSObjCRuntime.h>
@ -9489,6 +9569,9 @@ else
ns_have_nsinteger=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ns_osx_have_104 = no; then
as_fn_error "\`OSX 10.4 or newer is required'" "$LINENO" 5;
fi
if test $ns_have_nsinteger = yes; then
$as_echo "#define NS_HAVE_NSINTEGER 1" >>confdefs.h
@ -9497,6 +9580,7 @@ $as_echo "#define NS_HAVE_NSINTEGER 1" >>confdefs.h
fi
INSTALL_ARCH_INDEP_EXTRA=install-etc
ns_self_contained=no
NS_OBJ=
@ -9532,6 +9616,38 @@ CPPFLAGS="$tmp_CPPFLAGS"
HAVE_W32=no
W32_OBJ=
W32_LIBS=
if test "${with_w32}" != no; then
if test "${opsys}" != "cygwin"; then
as_fn_error "Using w32 with an autotools build is only supported for Cygwin." "$LINENO" 5
fi
ac_fn_c_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default"
if test "x$ac_cv_header_windows_h" = x""yes; then :
HAVE_W32=yes
else
as_fn_error "\`--with-w32' was specified, but windows.h
cannot be found." "$LINENO" 5
fi
$as_echo "#define HAVE_NTGUI 1" >>confdefs.h
W32_OBJ="w32fns.o w32menu.o w32reg.o w32font.o w32term.o"
W32_OBJ="$W32_OBJ w32xfns.o w32select.o w32uniscribe.o"
W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32"
W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool"
fi
if test "${HAVE_W32}" = "yes"; then
window_system=w32
with_xft=no
fi
## $window_system is now set to the window system we will
## ultimately use.
@ -9564,6 +9680,9 @@ case "${window_system}" in
nextstep )
term_header=nsterm.h
;;
w32 )
term_header=w32term.h
;;
esac
if test -n "${term_header}"; then
@ -11629,6 +11748,10 @@ if test "${with_toolkit_scroll_bars}" != "no"; then
elif test "${HAVE_NS}" = "yes"; then
$as_echo "#define USE_TOOLKIT_SCROLL_BARS 1" >>confdefs.h
USE_TOOLKIT_SCROLL_BARS=yes
elif test "${HAVE_W32}" = "yes"; then
$as_echo "#define USE_TOOLKIT_SCROLL_BARS 1" >>confdefs.h
USE_TOOLKIT_SCROLL_BARS=yes
fi
fi
@ -12191,6 +12314,99 @@ fi
### Use -lXpm if available, unless `--with-xpm=no'.
HAVE_XPM=no
LIBXPM=
if test "${HAVE_W32}" = "yes"; then
if test "${with_xpm}" != "no"; then
SAVE_CPPFLAGS="$CPPFLAGS"
SAVE_LDFLAGS="$LDFLAGS"
CPPFLAGS="$CPPFLAGS -I/usr/include/noX"
LDFLAGS="$LDFLAGS -L/usr/lib/noX"
ac_fn_c_check_header_mongrel "$LINENO" "X11/xpm.h" "ac_cv_header_X11_xpm_h" "$ac_includes_default"
if test "x$ac_cv_header_X11_xpm_h" = x""yes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpmReadFileToImage in -lXpm" >&5
$as_echo_n "checking for XpmReadFileToImage in -lXpm... " >&6; }
if test "${ac_cv_lib_Xpm_XpmReadFileToImage+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXpm $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char XpmReadFileToImage ();
int
main ()
{
return XpmReadFileToImage ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_Xpm_XpmReadFileToImage=yes
else
ac_cv_lib_Xpm_XpmReadFileToImage=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xpm_XpmReadFileToImage" >&5
$as_echo "$ac_cv_lib_Xpm_XpmReadFileToImage" >&6; }
if test "x$ac_cv_lib_Xpm_XpmReadFileToImage" = x""yes; then :
HAVE_XPM=yes
fi
fi
if test "${HAVE_XPM}" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpmReturnAllocPixels preprocessor define" >&5
$as_echo_n "checking for XpmReturnAllocPixels preprocessor define... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include "X11/xpm.h"
#ifndef XpmReturnAllocPixels
no_return_alloc_pixels
#endif
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "no_return_alloc_pixels" >/dev/null 2>&1; then :
HAVE_XPM=no
else
HAVE_XPM=yes
fi
rm -f conftest*
if test "${HAVE_XPM}" = "yes"; then
REAL_CPPFLAGS="$REAL_CPPFLAGS -I/usr/include/noX"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
CPPFLAGS="$SAVE_CPPFLAGS"
LDFLAGS="$SAVE_LDFLAGS"
fi
fi
fi
if test "${HAVE_XPM}" = "yes"; then
$as_echo "#define HAVE_XPM 1" >>confdefs.h
LIBXPM=-lXpm
fi
fi
if test "${HAVE_X11}" = "yes"; then
if test "${with_xpm}" != "no"; then
ac_fn_c_check_header_mongrel "$LINENO" "X11/xpm.h" "ac_cv_header_X11_xpm_h" "$ac_includes_default"
@ -12277,10 +12493,11 @@ $as_echo "#define HAVE_XPM 1" >>confdefs.h
fi
### Use -ljpeg if available, unless `--with-jpeg=no'.
HAVE_JPEG=no
LIBJPEG=
if test "${HAVE_X11}" = "yes"; then
if test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then
if test "${with_jpeg}" != "no"; then
ac_fn_c_check_header_mongrel "$LINENO" "jerror.h" "ac_cv_header_jerror_h" "$ac_includes_default"
if test "x$ac_cv_header_jerror_h" = x""yes; then :
@ -12359,7 +12576,7 @@ fi
### Use -lpng if available, unless `--with-png=no'.
HAVE_PNG=no
LIBPNG=
if test "${HAVE_X11}" = "yes"; then
if test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then
if test "${with_png}" != "no"; then
# Debian unstable as of July 2003 has multiple libpngs, and puts png.h
# in /usr/include/libpng.
@ -12449,7 +12666,7 @@ fi
### Use -ltiff if available, unless `--with-tiff=no'.
HAVE_TIFF=no
LIBTIFF=
if test "${HAVE_X11}" = "yes"; then
if test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then
if test "${with_tiff}" != "no"; then
ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default"
if test "x$ac_cv_header_tiffio_h" = x""yes; then :
@ -12513,7 +12730,8 @@ fi
### Use -lgif or -lungif if available, unless `--with-gif=no'.
HAVE_GIF=no
LIBGIF=
if test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no"; then
if test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no" \
|| test "${HAVE_W32}" = "yes"; then
ac_fn_c_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default"
if test "x$ac_cv_header_gif_lib_h" = x""yes; then :
# EGifPutExtensionLast only exists from version libungif-4.1.0b1.
@ -12734,6 +12952,9 @@ $as_echo "#define NS_IMPL_GNUSTEP 1" >>confdefs.h
OTHER_FILES=ns-app
fi
if test "${HAVE_W32}" = "yes"; then
HAVE_MENUS=yes
fi
### Use session management (-lSM -lICE) if available
HAVE_X_SM=no
@ -16007,7 +16228,7 @@ fi
if test "$opsys" = "cygwin"; then
CYGWIN_OBJ="sheap.o"
CYGWIN_OBJ="sheap.o cygw32.o"
## Cygwin differs because of its unexec().
PRE_ALLOC_OBJ=
POST_ALLOC_OBJ=lastfile.o
@ -16842,6 +17063,7 @@ _ACEOF
REPLACE_MALLOC=0;
REPLACE_MBTOWC=0;
REPLACE_MKSTEMP=0;
REPLACE_PTSNAME=0;
REPLACE_PTSNAME_R=0;
REPLACE_PUTENV=0;
REPLACE_RANDOM_R=0;
@ -21625,6 +21847,69 @@ rm -f core conftest.err conftest.$ac_objext \
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sig_pselect" >&5
$as_echo "$gl_cv_sig_pselect" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pselect detects invalid fds" >&5
$as_echo_n "checking whether pselect detects invalid fds... " >&6; }
if test "${gl_cv_func_pselect_detects_ebadf+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
case "$host_os" in
# Guess yes on glibc systems.
*-gnu*) gl_cv_func_pselect_detects_ebadf="guessing yes" ;;
# If we don't know, assume the worst.
*) gl_cv_func_pselect_detects_ebadf="guessing no" ;;
esac
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/time.h>
#if HAVE_SYS_SELECT_H
# include <sys/select.h>
#endif
#include <unistd.h>
#include <errno.h>
int
main ()
{
fd_set set;
dup2(0, 16);
FD_ZERO(&set);
FD_SET(16, &set);
close(16);
struct timespec timeout;
timeout.tv_sec = 0;
timeout.tv_nsec = 5000;
return pselect (17, &set, NULL, NULL, &timeout, NULL) != -1 || errno != EBADF;
;
return 0;
}
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
gl_cv_func_pselect_detects_ebadf=yes
else
gl_cv_func_pselect_detects_ebadf=no
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_pselect_detects_ebadf" >&5
$as_echo "$gl_cv_func_pselect_detects_ebadf" >&6; }
case $gl_cv_func_pselect_detects_ebadf in
*yes) ;;
*) REPLACE_PSELECT=1 ;;
esac
fi
if test $ac_cv_func_pselect = no || test $gl_cv_sig_pselect = no; then
@ -23436,6 +23721,8 @@ done
if test $gl_cv_have_include_next = yes; then

105
configure.ac
View file

@ -177,6 +177,7 @@ OPTION_DEFAULT_ON([toolkit-scroll-bars],[don't use Motif or Xaw3d scroll bars])
OPTION_DEFAULT_ON([xaw3d],[don't use Xaw3d])
OPTION_DEFAULT_ON([xim],[don't use X11 XIM])
OPTION_DEFAULT_OFF([ns],[use NeXTstep (Cocoa or GNUstep) windowing system])
OPTION_DEFAULT_OFF([w32], [use native MS Windows GUI])
OPTION_DEFAULT_ON([gpm],[don't use -lgpm for mouse support on a GNU/Linux console])
OPTION_DEFAULT_ON([dbus],[don't compile with D-Bus support])
@ -577,6 +578,7 @@ fi
AC_DEFUN([gl_THREADLIB])
# Initialize gnulib right after choosing the compiler.
dnl Amongst other things, this sets AR and ARFLAGS.
gl_EARLY
# It's helpful to have C macros available to GDB, so prefer -g3 to -g
@ -1285,10 +1287,12 @@ dnl On Solaris 8 there's a compilation warning for term.h because
dnl it doesn't define `bool'.
AC_CHECK_HEADERS(term.h, , , -)
AC_HEADER_TIME
AC_CHECK_DECLS([sys_siglist])
AC_CHECK_DECLS([sys_siglist], [], [], [[#include <signal.h>
]])
if test $ac_cv_have_decl_sys_siglist != yes; then
# For Tru64, at least:
AC_CHECK_DECLS([__sys_siglist])
AC_CHECK_DECLS([__sys_siglist], [], [], [[#include <signal.h>
]])
if test $ac_cv_have_decl___sys_siglist = yes; then
AC_DEFINE(sys_siglist, __sys_siglist,
[Define to any substitute for sys_siglist.])
@ -1509,14 +1513,31 @@ fail;
AC_CHECK_HEADER([AppKit/AppKit.h], [HAVE_NS=yes],
[AC_MSG_ERROR([`--with-ns' was specified, but the include
files are missing or cannot be compiled.])])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <AppKit/AppKit.h>],
[
#ifdef MAC_OS_X_VERSION_MAX_ALLOWED
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040
; /* OK */
#else
#error "OSX 10.4 or newer required"
#endif
#endif
])],
ns_osx_have_104=yes,
ns_osx_have_104=no)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <Foundation/NSObjCRuntime.h>],
[NSInteger i;])],
ns_have_nsinteger=yes,
ns_have_nsinteger=no)
if test $ns_osx_have_104 = no; then
AC_MSG_ERROR([`OSX 10.4 or newer is required']);
fi
if test $ns_have_nsinteger = yes; then
AC_DEFINE(NS_HAVE_NSINTEGER, 1, [Define to 1 if `NSInteger' is defined.])
fi
fi
AC_SUBST(TEMACS_LDFLAGS2)
INSTALL_ARCH_INDEP_EXTRA=install-etc
@ -1557,6 +1578,30 @@ AC_SUBST(NS_OBJ)
AC_SUBST(NS_OBJC_OBJ)
AC_SUBST(LIB_STANDARD)
HAVE_W32=no
W32_OBJ=
W32_LIBS=
if test "${with_w32}" != no; then
if test "${opsys}" != "cygwin"; then
AC_MSG_ERROR([Using w32 with an autotools build is only supported for Cygwin.])
fi
AC_CHECK_HEADER([windows.h], [HAVE_W32=yes],
[AC_MSG_ERROR([`--with-w32' was specified, but windows.h
cannot be found.])])
AC_DEFINE(HAVE_NTGUI, 1, [Define to use native MS Windows GUI.])
W32_OBJ="w32fns.o w32menu.o w32reg.o w32font.o w32term.o"
W32_OBJ="$W32_OBJ w32xfns.o w32select.o w32uniscribe.o"
W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32"
W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool"
fi
AC_SUBST(W32_OBJ)
AC_SUBST(W32_LIBS)
if test "${HAVE_W32}" = "yes"; then
window_system=w32
with_xft=no
fi
## $window_system is now set to the window system we will
## ultimately use.
@ -1593,6 +1638,9 @@ dnl use the toolkit if we have gtk, or X11R5 or newer.
nextstep )
term_header=nsterm.h
;;
w32 )
term_header=w32term.h
;;
esac
if test -n "${term_header}"; then
@ -2352,6 +2400,9 @@ if test "${with_toolkit_scroll_bars}" != "no"; then
elif test "${HAVE_NS}" = "yes"; then
AC_DEFINE(USE_TOOLKIT_SCROLL_BARS)
USE_TOOLKIT_SCROLL_BARS=yes
elif test "${HAVE_W32}" = "yes"; then
AC_DEFINE(USE_TOOLKIT_SCROLL_BARS)
USE_TOOLKIT_SCROLL_BARS=yes
fi
fi
@ -2518,6 +2569,41 @@ AC_SUBST(M17N_FLT_LIBS)
### Use -lXpm if available, unless `--with-xpm=no'.
HAVE_XPM=no
LIBXPM=
if test "${HAVE_W32}" = "yes"; then
if test "${with_xpm}" != "no"; then
SAVE_CPPFLAGS="$CPPFLAGS"
SAVE_LDFLAGS="$LDFLAGS"
CPPFLAGS="$CPPFLAGS -I/usr/include/noX"
LDFLAGS="$LDFLAGS -L/usr/lib/noX"
AC_CHECK_HEADER(X11/xpm.h,
[AC_CHECK_LIB(Xpm, XpmReadFileToImage, HAVE_XPM=yes)])
if test "${HAVE_XPM}" = "yes"; then
AC_MSG_CHECKING(for XpmReturnAllocPixels preprocessor define)
AC_EGREP_CPP(no_return_alloc_pixels,
[#include "X11/xpm.h"
#ifndef XpmReturnAllocPixels
no_return_alloc_pixels
#endif
], HAVE_XPM=no, HAVE_XPM=yes)
if test "${HAVE_XPM}" = "yes"; then
REAL_CPPFLAGS="$REAL_CPPFLAGS -I/usr/include/noX"
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
CPPFLAGS="$SAVE_CPPFLAGS"
LDFLAGS="$SAVE_LDFLAGS"
fi
fi
fi
if test "${HAVE_XPM}" = "yes"; then
AC_DEFINE(HAVE_XPM, 1, [Define to 1 if you have the Xpm libary (-lXpm).])
LIBXPM=-lXpm
fi
fi
if test "${HAVE_X11}" = "yes"; then
if test "${with_xpm}" != "no"; then
AC_CHECK_HEADER(X11/xpm.h,
@ -2544,12 +2630,13 @@ no_return_alloc_pixels
LIBXPM=-lXpm
fi
fi
AC_SUBST(LIBXPM)
### Use -ljpeg if available, unless `--with-jpeg=no'.
HAVE_JPEG=no
LIBJPEG=
if test "${HAVE_X11}" = "yes"; then
if test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then
if test "${with_jpeg}" != "no"; then
dnl Checking for jpeglib.h can lose because of a redefinition of
dnl HAVE_STDLIB_H.
@ -2577,7 +2664,7 @@ AC_SUBST(LIBJPEG)
### Use -lpng if available, unless `--with-png=no'.
HAVE_PNG=no
LIBPNG=
if test "${HAVE_X11}" = "yes"; then
if test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then
if test "${with_png}" != "no"; then
# Debian unstable as of July 2003 has multiple libpngs, and puts png.h
# in /usr/include/libpng.
@ -2610,7 +2697,7 @@ AC_SUBST(LIBPNG)
### Use -ltiff if available, unless `--with-tiff=no'.
HAVE_TIFF=no
LIBTIFF=
if test "${HAVE_X11}" = "yes"; then
if test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then
if test "${with_tiff}" != "no"; then
AC_CHECK_HEADER(tiffio.h,
[tifflibs="-lz -lm"
@ -2630,7 +2717,8 @@ AC_SUBST(LIBTIFF)
### Use -lgif or -lungif if available, unless `--with-gif=no'.
HAVE_GIF=no
LIBGIF=
if test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no"; then
if test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no" \
|| test "${HAVE_W32}" = "yes"; then
AC_CHECK_HEADER(gif_lib.h,
# EGifPutExtensionLast only exists from version libungif-4.1.0b1.
# Earlier versions can crash Emacs.
@ -2712,6 +2800,9 @@ if test "${HAVE_NS}" = "yes"; then
OTHER_FILES=ns-app
fi
if test "${HAVE_W32}" = "yes"; then
HAVE_MENUS=yes
fi
### Use session management (-lSM -lICE) if available
HAVE_X_SM=no
@ -4247,7 +4338,7 @@ fi
AC_SUBST(RALLOC_OBJ)
if test "$opsys" = "cygwin"; then
CYGWIN_OBJ="sheap.o"
CYGWIN_OBJ="sheap.o cygw32.o"
## Cygwin differs because of its unexec().
PRE_ALLOC_OBJ=
POST_ALLOC_OBJ=lastfile.o

49
doc/emacs/ChangeLog
View file

@ -1,3 +1,46 @@
2012-10-18 Dani Moncayo <dmoncayo@gmail.com>
* mini.texi (Completion Options): Fix off-by-one error. (Bug#12644)
2012-10-17 Glenn Morris <rgm@gnu.org>
* mini.texi (Repetition): Further copyedit.
2012-10-17 Dani Moncayo <dmoncayo@gmail.com>
* mini.texi (Repetition): Copyedit.
2012-10-16 Juri Linkov <juri@jurta.org>
* search.texi (Query Replace): Document multi-buffer replacement
keys. (Bug#12655)
* maintaining.texi (Tags Search): Change link "Replace" to
"Query Replace".
2012-10-13 Chong Yidong <cyd@gnu.org>
* files.texi (File Conveniences): ImageMagick enabled by default.
2012-10-10 Dani Moncayo <dmoncayo@gmail.com>
* basic.texi (Arguments): Fix typos.
2012-10-08 Glenn Morris <rgm@gnu.org>
* cal-xtra.texi (Calendar Customizing): Mention calendar-month-header.
* calendar.texi (Writing Calendar Files): Mention cal-html-holidays.
2012-10-06 Glenn Morris <rgm@gnu.org>
* calendar.texi (Writing Calendar Files): Tweak week descriptions.
Mention cal-tex-cursor-week2-summary.
2012-10-06 Chong Yidong <cyd@gnu.org>
* mini.texi (Passwords): Fix typo.
2012-10-02 Glenn Morris <rgm@gnu.org>
* maintaining.texi (VC Directory Commands):
@ -410,7 +453,7 @@
* misc.texi (emacsclient Options): Add cross-reference to "Windows
Startup". (Bug#11091)
2012-04-02 Dani Moncayo <dmoncayo@gmail.com> (tiny change)
2012-04-02 Dani Moncayo <dmoncayo@gmail.com>
* custom.texi (Changing a Variable): Fix example.
@ -443,7 +486,7 @@
* mule.texi (International Chars):
etc/HELLO is for character demonstration.
2012-03-15 Dani Moncayo <dmoncayo@gmail.com> (tiny change)
2012-03-15 Dani Moncayo <dmoncayo@gmail.com>
* dired.texi (Shell Commands in Dired): Fix typo.
@ -470,7 +513,7 @@
* macos.texi (Mac / GNUstep Customization): Remove text about
ns-find-file and ns-drag-file (Bug#5855, Bug#10050).
2012-02-25 Dani Moncayo <dmoncayo@gmail.com> (tiny change)
2012-02-25 Dani Moncayo <dmoncayo@gmail.com>
* buffers.texi (Select Buffer): Mention that saving in a new file
name can switch to a different major mode.

11
doc/emacs/basic.texi
View file

@ -757,7 +757,8 @@ the character @samp{1}.
value. For example, the command @kbd{M-q} (@code{fill-paragraph})
fills text; with an argument, it justifies the text as well.
(@xref{Filling}, for more information on @kbd{M-q}.) For these
commands, it is enough to the argument with a single @kbd{C-u}.
commands, it is enough to specify the argument with a single
@kbd{C-u}.
Some commands use the value of the argument as a repeat count, but
do something special when there is no argument. For example, the
@ -776,10 +777,10 @@ described when they come up; they exist to make an individual command
more convenient, and they are documented in that command's
documentation string.
We use the term ``prefix argument'' as well as ``numeric argument'',
to emphasize that you type these argument before the command, and to
distinguish them from minibuffer arguments that come after the
command.
We use the term @dfn{prefix argument} to emphasize that you type
such arguments before the command, and to distinguish them from
minibuffer arguments (@pxref{Minibuffer}), which are entered after
invoking the command.
@node Repeating
@section Repeating a Command

5
doc/emacs/cal-xtra.texi
View file

@ -41,6 +41,11 @@ To display text @emph{between} the months, for example week numbers,
customize the variables @code{calendar-intermonth-header} and
@code{calendar-intermonth-text} as described in their documentation.
@vindex calendar-month-header
The variable @code{calendar-month-header} controls the text that
appears above each month in the calendar. By default, it shows the
month and year.
@vindex calendar-holiday-marker
@vindex diary-entry-marker
@vindex calendar-today-marker

22
doc/emacs/calendar.texi
View file

@ -349,11 +349,12 @@ calendar deletes or iconifies that frame depending on the value of
@cindex calendar and HTML
The Calendar HTML commands produce files of HTML code that contain
calendar and diary entries. Each file applies to one month, and has a
name of the format @file{@var{yyyy}-@var{mm}.html}, where @var{yyyy} and
@var{mm} are the four-digit year and two-digit month, respectively. The
variable @code{cal-html-directory} specifies the default output
directory for the HTML files.
calendar, holiday, and diary entries. Each file applies to one month,
and has a name of the format @file{@var{yyyy}-@var{mm}.html}, where
@var{yyyy} and @var{mm} are the four-digit year and two-digit month,
respectively. The variable @code{cal-html-directory} specifies the
default output directory for the HTML files. To prevent holidays
from being shown, customize @code{cal-html-holidays}.
@vindex cal-html-css-default
Diary entries enclosed by @code{<} and @code{>} are interpreted as
@ -396,17 +397,20 @@ Generate a sideways-printing one-month calendar
Generate a one-day calendar
(@code{cal-tex-cursor-day}).
@item t w 1
Generate a one-page calendar for one week
Generate a one-page calendar for one week, with hours
(@code{cal-tex-cursor-week}).
@item t w 2
Generate a two-page calendar for one week
Generate a two-page calendar for one week, with hours
(@code{cal-tex-cursor-week2}).
@item t w 3
Generate an ISO-style calendar for one week
Generate an ISO-style calendar for one week, without hours
(@code{cal-tex-cursor-week-iso}).
@item t w 4
Generate a calendar for one Monday-starting week
Generate a calendar for one Monday-starting week, with hours
(@code{cal-tex-cursor-week-monday}).
@item t w W
Generate a two-page calendar for one week, without hours
(@code{cal-tex-cursor-week2-summary}).
@item t f w
Generate a Filofax-style two-weeks-at-a-glance calendar
(@code{cal-tex-cursor-filofax-2week}).

2
doc/emacs/display.texi
View file

@ -1065,7 +1065,7 @@ present.
Type @kbd{M-x delete-trailing-whitespace} to delete all trailing
whitespace. This command deletes all extra spaces at the end of each
line in the buffer, and all empty lines at the end of the buffer; to
ignore the latter, change the varaible @code{delete-trailing-lines} to
ignore the latter, change the variable @code{delete-trailing-lines} to
@code{nil}. If the region is active, the command instead deletes
extra spaces at the end of each line in the region.

25
doc/emacs/files.texi
View file

@ -1931,15 +1931,22 @@ non-@code{nil}. Currently, Emacs only supports animation in GIF
files.
@cindex ImageMagick support
If your Emacs was compiled with ImageMagick support, it is possible
to view a much wider variety of image types in Image mode, by
rendering the images via ImageMagick. However, this feature is
currently disabled by default. To enable it, add the following line
to your init file:
@example
(imagemagick-register-types)
@end example
@vindex imagemagick-enabled-types
@vindex imagemagick-types-inhibit
If Emacs was compiled with support for the ImageMagick library, it
can use ImageMagick to render a wide variety of images. The variable
@code{imagemagick-enabled-types} lists the image types that Emacs may
render using ImageMagick; each element in the list should be an
internal ImageMagick name for an image type, as a symbol or an
equivalent string (e.g.@: @code{BMP} for @file{.bmp} images). To
enable ImageMagick for all possible image types, change
@code{imagemagick-enabled-types} to @code{t}. The variable
@code{imagemagick-types-inhibit} lists the image types which should
never be rendered using ImageMagick, regardless of the value of
@code{imagemagick-enabled-types} (the default list includes types like
@code{C} and @code{HTML}, which ImageMagick can render as an ``image''
but Emacs should not). To disable ImageMagick entirely, change
@code{imagemagick-types-inhibit} to @code{t}.
@findex thumbs-mode
@findex mode, thumbs

2
doc/emacs/maintaining.texi
View file

@ -2221,7 +2221,7 @@ the current buffer, followed by the remaining files of the tags table.
reads a regexp to search for and a string to replace with, just like
ordinary @kbd{M-x query-replace-regexp}. It searches much like @kbd{M-x
tags-search}, but repeatedly, processing matches according to your
input. @xref{Replace}, for more information on query replace.
input. @xref{Query Replace}, for more information on query replace.
@vindex tags-case-fold-search
@cindex case-sensitivity and tags search

8
doc/emacs/mini.texi
View file

@ -550,7 +550,7 @@ those completion alternatives; each subsequent invocation of the
completion command replaces that with the next completion alternative,
in a cyclic manner. If you give @code{completion-cycle-threshold} a
numeric value @var{n}, completion commands switch to this cycling
behavior only when there are fewer than @var{n} alternatives.
behavior only when there are @var{n} or fewer alternatives.
@cindex Icomplete mode
@findex icomplete-mode
@ -683,13 +683,13 @@ the text for that expression. Even if you don't know Lisp, it will
probably be obvious which command is displayed for repetition. If you
type just @key{RET}, that repeats the command unchanged. You can also
change the command by editing the Lisp expression before you execute
it. The repeated command is added to the front of the command history
it. The executed command is added to the front of the command history
unless it is identical to the most recent item.
Once inside the minibuffer for @kbd{C-x @key{ESC} @key{ESC}}, you
can use the usual minibuffer history commands (@pxref{Minibuffer
History}) to move through the history list. After finding the desired
previous command, you can edit its expression as usual and then repeat
previous command, you can edit its expression as usual and then execute
it by typing @key{RET}.
@vindex isearch-resume-in-command-history
@ -727,7 +727,7 @@ completion, and you cannot change windows or perform any other action
with Emacs until you have submitted the password.
While you are typing the password, you may press @key{DEL} to delete
backwards, removing the last character entered. @key{C-u} deletes
backwards, removing the last character entered. @kbd{C-u} deletes
everything you have typed so far. @kbd{C-g} quits the password prompt
(@pxref{Quitting}). @kbd{C-y} inserts the current kill into the
password (@pxref{Killing}). You may type either @key{RET} or

13
doc/emacs/search.texi
View file

@ -1239,6 +1239,19 @@ occurrences.
@item !
to replace all remaining occurrences without asking again.
@item Y @r{(Upper-case)}
to replace all remaining occurrences in all remaining buffers in
multi-buffer replacements (like the Dired `Q' command which performs
query replace on selected files). It answers this question and all
subsequent questions in the series with "yes", without further
user interaction.
@item N @r{(Upper-case)}
to skip to the next buffer in multi-buffer replacements without
replacing remaining occurrences in the current buffer. It answers
this question "no", gives up on the questions for the current buffer,
and continues to the next buffer in the sequence.
@item ^
to go back to the position of the previous occurrence (or what used to
be an occurrence), in case you changed it by mistake or want to

5
doc/lispintro/ChangeLog
View file

@ -1,3 +1,8 @@
2012-10-17 Gregor Zattler <grfz@gmx.de> (tiny change)
* emacs-lisp-intro.texi (Narrowing advantages):
Minor update for changed what-line implementation. (Bug#12629)
2012-06-21 Glenn Morris <rgm@gnu.org>
* Makefile.in: Rename infodir to buildinfodir throughout. (Bug#11737)

4
doc/lispintro/emacs-lisp-intro.texi
View file

@ -6600,8 +6600,8 @@ buffer; or conversely, an Emacs Lisp function needs to work on all of a
buffer that has been narrowed. The @code{what-line} function, for
example, removes the narrowing from a buffer, if it has any narrowing
and when it has finished its job, restores the narrowing to what it was.
On the other hand, the @code{count-lines} function, which is called by
@code{what-line}, uses narrowing to restrict itself to just that portion
On the other hand, the @code{count-lines} function
uses narrowing to restrict itself to just that portion
of the buffer in which it is interested and then restores the previous
situation.

28
doc/lispref/ChangeLog
View file

@ -1,3 +1,27 @@
2012-10-15 Chong Yidong <cyd@gnu.org>
* macros.texi (Defining Macros): defmacro is now a macro.
Explicitly list the docstring and declare arguments.
* functions.texi (Anonymous Functions): Explicitly list the
docstring, declare, and interactive arguments to lambda.
(Defining Functions): Likewise for defun.
(Inline Functions): Likewise for defsubst.
(Declare Form): Tweak description.
2012-10-13 Chong Yidong <cyd@gnu.org>
* display.texi (ImageMagick Images): ImageMagick enabled by default.
2012-10-05 Chong Yidong <cyd@gnu.org>
* minibuf.texi (Basic Completion): Clarify list form of completion
table (Bug#12564).
2012-10-05 Bruno Félix Rezende Ribeiro <oitofelix@gmail.com> (tiny change)
* functions.texi (Function Safety): Copyedit. (Bug#12562)
2012-10-01 Paul Eggert <eggert@cs.ucla.edu>
Revert the FOLLOW-SYMLINKS change for file-attributes.
@ -1969,7 +1993,7 @@
* numbers.texi (Integer Basics): Add indexing for
most-positive-fixnum and most-negative-fixnum. (Bug#9525)
2011-09-14 Dani Moncayo <dmoncayo@gmail.com> (tiny change)
2011-09-14 Dani Moncayo <dmoncayo@gmail.com>
* lists.texi (Sets And Lists): Fix typo. (Bug#9393)
@ -1978,7 +2002,7 @@
* processes.texi (Network Servers): Clarify what the process
buffer is used for (bug#9233).
2011-08-30 Dani Moncayo <dmoncayo@gmail.com> (tiny change)
2011-08-30 Dani Moncayo <dmoncayo@gmail.com>
* lists.texi (Building Lists): Fix typo.

2
doc/lispref/commands.texi
View file

@ -1952,7 +1952,7 @@ position such events have.
@defun posnp object
This function returns non-@code{nil} if @var{object} is a mouse
oposition list, in either of the formats documented in @ref{Click
position list, in either of the formats documented in @ref{Click
Events}); and @code{nil} otherwise.
@end defun

60
doc/lispref/display.texi
View file

@ -4579,56 +4579,34 @@ specifying the bounding box of the PostScript image, analogous to the
@cindex images, support for more formats
If you build Emacs with ImageMagick support, you can use the
ImageMagick library to load many image formats. The image type symbol
ImageMagick library to load many image formats (@pxref{File
Conveniences,,, emacs, The GNU Emacs Manual}). The image type symbol
for images loaded via ImageMagick is @code{imagemagick}, regardless of
the actual underlying image format.
@defun imagemagick-types
This function returns a list of image file extensions supported by the
current ImageMagick installation.
current ImageMagick installation. Each list element is a symbol
representing an internal ImageMagick name for an image type, such as
@code{BMP} for @file{.bmp} images.
@end defun
By default, Emacs does not use ImageMagick to display images in
Image mode, e.g.@: when visiting such files with @kbd{C-x C-f}. This
feature is enabled by calling @code{imagemagick-register-types}.
@defun imagemagick-register-types
This function enables using Image mode to visit image files supported
by ImageMagick. @xref{File Conveniences,,, emacs, The GNU Emacs
Manual}. It also causes @code{create-image} and other helper
functions to associate such file names with the @code{imagemagick}
image type (@pxref{Defining Images}).
All image file extensions supported by ImageMagick are registered,
except those specified in @code{imagemagick-types-inhibit}. If Emacs
was not compiled with ImageMagick support, this function does nothing.
@end defun
@defopt imagemagick-types-inhibit
This variable specifies a list of image types that should @emph{not}
be registered by @code{imagemagick-register-types}. Each entry in
this list should be one of the symbols returned by
@code{imagemagick-types}. The default value lists several file types
that are considered ``images'' by ImageMagick, but which should not be
considered as images by Emacs, including C files and HTML files.
@defopt imagemagick-enabled-types
The value of this variable is a list of ImageMagick image types which
Emacs may attempt to render using ImageMagick. Each list element
should be one of the symbols in the list returned by
@code{imagemagick-types}, or an equivalent string. Alternatively, a
value of @code{t} enables ImageMagick for all possible image types.
Regardless of the value of this variable,
@code{imagemagick-types-inhibit} (see below) takes precedence.
@end defopt
@ignore
@c I don't know what this means. I suspect it means eg loading jpg
@c images via libjpeg or ImageMagick. But it doesn't work.
@c If you don't have libjpeg support compiled in, you cannot
@c view jpeg images, even if you have imagemagick support:
@c http://debbugs.gnu.org/9045
@c And if you have both compiled in, then you always get
@c the libjpeg version:
@c http://debbugs.gnu.org/10746
There may be overlap between image loaders in your Emacs installation,
and you may prefer to use a different one for a given image type
(which loader will be used in practice depends on the priority of the
loaders).
For example, if you never want to use the ImageMagick loader to view
JPEG files, add @code{JPG} to this list.
@end ignore
@defopt imagemagick-types-inhibit
The value of this variable lists the ImageMagick image types which
should never be rendered using ImageMagick, regardless of the value of
@code{imagemagick-enabled-types}. A value of @code{t} disables
ImageMagick entirely.
@end defopt
Images loaded with ImageMagick support the following additional
image descriptor properties:

4
doc/lispref/errors.texi
View file

@ -148,7 +148,7 @@ The message is @samp{No catch for tag}. @xref{Catch and Throw}.
@ignore
@c Not actually used for anything? Probably definition should be removed.
@item protected-field
The message is @samp{Attempt to modify a protected fiel.
The message is @samp{Attempt to modify a protected file}.
@end ignore
@item scan-error
@ -205,7 +205,7 @@ of @code{domain-error}.
The message is @code{Arithmetic range error}.
@item singularity-error
The mssage is @samp{Arithmetic singularity error}. This is a
The message is @samp{Arithmetic singularity error}. This is a
subcategory of @code{domain-error}.
@item underflow-error

83
doc/lispref/functions.texi
View file

@ -522,21 +522,20 @@ Scheme.)
is called @dfn{defining a function}, and it is done with the
@code{defun} special form.
@defmac defun name argument-list body-forms...
@defmac defun name args [doc] [declare] [interactive] body@dots{}
@code{defun} is the usual way to define new Lisp functions. It
defines the symbol @var{name} as a function that looks like this:
defines the symbol @var{name} as a function with argument list
@var{args} and body forms given by @var{body}. Neither @var{name} nor
@var{args} should be quoted.
@example
(lambda @var{argument-list} . @var{body-forms})
@end example
@var{doc}, if present, should be a string specifying the function's
documentation string (@pxref{Function Documentation}). @var{declare},
if present, should be a @code{declare} form specifying function
metadata (@pxref{Declare Form}). @var{interactive}, if present,
should be an @code{interactive} form specifying how the function is to
be called interactively (@pxref{Interactive Call}).
@code{defun} stores this lambda expression in the function cell of
@var{name}. Its return value is @emph{undefined}.
As described previously, @var{argument-list} is a list of argument
names and may include the keywords @code{&optional} and @code{&rest}.
Also, the first two of the @var{body-forms} may be a documentation
string and an interactive declaration. @xref{Lambda Components}.
The return value of @code{defun} is undefined.
Here are some examples:
@ -582,14 +581,14 @@ redefinition from unintentional redefinition.
@end defmac
@cindex function aliases
@defun defalias name definition &optional docstring
@defun defalias name definition &optional doc
@anchor{Definition of defalias}
This special form defines the symbol @var{name} as a function, with
definition @var{definition} (which can be any valid Lisp function).
Its return value is @emph{undefined}.
If @var{docstring} is non-@code{nil}, it becomes the function
documentation of @var{name}. Otherwise, any documentation provided by
If @var{doc} is non-@code{nil}, it becomes the function documentation
of @var{name}. Otherwise, any documentation provided by
@var{definition} is used.
The proper place to use @code{defalias} is where a specific function
@ -902,11 +901,14 @@ function, you can in principle use any method to construct the list.
But typically you should use the @code{lambda} macro, or the
@code{function} special form, or the @code{#'} read syntax:
@defmac lambda args body...
This macro returns an anonymous function with argument list @var{args}
and body forms given by @var{body}. In effect, this macro makes
@code{lambda} forms ``self-quoting'': evaluating a form whose @sc{car}
is @code{lambda} yields the form itself:
@defmac lambda args [doc] [interactive] body@dots{}
This macro returns an anonymous function with argument list
@var{args}, documentation string @var{doc} (if any), interactive spec
@var{interactive} (if any), and body forms given by @var{body}.
In effect, this macro makes @code{lambda} forms ``self-quoting'':
evaluating a form whose @sc{car} is @code{lambda} yields the form
itself:
@example
(lambda (x) (* x x))
@ -1169,13 +1171,13 @@ If provided, @var{when} should be a string indicating when the function
was first made obsolete---for example, a date or a release number.
@end defun
@defmac define-obsolete-function-alias obsolete-name current-name &optional when docstring
@defmac define-obsolete-function-alias obsolete-name current-name &optional when doc
This convenience macro marks the function @var{obsolete-name} obsolete
and also defines it as an alias for the function @var{current-name}.
It is equivalent to the following:
@example
(defalias @var{obsolete-name} @var{current-name} @var{docstring})
(defalias @var{obsolete-name} @var{current-name} @var{doc})
(make-obsolete @var{obsolete-name} @var{current-name} @var{when})
@end example
@end defmac
@ -1213,16 +1215,16 @@ this:
@section Inline Functions
@cindex inline functions
@defmac defsubst name argument-list body-forms...
Define an inline function. The syntax is exactly the same as
@code{defun} (@pxref{Defining Functions}).
@end defmac
You can define an @dfn{inline function} by using @code{defsubst}
instead of @code{defun}. An inline function works just like an
ordinary function except for one thing: when you byte-compile a call
An @dfn{inline function} is a function that works just like an
ordinary function, except for one thing: when you byte-compile a call
to the function (@pxref{Byte Compilation}), the function's definition
is expanded into the caller.
is expanded into the caller. To define an inline function, use
@code{defsubst} instead of @code{defun}.
@defmac defsubst name args [doc] [declare] [interactive] body@dots{}
This macro defines an inline function. Its syntax is exactly the same
as @code{defun} (@pxref{Defining Functions}).
@end defmac
Making a function inline often makes its function calls run faster.
But it also has disadvantages. For one thing, it reduces flexibility;
@ -1266,16 +1268,13 @@ convention in Emacs Lisp mode.
@anchor{Definition of declare}
@defmac declare @var{specs}@dots{}
This macro ignores its arguments and evaluates to @code{nil}; it has
no run-time effect. However, when a @code{declare} form occurs as the
@emph{very first form} in the body of a @code{defun} function
definition or a @code{defmacro} macro definition (@pxref{Defining
Macros}, for a description of @code{defmacro}), it appends the
properties specified by @var{specs} to the function or macro. This
work is specially performed by the @code{defun} and @code{defmacro}
macros.
Note that if you put a @code{declare} form in an interactive function,
it should go before the @code{interactive} form.
no run-time effect. However, when a @code{declare} form occurs in the
@var{declare} argument of a @code{defun} or @code{defsubst} function
definition (@pxref{Defining Functions}) or a @code{defmacro} macro
definition (@pxref{Defining Macros}), it appends the properties
specified by @var{specs} to the function or macro. This work is
specially performed by @code{defun}, @code{defsubst}, and
@code{defmacro}.
Each element in @var{specs} should have the form @code{(@var{property}
@var{args}@dots{})}, which should not be quoted. These have the
@ -1397,7 +1396,7 @@ opposed to an unspecified one).
@cindex function safety
@cindex safety of functions
Some major modes such as SES call functions that are stored in user
Some major modes, such as SES, call functions that are stored in user
files. (@inforef{Top, ,ses}, for more information on SES.) User
files sometimes have poor pedigrees---you can get a spreadsheet from
someone you've just met, or you can get one through email from someone

45
doc/lispref/macros.texi
View file

@ -185,35 +185,38 @@ During Compile}).
@node Defining Macros
@section Defining Macros
A Lisp macro is a list whose @sc{car} is @code{macro}. Its @sc{cdr} should
be a function; expansion of the macro works by applying the function
(with @code{apply}) to the list of unevaluated argument-expressions
from the macro call.
A Lisp macro object is a list whose @sc{car} is @code{macro}, and
whose @sc{cdr} is a lambda expression. Expansion of the macro works
by applying the lambda expression (with @code{apply}) to the list of
@emph{unevaluated} arguments from the macro call.
It is possible to use an anonymous Lisp macro just like an anonymous
function, but this is never done, because it does not make sense to pass
an anonymous macro to functionals such as @code{mapcar}. In practice,
all Lisp macros have names, and they are usually defined with the
special form @code{defmacro}.
function, but this is never done, because it does not make sense to
pass an anonymous macro to functionals such as @code{mapcar}. In
practice, all Lisp macros have names, and they are almost always
defined with the @code{defmacro} macro.
@defspec defmacro name argument-list body-forms@dots{}
@code{defmacro} defines the symbol @var{name} as a macro that looks
like this:
@defmac defmacro name args [doc] [declare] body@dots{}
@code{defmacro} defines the symbol @var{name} (which should not be
quoted) as a macro that looks like this:
@example
(macro lambda @var{argument-list} . @var{body-forms})
(macro lambda @var{args} . @var{body})
@end example
(Note that the @sc{cdr} of this list is a function---a lambda expression.)
This macro object is stored in the function cell of @var{name}. Its return
value is @emph{undefined}.
(Note that the @sc{cdr} of this list is a lambda expression.) This
macro object is stored in the function cell of @var{name}. The
meaning of @var{args} is the same as in a function, and the keywords
@code{&rest} and @code{&optional} may be used (@pxref{Argument List}).
Neither @var{name} nor @var{args} should be quoted. The return value
of @code{defmacro} is undefined.
The shape and meaning of @var{argument-list} is the same as in a
function, and the keywords @code{&rest} and @code{&optional} may be used
(@pxref{Argument List}). Macros may have a documentation string, but
any @code{interactive} declaration is ignored since macros cannot be
called interactively.
@end defspec
@var{doc}, if present, should be a string specifying the macro's
documentation string. @var{declare}, if present, should be a
@code{declare} form specifying metadata for the macro (@pxref{Declare
Form}). Note that macros cannot have interactive declarations, since
they cannot be called interactively.
@end defmac
Macros often need to construct large list structures from a mixture
of constants and nonconstant parts. To make this easier, use the

27
doc/lispref/minibuf.texi
View file

@ -664,25 +664,22 @@ This function returns the longest common substring of all possible
completions of @var{string} in @var{collection}.
@cindex completion table
The @var{collection} argument is called the @dfn{completion table}.
Its value must be a list of strings, an alist whose keys are strings
or symbols, an obarray, a hash table, or a completion function.
@var{collection} is called the @dfn{completion table}. Its value must
be a list of strings or cons cells, an obarray, a hash table, or a
completion function.
Completion compares @var{string} against each of the permissible
completions specified by @var{collection}. If no permissible
completions match, @code{try-completion} returns @code{nil}. If there
is just one matching completion, and the match is exact, it returns
@code{try-completion} compares @var{string} against each of the
permissible completions specified by the completion table. If no
permissible completions match, it returns @code{nil}. If there is
just one matching completion, and the match is exact, it returns
@code{t}. Otherwise, it returns the longest initial sequence common
to all possible matching completions.
If @var{collection} is an alist (@pxref{Association Lists}), the
permissible completions are the elements of the alist that are either
strings, or conses whose @sc{car} is a string or symbol.
Symbols are converted to strings using @code{symbol-name}. Other
elements of the alist are ignored. (Remember that in Emacs Lisp, the
elements of alists do not @emph{have} to be conses.) In particular, a
list of strings is allowed, even though we usually do not
think of such lists as alists.
If @var{collection} is an list, the permissible completions are
specified by the elements of the list, each of which should be either
a string, or a cons cell whose @sc{car} is either a string or a symbol
(a symbol is converted to a string using @code{symbol-name}). If the
list contains elements of any other type, those are ignored.
@cindex obarray in completion
If @var{collection} is an obarray (@pxref{Creating Symbols}), the names

23
doc/misc/ChangeLog
View file

@ -1,3 +1,26 @@
2012-10-09 Michael Albinus <michael.albinus@gmx.de>
* trampver.texi: Update release number.
2012-10-06 Glenn Morris <rgm@gnu.org>
* erc.texi: Include emacsver.texi, and use EMACSVER rather than
ERC version.
(Introduction): ERC is distributed with Emacs.
(Obtaining ERC, Installation): Remove chapters, no longer relevant.
(Getting Started): Simplify.
(Getting Help and Reporting Bugs): Refer to general Emacs lists.
(History): Mention ERC maintained as part of Emacs now.
* Makefile.in ($(buildinfodir)/erc$(INFO_EXT), erc.dvi, erc.pdf):
Add dependency on emacsver.texi.
* erc.texi: Remove hand-written node pointers.
2012-10-05 Glenn Morris <rgm@gnu.org>
* newsticker.texi (Overview, Requirements, Usage, Configuration):
Copyedits.
2012-10-01 Eric Ludlam <zappo@gnu.org>
* ede.texi (Quick Start, Project Local Variables)

6
doc/misc/Makefile.in
View file

@ -336,12 +336,12 @@ epa.pdf: ${srcdir}/epa.texi
$(ENVADD) $(TEXI2PDF) ${srcdir}/epa.texi
erc : $(buildinfodir)/erc$(INFO_EXT)
$(buildinfodir)/erc$(INFO_EXT): ${srcdir}/erc.texi
$(buildinfodir)/erc$(INFO_EXT): ${srcdir}/erc.texi $(emacsdir)/emacsver.texi
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/erc.texi
erc.dvi: ${srcdir}/erc.texi
erc.dvi: ${srcdir}/erc.texi $(emacsdir)/emacsver.texi
$(ENVADD) $(TEXI2DVI) ${srcdir}/erc.texi
erc.pdf: ${srcdir}/erc.texi
erc.pdf: ${srcdir}/erc.texi $(emacsdir)/emacsver.texi
$(ENVADD) $(TEXI2PDF) ${srcdir}/erc.texi
ert : $(buildinfodir)/ert$(INFO_EXT)

2
doc/misc/calc.texi
View file

@ -35232,7 +35232,7 @@ character of the prefix can simply be typed twice.
Calc is controlled by many variables, most of which can be reset
from within Calc. Some variables are less involved with actual
calculation and can be set outside of Calc using Emacs'ss
calculation and can be set outside of Calc using Emacs's
customization facilities. These variables are listed below.
Typing @kbd{M-x customize-variable RET @var{variable-name} RET}
will bring up a buffer in which the variable's value can be redefined.

4
doc/misc/cl.texi
View file

@ -2087,7 +2087,7 @@ of a list. @var{list} should evaluate to a list; the body @var{forms}
are executed with @var{var} bound to each element of the list in
turn. Finally, the @var{result} form (or @code{nil}) is evaluated
with @var{var} bound to @code{nil} to produce the result returned by
the loop. Unlike with Emacs'ss built in @code{dolist}, the loop is
the loop. Unlike with Emacs's built in @code{dolist}, the loop is
surrounded by an implicit @code{nil} block.
@end defspec
@ -2097,7 +2097,7 @@ of times. The body is executed with @var{var} bound to the integers
from zero (inclusive) to @var{count} (exclusive), in turn. Then
the @code{result} form is evaluated with @var{var} bound to the total
number of iterations that were done (i.e., @code{(max 0 @var{count})})
to get the return value for the loop form. Unlike with Emacs'ss built in
to get the return value for the loop form. Unlike with Emacs's built in
@code{dolist}, the loop is surrounded by an implicit @code{nil} block.
@end defspec

14
doc/misc/ede.texi
View file

@ -302,7 +302,7 @@ that file to your target.
. a myprogram RET
@end example
Note that these promps often have completion, so you can just press
Note that these prompts often have completion, so you can just press
@kbd{TAB} to complete the name @file{myprogram}.
If you had many files to add to the same target, you could mark them
@ -785,7 +785,7 @@ also supports several debugging tools via @file{android.el}.
An arduino project of type @samp{ede-arduino-project} will read your
@file{~/.arduino/preferences.txt} file, and identify your sketches.
You will still need the Arduino IDE to set up your preferences and
locate your arduino. After quiting the IDE, Emacs will be able to
locate your arduino. After quitting the IDE, Emacs will be able to
find your sketches, compile them, and upload them to your arduino.
If you have the @file{arduino} command on your path, @ede{} will be
@ -1169,14 +1169,14 @@ Some example project types are:
@table @code
@item project-am
Autmake project which reads existing Automake files.
Automake project which reads existing Automake files.
@item ede-proj-project
This project type will create @file{Makefiles},
or @file{Makefile.am} files to compile your project.
@item ede-linux
This project type will detect linux source trees.
@item ede-emacs
This proejct will detect an Emacs source tree.
This project will detect an Emacs source tree.
@end table
There are several other project types as well.
@ -1291,7 +1291,7 @@ it finds the top of the project. It does this by calling
@code{ede-toplevel-project}. If this hasn't already been discovered,
the directories as scanned upward one at a time until a directory with
no project is found. The last found project becomes the project
root. If the ofund instance of @code{ede-project-autoload} has a
root. If the found instance of @code{ede-project-autoload} has a
valid @code{proj-root} slot value, then that function is called instead
of scanning the project by hand. Some project types have a short-cut
for determining the root of a project, so this comes in handy.
@ -3331,7 +3331,7 @@ Bonus: Return a cons cell: (COMPILED . UPTODATE).
@end deffn
@deffn Method ede-proj-flush-autoconf :AFTER this
Flush the configure file (current buffer) to accomodate @var{THIS}.
Flush the configure file (current buffer) to accommodate @var{THIS}.
@end deffn
@deffn Method ede-buffer-mine :AFTER this buffer
@ -3920,7 +3920,7 @@ Return the default macro to 'edit' for this object type.
@end deffn
@deffn Method project-compile-target-command :AFTER this
Default target t- use when compling a texinfo file.
Default target to use when compiling a texinfo file.
@end deffn
@deffn Method ede-documentation :AFTER this

14
doc/misc/eieio.texi
View file

@ -595,7 +595,7 @@ This is the default.
@item :depth-first
Search for methods in the class hierarchy in a depth first order.
@item :c3
Searches for methods in in a learnarized way that most closely matches
Searches for methods in in a linearized way that most closely matches
what CLOS does when a monotonic class structure is defined.
@end table
@ -1010,7 +1010,7 @@ This is the default.
@item :depth-first
Search for methods in the class hierarchy in a depth first order.
@item :c3
Searches for methods in in a learnarized way that most closely matches
Searches for methods in in a linearized way that most closely matches
what CLOS does when CLOS when a monotonic class structure is defined.
This is derived from the Dylan language documents by
@ -1408,8 +1408,8 @@ provided.
Read a persistent object from @var{filename}, and return it.
Signal an error if the object in @var{FILENAME} is not a constructor
for @var{CLASS}. Optional @var{allow-subclass} says that it is ok for
@code{eieio-peristent-read} to load in subclasses of class instead of
being pendantic."
@code{eieio-persistent-read} to load in subclasses of class instead of
being pedantic.
@end defun
@node eieio-named
@ -1564,9 +1564,9 @@ texinfo format by using the tools in the file @file{eieio-doc.el}
@deffn Command eieiodoc-class class indexstring &optional skiplist
This will start at the current point, and created an indented menu of
This will start at the current point, and create an indented menu of
all the child classes of, and including @var{class}, but skipping any
classes that might be in @var{skiplist} It will then create nodes for
classes that might be in @var{skiplist}. It will then create nodes for
all these classes, subsection headings, and indexes.
Each class will be indexed using the texinfo labeled index
@ -1585,7 +1585,7 @@ where @var{indexstring} is replaced with the two letter code.
Next, an inheritance tree will be created listing all parents of that
section's class.
Then,all the slots will be expanded in tables, and described
Then, all the slots will be expanded in tables, and described
using the documentation strings from the code. Default values will also
be displayed. Only those slots with @code{:initarg} specified will be
expanded, others will be hidden. If a slot is inherited from a parent,

300
doc/misc/erc.texi
View file

@ -3,13 +3,13 @@
@setfilename ../../info/erc
@settitle ERC Manual
@syncodeindex fn cp
@include emacsver.texi
@c %**end of header
@copying
This manual is for ERC version 5.3.
This manual is for ERC as distributed with Emacs @value{EMACSVER}.
Copyright @copyright{} 2005-2012
Free Software Foundation, Inc.
Copyright @copyright{} 2005-2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@ -48,8 +48,7 @@ and modified without restriction.
@contents
@ifnottex
@node Top, Introduction, (dir), (dir)
@comment node-name, next, previous, up
@node Top
@top ERC
@insertcopying
@ -57,9 +56,6 @@ and modified without restriction.
@menu
* Introduction:: What is ERC?
* Obtaining ERC:: How to get ERC releases and development
versions.
* Installation:: Compiling and installing ERC.
* Getting Started:: Quick Start guide to using ERC.
* Keystroke Summary:: Keystrokes used in ERC buffers.
* Modules:: Available modules for ERC.
@ -76,11 +72,6 @@ and modified without restriction.
@detailmenu
--- The Detailed Node Listing ---
Obtaining ERC
* Releases:: Released versions of ERC.
* Development:: Latest unreleased development changes.
Getting Started
* Sample Session:: Example of connecting to the #emacs channel
@ -95,11 +86,11 @@ Advanced Usage
@end detailmenu
@end menu
@node Introduction, Obtaining ERC, Top, Top
@comment node-name, next, previous, up
@node Introduction
@chapter Introduction
ERC is a powerful, modular, and extensible IRC client for Emacs.
It is distributed with Emacs since version 22.1.
It comes with the following capabilities enabled by default.
@ -119,217 +110,13 @@ It comes with the following capabilities enabled by default.
@end itemize
@node Obtaining ERC, Installation, Introduction, Top
@comment node-name, next, previous, up
@chapter Obtaining ERC
@menu
* Releases:: Released versions of ERC.
* Development:: Latest unreleased development changes.
@end menu
Note that some ERC files are not included with Emacs due to copyright or
dependency issues. If desired, they may be found at the following
locations, or from your local GNU mirror.
@itemize @bullet
@item @uref{http://ftp.gnu.org/gnu/erc/erc-5.3-extras.tar.gz}
@item @uref{http://ftp.gnu.org/gnu/erc/erc-5.3-extras.zip}
@end itemize
The rest of this chapter may be skipped if you are using the version of
ERC that comes with Emacs.
@node Releases, Development, Obtaining ERC, Obtaining ERC
@comment node-name, next, previous, up
@section Releases
Choose to install a release if you want to minimize risk.
Errors are corrected in development first. User-visible changes will be
announced on the @email{erc-discuss@@gnu.org} mailing list.
@pxref{Getting Help and Reporting Bugs}.
@cindex releases, Debian package
@cindex Debian package for ERC
Debian users can get ERC via apt-get. The @file{erc} package is
available in the official Debian repository.
@cindex releases, from source
Alternatively, you can download the latest release from
@uref{http://ftp.gnu.org/gnu/erc}, or your local GNU mirror.
@node Development, , Releases, Obtaining ERC
@comment node-name, next, previous, up
@section Development
@cindex development
Choose the development version if you want to live on the bleeding edge
of ERC development or try out new features before release.
@cindex git version control system, using
The git version control system allows you to keep up-to-date with the
latest changes to the development version of ERC. It also allows you
to contribute changes (via commits, if you are have developer access to
the repository, or via patches, otherwise). If you would like to
contribute to ERC development, it is highly recommended that you use
git.
If you are new to git, you might find this tutorial helpful:
@uref{http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html}.
Downloading ERC with git and staying up-to-date involves the following
steps.
@enumerate
@item Install git.
@itemize @bullet
@item Debian and Ubuntu: @kbd{apt-get install git-core}.
@item Windows: @uref{http://git.or.cz/gitwiki/WindowsInstall}.
@item Other operating systems: download, compile, and install the source
from @uref{http://www.kernel.org/pub/software/scm/git/}, or find a git
package for your operating system.
@end itemize
@item Download the ERC development branch.
If you have developer access to ERC, do:
@example
git clone ssh://loginname@@git.sv.gnu.org/srv/git/erc.git
@end example
otherwise, do:
@example
git clone git://git.sv.gnu.org/erc.git
@end example
If you are behind a restrictive firewall, and do not have developer
access, then do the following instead:
@example
git clone http://git.sv.gnu.org/r/erc.git
@end example
@item List upstream changes that are missing from your local copy.
Do this whenever you want to see whether new changes have been committed
to ERC. If you wish, you may skip this step and proceed directly to
the ``update'' step.
@example
# Change to the source directory you are interested in.
cd erc
# Fetch new changes from the repository, but don't apply them yet
git fetch origin
# Display log messages for the new changes
git log HEAD..origin
@end example
``origin'' is git's name for the location where you originally got ERC
from. You can change this location at any time by editing the
@file{.git/config} file in the directory where the ERC source was
placed.
@cindex updating ERC with git
@item Update to the latest version by pulling in any missing changes.
@example
cd erc
git pull origin
@end example
git will show how many files changed, and will provide a visual display
for how many lines were changed in each file.
@end enumerate
There are other ways to interact with the ERC repository.
@itemize
@item Browse git repo: @uref{http://git.sv.gnu.org/gitweb/?p=erc.git}
@item Latest development snapshot: @uref{http://mwolson.org/static/dist/erc-latest.tar.gz}
@item Latest development snapshot (zip file): @uref{http://mwolson.org/static/dist/erc-latest.zip}
@end itemize
The latest development snapshot can lag behind the git repo by as much
as 20 minutes, but never more than that.
For further information on committing changes to ERC and performing
development, please consult
@uref{http://emacswiki.org/cgi-bin/wiki/ErcDevelopment}.
@node Installation, Getting Started, Obtaining ERC, Top
@comment node-name, next, previous, up
@chapter Installation
ERC may be compiled and installed on your machine.
This section may be skipped if you are using the version of ERC that
comes with Emacs.
@subsubheading Compilation
This is an optional step, since Emacs Lisp source code does not
necessarily have to be byte-compiled. It will yield a speed increase,
though.
A working copy of Emacs or XEmacs is needed in order to compile ERC. By
default, the program that is installed with the name @command{emacs}
will be used.
If you want to use the @command{xemacs} binary to perform the
compilation, you would need to edit @file{Makefile} in the top-level
directory as follows. You can put either a full path to an Emacs or
XEmacs binary or just the command name, as long as it is in the
@env{PATH}.
@example
EMACS = xemacs
SITEFLAG = -no-site-file
@end example
Running @code{make} should compile the ERC source files in the
@file{lisp} directory.
@subsubheading Installation
ERC may be installed into your file hierarchy by doing the following.
Edit the @file{Makefile} file so that @env{ELISPDIR} points to where you
want the source and compiled ERC files to be installed and
@env{INFODIR} indicates where to put the ERC manual. Of course, you
will want to edit @env{EMACS} and @env{SITEFLAG} as shown in the
Compilation section if you are using XEmacs.
If you are installing ERC on a Debian system, you might want to change
the value of @env{INSTALLINFO} as specified in @file{Makefile}.
Run @code{make} as a normal user.
Run @code{make install} as the root user if you have chosen installation
locations that require this.
@node Getting Started, Keystroke Summary, Installation, Top
@comment node-name, next, previous, up
@node Getting Started
@chapter Getting Started
@cindex settings
To use ERC, add the directory containing its files to your
@code{load-path} variable, in your @file{.emacs} file. Then, load ERC
itself. An example follows.
@lisp
(require 'erc)
@end lisp
Once ERC is loaded, the command @kbd{M-x erc} will start ERC and
prompt for the server to connect to.
The command @kbd{M-x erc} will start ERC and prompt for the server to
connect to.
If you want to place ERC settings in their own file, you can place them
in @file{~/.emacs.d/.ercrc.el}, creating it if necessary.
@ -344,8 +131,7 @@ you want, do @kbd{M-x customize-variable RET erc-modules RET}.
* Special Features:: Differences from standalone IRC clients
@end menu
@node Sample Session, Special Features, Getting Started, Getting Started
@comment node-name, next, previous, up
@node Sample Session
@section Sample Session
This is an example ERC session which shows how to connect to the #emacs
@ -403,8 +189,7 @@ talk with them.
@end itemize
@node Special Features, , Sample Session, Getting Started
@comment node-name, next, previous, up
@node Special Features
@section Special Features
ERC has some features that distinguish it from some IRC clients.
@ -478,8 +263,7 @@ ERC buffer and run the @code{/RECONNECT} command.
@end itemize
@node Keystroke Summary, Modules, Getting Started, Top
@comment node-name, next, previous, up
@node Keystroke Summary
@chapter Keys Used in ERC
@cindex keystrokes
@ -562,8 +346,7 @@ Kill current input line using `erc-bol' followed by `kill-line'.
@end table
@node Modules, Advanced Usage, Keystroke Summary, Top
@comment node-name, next, previous, up
@node Modules
@chapter Modules
@cindex modules
@ -701,8 +484,7 @@ Translate morse code in messages
@c PRE5_4: Document every option of every module in its own subnode
@node Advanced Usage, Getting Help and Reporting Bugs, Modules, Top
@comment node-name, next, previous, up
@node Advanced Usage
@chapter Advanced Usage
@cindex advanced topics
@ -712,8 +494,7 @@ Translate morse code in messages
* Options:: Options that are available for ERC.
@end menu
@node Connecting, Sample Configuration, Advanced Usage, Advanced Usage
@comment node-name, next, previous, up
@node Connecting
@section Connecting to an IRC Server
@cindex connecting
@ -846,8 +627,7 @@ User full name.
This can be either a string or a function to call.
@end defopt
@node Sample Configuration, Options, Connecting, Advanced Usage
@comment node-name, next, previous, up
@node Sample Configuration
@section Sample Configuration
@cindex configuration, sample
@ -926,8 +706,7 @@ stuff, to the current ERC buffer."
;; (setq erc-kill-server-buffer-on-quit t)
@end lisp
@node Options, , Sample Configuration, Advanced Usage
@comment node-name, next, previous, up
@node Options
@section Options
@cindex options
@ -939,8 +718,7 @@ check out the available options for ERC is to do
@kbd{M-x customize-group erc RET}.
@node Getting Help and Reporting Bugs, History, Advanced Usage, Top
@comment node-name, next, previous, up
@node Getting Help and Reporting Bugs
@chapter Getting Help and Reporting Bugs
@cindex help, getting
@cindex bugs, reporting
@ -952,36 +730,24 @@ or if you have bugs to report, there are several places you can go.
@item
@uref{http://www.emacswiki.org/cgi-bin/wiki/ERC} is the
emacswiki.org page for ERC. Anyone may add tips, hints, or bug
descriptions to it.
emacswiki.org page for ERC. Anyone may add tips, hints, etc. to it.
@item
There are several mailing lists for ERC. To subscribe, visit
@uref{http://savannah.gnu.org/mail/?group=erc}.
The mailing lists are also available on Gmane.
(@url{http://gmane.org/}). Gmane provides additional methods for
accessing the mailing lists, adding content to them, and searching them.
@enumerate
@item gmane.emacs.erc.announce: Announcements
@item gmane.emacs.erc.discuss: General discussion
@item gmane.emacs.erc.cvs: Log messages for changes to the ERC source code
@end enumerate
You can ask questions about using ERC on the Emacs mailing list,
@uref{http://lists.gnu.org/mailman/listinfo/help-gnu-emacs}.
@item
You can visit the IRC Freenode channel @samp{#emacs}. Many of the
contributors are frequently around and willing to answer your
questions.
@item
To report a bug in ERC, use @kbd{M-x report-emacs-bug}.
@end itemize
@node History, Copying, Getting Help and Reporting Bugs, Top
@comment node-name, next, previous, up
@node History
@chapter History
@cindex history, of ERC
@ -1044,18 +810,22 @@ our revision control system. Our mailing list address changed as well.
We switched to using git for our version control system.
@item 2009+
Since about 2009, ERC is no longer developed as a separate project, but
is maintained as part of Emacs.
@end itemize
@node Copying, GNU Free Documentation License, History, Top
@comment node-name, next, previous, up
@node Copying
@appendix GNU GENERAL PUBLIC LICENSE
@include gpl.texi
@node GNU Free Documentation License, Concept Index, Copying, Top
@comment node-name, next, previous, up
@node GNU Free Documentation License
@appendix GNU Free Documentation License
@include doclicense.texi
@node Concept Index, , GNU Free Documentation License, Top
@comment node-name, next, previous, up
@node Concept Index
@unnumbered Index
@printindex cp

34
doc/misc/newsticker.texi
View file

@ -69,14 +69,14 @@ developing GNU and promoting software freedom.''
@node Overview
@chapter Overview
Newsticker provides a newsticker for Emacs. A newsticker is a thing
Newsticker provides a newsticker for Emacs. A newsticker is a thing
that asynchronously retrieves headlines from a list of news sites,
prepares these headlines for reading, and allows for loading the
corresponding articles in a web browser.
Headlines consist of a title and (possibly) a small description. They
are contained in "RSS" (RDF Site Summary) or "Atom" files. Newsticker
are contained in ``RSS'' (RDF Site Summary) or ``Atom'' files. Newsticker
works with the following RSS formats:
@itemize
@ -105,8 +105,9 @@ messages in a stock-quote ticker, or just changing.
Newsticker allows for automatic processing of headlines by providing
hooks and (sample) functions for automatically downloading images and
enclosed files (as delivered by podcasts, e.g.).
enclosed files (as delivered by, e.g., podcasts).
@ignore
@ifhtml
Here are screen shots of the @uref{newsticker-1.7.png, version 1.7
(current version)} and some older screen shots:
@ -116,6 +117,7 @@ Here are screen shots of the @uref{newsticker-1.7.png, version 1.7
@uref{newsticker-1.3.png, version 1.3},
@uref{newsticker-1.0.png, version 1.0}.
@end ifhtml
@end ignore
@node Requirements
@chapter Requirements
@ -123,7 +125,7 @@ Here are screen shots of the @uref{newsticker-1.7.png, version 1.7
Newsticker can be used with
@uref{http://www.gnu.org/software/emacs/emacs.html, GNU Emacs} version
21.1 or later as well as @uref{http://www.xemacs.org, XEmacs}. It
requires an XML-parser (@file{xml.el}) which is part of GNU Emacs. If
requires an XML-parser (@file{xml.el}), which is part of GNU Emacs. If
you are using XEmacs you want to get the @file{net-utils} package
which contains @file{xml.el} for XEmacs.
@ -161,11 +163,11 @@ You can choose between two different frontends for reading headlines:
@itemize
@item Newsticker's @emph{treeview} uses separate windows for the
feeds (in tree form), a list of headlines for the current feed, and
the content of the current headline. Feeds can be placed into groups
which itself can be placed in groups and so on.
the content of the current headline. Feeds can be placed into groups,
which themselves can be placed in groups and so on.
@item Newsticker's @emph{plainview} displays all headlines in a
single buffer, called @samp{*newsticker*}. The modeline in the
@samp{*newsticker*} buffer informs whenever new headlines have
single buffer, called @samp{*newsticker*}. The modeline in the
@samp{*newsticker*} buffer informs you whenever new headlines have
arrived.
@end itemize
In both views clicking mouse-button 2 or pressing RET on a headline
@ -175,13 +177,13 @@ your favorite web browser.
@findex newsticker-start-ticker
@findex newsticker-stop-ticker
The scrolling, or flashing of headlines in the echo area, can be
started with the command @code{newsticker-start-ticker}. It can be
started with the command @code{newsticker-start-ticker}. It can be
stopped with @code{newsticker-stop-ticker}.
@findex newsticker-start
@findex newsticker-stop
If you just want to start the periodic download of headlines use the
command @code{newsticker-start}. Calling @code{newsticker-stop} will
command @code{newsticker-start}. Calling @code{newsticker-stop} will
stop the periodic download, but will call
@code{newsticker-stop-ticker} as well.
@ -189,7 +191,7 @@ stop the periodic download, but will call
@chapter Configuration
All Newsticker options are customizable, i.e. they can be changed with
Emacs customization methods: Call the command
Emacs customization methods. Call the command
@code{customize-group} and enter @samp{newsticker} for the customization
group.
@ -209,7 +211,7 @@ feeds are retrieved and how this is done.
@itemize
@item
@vindex newsticker-url-list
@code{newsticker-url-list} defines the list of headlines which are
@code{newsticker-url-list} defines the list of headlines that are
retrieved.
@item
@vindex newsticker-retrieval-method
@ -245,11 +247,11 @@ commands to newsticker functions.
@item
@vindex newsticker-new-item-functions
@code{newsticker-new-item-functions} allows for automatic
processing of headlines. See `newsticker-download-images', and
`newsticker-download-enclosures' for sample functions.
processing of headlines. See @code{newsticker-download-images}, and
@code{newsticker-download-enclosures} for sample functions.
@item
@vindex newsticker-plainview-hooks
The subgroup @code{newsticker-plainview-hooks} contains hook which
The subgroup @code{newsticker-plainview-hooks} contains hooks that
apply to the plainview reader only.
@end itemize
@ -276,7 +278,7 @@ the echo area.
@itemize
@item
@vindex newsticker-frontend
@code{newsticker-frontend} determines the actual headline reader. The
@code{newsticker-frontend} determines the actual headline reader. The
``plainview'' reader uses a single buffer, the ``treeview'' uses
separate buffers and windows.
@end itemize

16
doc/misc/org.texi
View file

@ -947,7 +947,7 @@ description on Worg}.
Installing Info files is system dependent, because of differences in the
@file{install-info} program. The Info documentation is installed together
with the rest of Org mode. If you don't install Org mode, it is possible to
install the Info documentation seperately (you need to have
install the Info documentation separately (you need to have
install-info@footnote{The output from install-info (if any) is system
dependent. In particular Debian and its derivatives use two different
versions of install-info and you may see the message:
@ -2671,13 +2671,13 @@ durations computations @ref{Durations and time values}.
@cindex Lisp forms, as table formulas
It is also possible to write a formula in Emacs Lisp. This can be useful
for string manipulation and control structures, if Calc's functionality is
not enough.
for string manipulation and control structures, if Calc's functionality is
not enough.
If a formula starts with a single-quote followed by an opening parenthesis,
then it is evaluated as a Lisp form. The evaluation should return either a
string or a number. Just as with @file{calc} formulas, you can specify modes
and a printf format after a semicolon.
and a printf format after a semicolon.
With Emacs Lisp forms, you need to be conscious about the way field
references are interpolated into the form. By default, a reference will be
@ -6114,7 +6114,7 @@ is only necessary if you edit the timestamps directly. If you change
them with @kbd{S-@key{cursor}} keys, the update is automatic.
@orgcmd{C-S-@key{up/down},org-clock-timestamps-up/down}
On @code{CLOCK} log lines, increase/decrease both timestamps so that the
clock duration keeps the same.
clock duration keeps the same.
@orgcmd{S-M-@key{up/down},org-timestamp-up/down}
On @code{CLOCK} log lines, increase/decrease the timestamp at point and
the one of the previous (or the next clock) timestamp by the same duration.
@ -16556,7 +16556,7 @@ rely on outline paths, in the hope that these will be unique enough.}.
Finally, Org writes the file @file{index.org}, containing links to all other
files. @i{MobileOrg} first reads this file from the server, and then
downloads all agendas and Org files listed in it. To speed up the download,
MobileOrg will only read files whose checksums@footnote{Checksums are stored
MobileOrg will only read files whose checksums@footnote{Checksums are stored
automatically in the file @file{checksums.dat}} have changed.
@node Pulling from MobileOrg, , Pushing to MobileOrg, MobileOrg
@ -16704,7 +16704,7 @@ on @file{org-element.el} and @file{org-export.el} has been outstanding, and
opened the doors for many new ideas and features.
@item Jambunathan K
Jambunathan contributed the ODT exporter, definitly a killer feature of
Jambunathan contributed the ODT exporter, definitely a killer feature of
Org mode. He also contributed the new HTML exporter, which is another core
feature of Org. Here too, I knew I could rely on him to fix bugs in these
areas and to patiently explain the users what was the problems and solutions.
@ -16712,7 +16712,7 @@ areas and to patiently explain the users what was the problems and solutions.
@item Achim Gratz
Achim rewrote the building process of Org, turning some @emph{ad hoc} tools
into a flexible and conceptually clean process. He patiently coped with the
many hicups that such a change can create for users.
many hiccups that such a change can create for users.
@item Nick Dokos
The Org mode mailing list would not be such a nice place without Nick, who

2
doc/misc/trampver.texi
View file

@ -8,7 +8,7 @@
@c In the Tramp CVS, the version number is auto-frobbed from
@c configure.ac, so you should edit that file and run
@c "autoconf && ./configure" to change the version number.
@set trampver 2.2.6
@set trampver 2.2.7-pre
@c Other flags from configuration
@set instprefix /usr/local

26
etc/ChangeLog
View file

@ -1,3 +1,29 @@
2012-10-14 Kenichi Handa <handa@gnu.org>
* charsets/JISC6226.map: Re-generated.
2012-10-14 Eli Zaretskii <eliz@gnu.org>
* compilation.txt (msft): Add error messages in new Studio 2010
format.
2012-10-11 Kenichi Handa <handa@gnu.org>
* charsets/CNS-2.map, charsets/CNS-3.map, charsets/CNS-4.map,
charsets/CNS-5.map, charsets/CNS-6.map, charsets/CNS-7.map,
charsets/CP932-2BYTE.map, charsets/GB180302.map,
charsets/GB180304.map, charsets/JISC6226.map,
charsets/JISX2131.map, charsets/MIK.map, charsets/PTCP154.map,
charsets/stdenc.map, charsets/symbol.map: Re-generated.
2012-10-07 Jan Djärv <jan.h.d@swipnet.se>
* NEWS (NextStep/OSX port changes): OSX 10.4 or newer is required.
2012-10-05 Douglas Lewan <d_lewan2000@yahoo.com> (tiny change)
* tutorials/TUTORIAL.pt_BR: Fix typo. (Bug#12557)
2012-10-01 Eric Ludlam <zappo@gnu.org>
* srecode/cc.srt, srecode/ede-autoconf.srt: New files.

98
etc/NEWS
View file

@ -23,18 +23,36 @@ so we will look at it and add it to the manual.
* Installation Changes in Emacs 24.3
---
** The default toolkit has been changed to Gtk+ version 3.
If you don't pass --with-x-toolkit to configure or if you pass
--with-x-toolkit=gtk or --with-x-toolkit=yes, configure will try to build
with Gtk+ version 3, and if that fails, try Gtk+ version 2.
You can explicitly require a specific version by passing
--with-x-toolkit=gtk2 or --with-x-toolkit=gtk3 to configure.
---
** New configure option '--without-all' to disable additional features.
This disables most of the features that are normally enabled by default.
---
** New configure option '--enable-link-time-optimization' to utilize
an appropriate feature provided by GCC since version 4.5.0.
---
** New configure option '--enable-gcc-warnings', intended for developers.
If building with GCC, this enables compile-time checks that warn about
possibly-questionable C code. On a recent GNU system there should be
no warnings; on older and on non-GNU systems the generated warnings
may be useful.
---
** The configure option '--enable-use-lisp-union-type' has been
renamed to '--enable-check-lisp-object-type', as the resulting
Lisp_Object type no longer uses a union to implement the compile time
check that this option enables.
---
** The configure option '--disable-maintainer-mode' has been removed,
as it was confusingly-named and rarely useful.
@ -43,6 +61,13 @@ as it was confusingly-named and rarely useful.
overwriting "emacs" in the installation bin/ directory with a link
to emacs-VERSION.
---
** The configure options `--program-prefix', `--program-suffix', and
`--program-transform-name' apply to more than just the installed
binaries. Now they also affect the man pages, icons, and the
etc/emacs.desktop file; but not the info pages, since this would break
links between the various manuals.
---
** Emacs uses libtinfo in preference to libncurses, if available.
@ -60,18 +85,10 @@ directories to the search path. You must add them yourself if you want them.
(from the bin and libexec directories, respectively). The former is
no longer relevant, the latter is replaced by lisp (in vc-sccs.el).
** The configuration option '--enable-use-lisp-union-type' has been
renamed to '--enable-check-lisp-object-type', as the resulting
Lisp_Object type no longer uses a union to implement the compile time
check that this option enables.
---
** The default toolkit has been changed to Gtk+ version 3.
If you don't pass --with-x-toolkit to configure or if you pass
--with-x-toolkit=gtk or --with-x-toolkit=yes, configure will try to build
with Gtk+ version 3, and if that fails, try Gtk+ version 2.
You can explicitly require a specific version by passing
--with-x-toolkit=gtk2 or --with-x-toolkit=gtk3 to configure.
** The native Windows user interface is available for Cygwin. Passing
--with-w32 will configure a Cygwin emacs to use the Windows user
interface instead of the default, X11.
* Startup Changes in Emacs 24.3
@ -127,16 +144,16 @@ It is no longer necessary to call `imagemagick-register-types'
explicitly to install ImageMagick image types; that function is called
automatically at startup, or when customizing a relevant imagemagick-
option.
+++
*** Setting `imagemagick-types-inhibit' to t now disables the use of
ImageMagick to view images. You must call imagemagick-register-types
afterwards if you do not use customize to change this.
+++
*** The new variable `imagemagick-enabled-types' also affects which
ImageMagick types are treated as images. The function
`imagemagick-filter-types' returns the list of types that will be
treated as images.
---
*** Images displayed via ImageMagick now support transparency and the
:background image spec property.
@ -160,8 +177,6 @@ On encountering a fatal error, Emacs now outputs a textual description
of the fatal signal, and a short backtrace on platforms like glibc
that support backtraces.
** `message-log-max' now defaults to 1000, not 100.
---
** If your Emacs was built from a bzr checkout, the new variable
`emacs-bzr-version' contains information about the bzr revision used.
@ -191,9 +206,13 @@ The PCL-CVS commands are still available via the keyboard.
** NextStep/OSX port changes.
---
*** OSX 10.4 or newer is required to build Emacs.
---
*** Fullscreen and frame parameter fullscreen is supported.
---
*** A file dialog is used when open/saved is done from the menu/toolbar.
*** A file dialog is used for open/save operations initiated from the
menu/toolbar.
* Editing Changes in Emacs 24.3
@ -278,11 +297,16 @@ Use `Buffer-menu-name-width' and `Buffer-menu-size-width' instead.
** Calendar
+++
*** You can customize the header text that appears above each calendar month.
See the variable `calendar-month-header'.
+++
*** New LaTeX calendar style, produced by `cal-tex-cursor-week2-summary'.
+++
*** The calendars produced by cal-html include holidays.
Customize cal-html-holidays to change this.
Customize `cal-html-holidays' to change this.
** CL
@ -400,8 +424,8 @@ The global binding for `M-=', `count-words-region' is in effect.
channel keys found, if any.
** Flymake uses fringe bitmaps to indicate errors and warnings.
See flymake-fringe-indicator-position, flymake-error-bitmap and
flymake-warning-bitmap.
See `flymake-fringe-indicator-position', `flymake-error-bitmap' and
`flymake-warning-bitmap'.
** Follow mode
@ -416,6 +440,9 @@ The option `follow-intercept-processes' has been removed.
specifying URL types which should be converted to remote file names at
the FFAP prompt. The default is now '("ftp").
** Generic-x
`javascript-generic-mode' is now an obsolete alias for `js-mode'.
** Ibuffer
*** New `derived-mode' filter, bound to `/ M'.
@ -616,6 +643,10 @@ inefficiency, and not namespace-clean.
* New Modes and Packages in Emacs 24.3
FIXME? erc-desktop-notifications.el, gv.el, profiler.el,
gnus-notifications.el, mm-archive.el
* Incompatible Lisp Changes in Emacs 24.3
@ -698,7 +729,7 @@ are deprecated and will be removed eventually.
*** `compile-internal'
*** `mode-line-inverse-video'
*** `cvs-commit-buffer-require-final-newline'
(use `'log-edit-require-final-newline'instead)
(use `log-edit-require-final-newline' instead)
*** `cvs-changelog-full-paragraphs'
(use `log-edit-changelog-full-paragraphs' instead)
*** `cvs-diff-ignore-marks', `cvs-diff-buffer-name'
@ -792,6 +823,7 @@ in Emacs 24.1:
**** `special-display-buffer-names'
**** `special-display-function'
**** `display-buffer-function'
**** `dired-shrink-to-fit'
** Time
---
@ -826,10 +858,10 @@ macro-calls to be left for later expansion (as before), but will also
result in a warning ("Eager macro-expansion skipped due to cycle")
describing the cycle.
** Misc new functions:
** Miscellaneous new functions:
*** `autoloadp'
*** `autoload-do-load'.
*** `autoload-do-load'
+++
*** `buffer-narrowed-p' tests if the buffer is narrowed.
*** `file-name-base' returns a file name sans directory and extension.
@ -854,22 +886,28 @@ See the "Face Attributes" section of the Elisp manual.
*** `automount-dir-prefix'
*** `buffer-has-markers-at'
*** `macro-declaration-function' (use `macro-declarations-alist').
*** `macro-declaration-function' (use `macro-declarations-alist')
*** `window-system-version'
*** `dired-pop-to-buffer' (use `dired-mark-pop-up')
*** `query-replace-interactive'
* Changes in Emacs 24.3 on non-free operating systems
** New configure.bat options on MS-Windows:
*** --without-libxml2 omits support for libxml2, even if its presence
is detected.
+++
** On MS Windows, you can pass --without-libxml2 to configure.bat to omit
support for libxml2, even if its presence is detected.
** When invoked with the -nw switch to run on the Windows text-mode terminal,
Emacs now supports mouse highlight, help-echo (in the echo area), and
mouse-autoselect-window.
`mouse-autoselect-window'.
** On MS-Windows Vista and later Emacs now supports symbolic links.
** Two new functions are available in Cygwin builds:
`cygwin-convert-path-from-windows' and `cygwin-convert-path-to-windows'.
These functions allow Lisp code to access the Cygwin file-name mapping
machinery to convert between Cygwin and Windows-native file names.
** On MS Windows Vista and later Emacs now supports symbolic links.
* Changes in Emacs 24.2

12
etc/ORG-NEWS
View file

@ -65,12 +65,12 @@ See http://orgmode.org/elpa/
*** Org Element
=org-element.el= is a toolbox for parsing and analysing "elements"
=org-element.el= is a toolbox for parsing and analyzing "elements"
in an Org-mode buffer. This has been written by Nicolas Goaziou
and has been tested for quite some time. It is now part of Org's
core and many core functions rely on this package.
Two functions might be particularily handy for users:
Two functions might be particularly handy for users:
=org-element-at-point= and =org-element-context=.
See the docstrings for more details.
@ -539,7 +539,7 @@ supported.
**** =:results org= now put results in a =#+BEGIN_SRC org= block
=:results org= used to put results in a =#+BEGIN_ORG= block but it now puts
results in a =#+BEGIN_SRC org= block, wich comma-escaped lines.
results in a =#+BEGIN_SRC org= block, with comma-escaped lines.
=#+BEGIN_ORG= blocks are obsolete.
@ -552,7 +552,7 @@ It used to exports the results of the code.
**** New menu entry for [[doc::org-refile][org-refile]]
**** Allow capturing to encrypted entries
If you capture to an encrypted entry, it will be decrpyted before
If you capture to an encrypted entry, it will be decrypted before
inserting the template then re-encrypted after finalizing the capture.
**** Inactive timestamps are now handled in tables
@ -932,7 +932,7 @@ that Calc formulas can operate on them.
**** org-gnus.el now allows link creation from messages
You can now create links from messages. This is particularily
You can now create links from messages. This is particularly
useful when the user wants to stored messages that he sends, for
later check. Thanks to Ulf Stegemann for the patch.
@ -1115,7 +1115,7 @@ that Calc formulas can operate on them.
*** Completion
**** In-buffer completion is now done using John Wiegleys pcomplete.el
**** In-buffer completion is now done using John Wiegley's pcomplete.el
Thanks to John Wiegley for much of this code.

2
etc/charsets/CNS-2.map
View file

@ -1,4 +1,4 @@
# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt.gz which is a copy of
# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt which is a copy of
# http://kanji-database.cvs.sourceforge.net/viewvc/*checkout*/kanji-database/kanji-database/data/cns2ucsdkw.txt?revision=1.4
0x2121 0x4E42
0x2122 0x4E5C

2
etc/charsets/CNS-3.map
View file

@ -1,4 +1,4 @@
# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt.gz which is a copy of
# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt which is a copy of
# http://kanji-database.cvs.sourceforge.net/viewvc/*checkout*/kanji-database/kanji-database/data/cns2ucsdkw.txt?revision=1.4
0x2121 0x4E28
0x2122 0x4E36

2
etc/charsets/CNS-4.map
View file

@ -1,4 +1,4 @@
# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt.gz which is a copy of
# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt which is a copy of
# http://kanji-database.cvs.sourceforge.net/viewvc/*checkout*/kanji-database/kanji-database/data/cns2ucsdkw.txt?revision=1.4
0x2121 0x20086
0x2122-0x2123 0x4E40

2
etc/charsets/CNS-5.map
View file

@ -1,4 +1,4 @@
# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt.gz which is a copy of
# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt which is a copy of
# http://kanji-database.cvs.sourceforge.net/viewvc/*checkout*/kanji-database/kanji-database/data/cns2ucsdkw.txt?revision=1.4
0x2121 0x200D1
0x2122 0x200CB

2
etc/charsets/CNS-6.map
View file

@ -1,4 +1,4 @@
# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt.gz which is a copy of
# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt which is a copy of
# http://kanji-database.cvs.sourceforge.net/viewvc/*checkout*/kanji-database/kanji-database/data/cns2ucsdkw.txt?revision=1.4
0x2121 0x2F802
0x2122 0x20062

2
etc/charsets/CNS-7.map
View file

@ -1,4 +1,4 @@
# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt.gz which is a copy of
# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt which is a copy of
# http://kanji-database.cvs.sourceforge.net/viewvc/*checkout*/kanji-database/kanji-database/data/cns2ucsdkw.txt?revision=1.4
0x2121 0x20055
0x2122 0x20182

2
etc/charsets/CP932-2BYTE.map
View file

@ -1,4 +1,4 @@
# Generated from admin/charsets/mapfiles/CP932.TXT.gz which is a copy of
# Generated from admin/charsets/mapfiles/CP932.TXT which is a copy of
# http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP932.TXT
0x8140 0x3000 # 0 2121
0x8141 0x3001 # 0 2122

23
etc/charsets/GB180302.map
View file

@ -2048,20 +2048,17 @@
0xA6B9-0xA6C0 0xE785
0xA6C1-0xA6D1 0x03B1
0xA6D2-0xA6D8 0x03C3
0xA6D9 0xFE10
0xA6DA 0xFE12
0xA6DB 0xFE11
0xA6DC-0xA6DF 0xFE13
0xA6D9-0xA6DF 0xE78D
0xA6E0-0xA6E1 0xFE35
0xA6E2-0xA6E3 0xFE39
0xA6E4-0xA6E5 0xFE3F
0xA6E6-0xA6E7 0xFE3D
0xA6E8-0xA6EB 0xFE41
0xA6EC-0xA6ED 0xFE17
0xA6EC-0xA6ED 0xE794
0xA6EE-0xA6EF 0xFE3B
0xA6F0-0xA6F1 0xFE37
0xA6F2 0xFE31
0xA6F3 0xFE19
0xA6F3 0xE796
0xA6F4-0xA6F5 0xFE33
0xA6F6-0xA6FE 0xE797
0xA740-0xA77E 0xE706
@ -10396,7 +10393,7 @@
0xFE56 0x3447
0xFE57 0x2E88
0xFE58 0x2E8B
0xFE59 0x9FB4
0xFE59 0xE81E
0xFE5A 0x359E
0xFE5B 0x361A
0xFE5C 0x360E
@ -10404,18 +10401,18 @@
0xFE5E 0x2E97
0xFE5F 0x396E
0xFE60 0x3918
0xFE61 0x9FB5
0xFE61 0xE826
0xFE62 0x39CF
0xFE63 0x39DF
0xFE64 0x3A73
0xFE65 0x39D0
0xFE66-0xFE67 0x9FB6
0xFE66-0xFE67 0xE82B
0xFE68 0x3B4E
0xFE69 0x3C6E
0xFE6A 0x3CE0
0xFE6B 0x2EA7
0xFE6C 0x000215D7
0xFE6D 0x9FB8
0xFE6D 0xE832
0xFE6E 0x2EAA
0xFE6F 0x4056
0xFE70 0x415F
@ -10431,7 +10428,7 @@
0xFE7B 0x44D6
0xFE7C 0x4661
0xFE7D 0x464C
0xFE7E 0x9FB9
0xFE7E 0xE843
0xFE80 0x4723
0xFE81 0x4729
0xFE82 0x477C
@ -10446,7 +10443,7 @@
0xFE8D 0x499B
0xFE8E 0x49B7
0xFE8F 0x49B6
0xFE90 0x9FBA
0xFE90 0xE854
0xFE91 0x000241FE
0xFE92 0x4CA3
0xFE93-0xFE95 0x4C9F
@ -10454,5 +10451,5 @@
0xFE97 0x4CA2
0xFE98-0xFE9E 0x4D13
0xFE9F 0x4DAE
0xFEA0 0x9FBB
0xFEA0 0xE864
0xFEA1-0xFEFE 0xE468

329
etc/charsets/GB180304.map
View file

@ -41,171 +41,166 @@
0x8130D135-0x8130D238 0x0402
0x8130D239 0x0450
0x8130D330-0x8135F436 0x0452
0x8135F438-0x8136A531 0x1E40
0x8136A532-0x8136A533 0x2011
0x8136A534 0x2017
0x8136A535-0x8136A536 0x201A
0x8136A537-0x8136A633 0x201E
0x8136A634-0x8136A732 0x2027
0x8136A733 0x2031
0x8136A734 0x2034
0x8136A735-0x8136A739 0x2036
0x8136A830-0x8136B331 0x203C
0x8136B332-0x8136BB37 0x20AD
0x8136BB38 0x2104
0x8136BB39-0x8136BC31 0x2106
0x8136BC32-0x8136BD33 0x210A
0x8136BD34-0x8136BE33 0x2117
0x8136BE34-0x8136C435 0x2122
0x8136C436-0x8136C439 0x216C
0x8136C530-0x8136C731 0x217A
0x8136C732-0x8136C733 0x2194
0x8136C734-0x8136D233 0x219A
0x8136D234-0x8136D239 0x2209
0x8136D330 0x2210
0x8136D331-0x8136D333 0x2212
0x8136D334-0x8136D337 0x2216
0x8136D338-0x8136D339 0x221B
0x8136D430-0x8136D431 0x2221
0x8136D432 0x2224
0x8136D433 0x2226
0x8136D434-0x8136D435 0x222C
0x8136D436-0x8136D530 0x222F
0x8136D531-0x8136D535 0x2238
0x8136D536-0x8136D635 0x223E
0x8136D636-0x8136D638 0x2249
0x8136D639-0x8136D733 0x224D
0x8136D734-0x8136D836 0x2253
0x8136D837-0x8136D838 0x2262
0x8136D839-0x8136D934 0x2268
0x8136D935-0x8136DD31 0x2270
0x8136DD32-0x8136DD34 0x2296
0x8136DD35-0x8136DE35 0x229A
0x8136DE36-0x8136E130 0x22A6
0x8136E131-0x8136E932 0x22C0
0x8136E933-0x81378C35 0x2313
0x81378C36-0x81378D35 0x246A
0x81378D36-0x81379735 0x249C
0x81379736-0x81379739 0x254C
0x81379830-0x81379932 0x2574
0x81379933-0x81379935 0x2590
0x81379936-0x81379A35 0x2596
0x81379A36-0x81379C31 0x25A2
0x81379C32-0x81379C39 0x25B4
0x81379D30-0x81379D37 0x25BE
0x81379D38-0x81379E30 0x25C8
0x81379E31-0x81379E32 0x25CC
0x81379E33-0x8137A030 0x25D0
0x8137A031-0x8137A331 0x25E6
0x8137A332-0x8137A333 0x2607
0x8137A334-0x8137A837 0x260A
0x8137A838 0x2641
0x8137A839-0x8138FD38 0x2643
0x8138FD39-0x8138FE30 0x2E82
0x8138FE31-0x8138FE33 0x2E85
0x8138FE34-0x8138FE35 0x2E89
0x8138FE36-0x81398135 0x2E8D
0x81398136-0x81398330 0x2E98
0x81398331-0x81398332 0x2EA8
0x81398333-0x81398335 0x2EAB
0x81398336-0x81398339 0x2EAF
0x81398430-0x81398431 0x2EB4
0x81398432-0x81398434 0x2EB8
0x81398435-0x81398538 0x2EBC
0x81398539-0x8139A331 0x2ECB
0x8139A332-0x8139A335 0x2FFC
0x8139A336 0x3004
0x8139A337-0x8139A431 0x3018
0x8139A432-0x8139A433 0x301F
0x8139A434-0x8139A633 0x302A
0x8139A634-0x8139A635 0x303F
0x8139A636-0x8139A732 0x3094
0x8139A733-0x8139A734 0x309F
0x8139A735-0x8139A739 0x30F7
0x8139A830-0x8139A835 0x30FF
0x8139A836-0x8139C131 0x312A
0x8139C132-0x8139C138 0x322A
0x8139C139-0x8139CD31 0x3232
0x8139CD32-0x8139E435 0x32A4
0x8139E436-0x8139E537 0x3390
0x8139E538-0x8139E539 0x339F
0x8139E630-0x8139E933 0x33A2
0x8139E934-0x8139EA32 0x33C5
0x8139EA33-0x8139EA34 0x33CF
0x8139EA35-0x8139EA36 0x33D3
0x8139EA37-0x8139F539 0x33D6
0x8139F630-0x8139FA32 0x3448
0x8139FA33-0x82309A30 0x3474
0x82309A31-0x8230A531 0x359F
0x8230A532-0x8230A632 0x360F
0x8230A633-0x8230F237 0x361B
0x8230F238-0x8230FB32 0x3919
0x8230FB33-0x82318638 0x396F
0x82318639-0x82318832 0x39D1
0x82318833-0x82319639 0x39E0
0x82319730-0x8231AC37 0x3A74
0x8231AC38-0x8231C934 0x3B4F
0x8231C935-0x8231D437 0x3C6F
0x8231D438-0x8232AF32 0x3CE1
0x8232AF33-0x8232C936 0x4057
0x8232C937-0x8232F837 0x4160
0x8232F838-0x82338633 0x4338
0x82338634-0x82338637 0x43AD
0x82338638-0x82338B30 0x43B2
0x82338B31-0x8233A338 0x43DE
0x8233A339-0x8233C931 0x44D7
0x8233C932-0x8233CB31 0x464D
0x8233CB32-0x8233DE34 0x4662
0x8233DE35-0x8233DE39 0x4724
0x8233DF30-0x8233E731 0x472A
0x8233E732-0x8233E837 0x477D
0x8233E838-0x82349638 0x478E
0x82349639-0x82349B38 0x4948
0x82349B39-0x82349C30 0x497B
0x82349C31-0x82349C34 0x497E
0x82349C35 0x4984
0x82349C36-0x82349E35 0x4987
0x82349E36-0x82349E38 0x499C
0x82349E39-0x8234A130 0x49A0
0x8234A131-0x8234E733 0x49B8
0x8234E734-0x8234EB32 0x4C78
0x8234EB33-0x8234F633 0x4CA4
0x8234F634-0x82358731 0x4D1A
0x82358732-0x82358F32 0x4DAF
0x82358F33-0x82359036 0x9FA6
0x82359135-0x8336C738 0x9FBC
0x8336C739 0xE76C
0x8135F437 0xE7C7
0x8336C830 0xE7C8
0x8135F437-0x8136A530 0x1E40
0x8136A531-0x8136A532 0x2011
0x8136A533 0x2017
0x8136A534-0x8136A535 0x201A
0x8136A536-0x8136A632 0x201E
0x8136A633-0x8136A731 0x2027
0x8136A732 0x2031
0x8136A733 0x2034
0x8136A734-0x8136A738 0x2036
0x8136A739-0x8136B330 0x203C
0x8136B331-0x8136BB36 0x20AD
0x8136BB37 0x2104
0x8136BB38-0x8136BC30 0x2106
0x8136BC31-0x8136BD32 0x210A
0x8136BD33-0x8136BE32 0x2117
0x8136BE33-0x8136C434 0x2122
0x8136C435-0x8136C438 0x216C
0x8136C439-0x8136C730 0x217A
0x8136C731-0x8136C732 0x2194
0x8136C733-0x8136D232 0x219A
0x8136D233-0x8136D238 0x2209
0x8136D239 0x2210
0x8136D330-0x8136D332 0x2212
0x8136D333-0x8136D336 0x2216
0x8136D337-0x8136D338 0x221B
0x8136D339-0x8136D430 0x2221
0x8136D431 0x2224
0x8136D432 0x2226
0x8136D433-0x8136D434 0x222C
0x8136D435-0x8136D439 0x222F
0x8136D530-0x8136D534 0x2238
0x8136D535-0x8136D634 0x223E
0x8136D635-0x8136D637 0x2249
0x8136D638-0x8136D732 0x224D
0x8136D733-0x8136D835 0x2253
0x8136D836-0x8136D837 0x2262
0x8136D838-0x8136D933 0x2268
0x8136D934-0x8136DD30 0x2270
0x8136DD31-0x8136DD33 0x2296
0x8136DD34-0x8136DE34 0x229A
0x8136DE35-0x8136E039 0x22A6
0x8136E130-0x8136E931 0x22C0
0x8136E932-0x81378C34 0x2313
0x81378C35-0x81378D34 0x246A
0x81378D35-0x81379734 0x249C
0x81379735-0x81379738 0x254C
0x81379739-0x81379931 0x2574
0x81379932-0x81379934 0x2590
0x81379935-0x81379A34 0x2596
0x81379A35-0x81379C30 0x25A2
0x81379C31-0x81379C38 0x25B4
0x81379C39-0x81379D36 0x25BE
0x81379D37-0x81379D39 0x25C8
0x81379E30-0x81379E31 0x25CC
0x81379E32-0x81379F39 0x25D0
0x8137A030-0x8137A330 0x25E6
0x8137A331-0x8137A332 0x2607
0x8137A333-0x8137A836 0x260A
0x8137A837 0x2641
0x8137A838-0x8138FD37 0x2643
0x8138FD38-0x8138FD39 0x2E82
0x8138FE30-0x8138FE32 0x2E85
0x8138FE33-0x8138FE34 0x2E89
0x8138FE35-0x81398134 0x2E8D
0x81398135-0x81398239 0x2E98
0x81398330-0x81398331 0x2EA8
0x81398332-0x81398334 0x2EAB
0x81398335-0x81398338 0x2EAF
0x81398339-0x81398430 0x2EB4
0x81398431-0x81398433 0x2EB8
0x81398434-0x81398537 0x2EBC
0x81398538-0x8139A330 0x2ECB
0x8139A331-0x8139A334 0x2FFC
0x8139A335 0x3004
0x8139A336-0x8139A430 0x3018
0x8139A431-0x8139A432 0x301F
0x8139A433-0x8139A632 0x302A
0x8139A633-0x8139A634 0x303F
0x8139A635-0x8139A731 0x3094
0x8139A732-0x8139A733 0x309F
0x8139A734-0x8139A738 0x30F7
0x8139A739-0x8139A834 0x30FF
0x8139A835-0x8139C130 0x312A
0x8139C131-0x8139C137 0x322A
0x8139C138-0x8139CD30 0x3232
0x8139CD31-0x8139E434 0x32A4
0x8139E435-0x8139E536 0x3390
0x8139E537-0x8139E538 0x339F
0x8139E539-0x8139E932 0x33A2
0x8139E933-0x8139EA31 0x33C5
0x8139EA32-0x8139EA33 0x33CF
0x8139EA34-0x8139EA35 0x33D3
0x8139EA36-0x8139F538 0x33D6
0x8139F539-0x8139FA31 0x3448
0x8139FA32-0x82309939 0x3474
0x82309A30-0x8230A530 0x359F
0x8230A531-0x8230A631 0x360F
0x8230A632-0x8230F236 0x361B
0x8230F237-0x8230FB31 0x3919
0x8230FB32-0x82318637 0x396F
0x82318638-0x82318831 0x39D1
0x82318832-0x82319638 0x39E0
0x82319639-0x8231AC36 0x3A74
0x8231AC37-0x8231C933 0x3B4F
0x8231C934-0x8231D436 0x3C6F
0x8231D437-0x8232AF31 0x3CE1
0x8232AF32-0x8232C935 0x4057
0x8232C936-0x8232F836 0x4160
0x8232F837-0x82338632 0x4338
0x82338633-0x82338636 0x43AD
0x82338637-0x82338A39 0x43B2
0x82338B30-0x8233A337 0x43DE
0x8233A338-0x8233C930 0x44D7
0x8233C931-0x8233CB30 0x464D
0x8233CB31-0x8233DE33 0x4662
0x8233DE34-0x8233DE38 0x4724
0x8233DE39-0x8233E730 0x472A
0x8233E731-0x8233E836 0x477D
0x8233E837-0x82349637 0x478E
0x82349638-0x82349B37 0x4948
0x82349B38-0x82349B39 0x497B
0x82349C30-0x82349C33 0x497E
0x82349C34 0x4984
0x82349C35-0x82349E34 0x4987
0x82349E35-0x82349E37 0x499C
0x82349E38-0x8234A039 0x49A0
0x8234A130-0x8234E732 0x49B8
0x8234E733-0x8234EB31 0x4C78
0x8234EB32-0x8234F632 0x4CA4
0x8234F633-0x82358730 0x4D1A
0x82358731-0x82358F31 0x4DAF
0x82358F32-0x8336C737 0x9FA6
0x8336C738 0xE76C
0x8336C739-0x8336C830 0xE7C7
0x8336C831-0x8336C933 0xE7E7
0x8336C934 0xE815
0x8336C935-0x8336C939 0xE819
0x8336CA30-0x8336CA36 0xE81F
0x8336CA37-0x8336CB30 0xE827
0x8336CB31-0x8336CB34 0xE82D
0x8336CB35-0x8336CC32 0xE833
0x8336CC33-0x8336CC39 0xE83C
0x8336CD30-0x8336CE35 0xE844
0x8336CE36-0x8336CF39 0xE856
0x8336D030-0x84308534 0xE865
0x84308535-0x84308D30 0xF92D
0x84308D31-0x84308F37 0xF97A
0x84308F38-0x84309738 0xF996
0x84309739-0x84309837 0xF9E8
0x84309838-0x84309B33 0xF9F2
0x84309B34 0xFA10
0x84309B35 0xFA12
0x84309B36-0x84309B38 0xFA15
0x84309B39-0x84309C34 0xFA19
0x84309C35 0xFA22
0x84309C36-0x84309C37 0xFA25
0x84309C38-0x84318235 0xFA2A
0x84318336-0x84318537 0xFE1A
0x84318538 0xFE32
0x84318539-0x84318632 0xFE45
0x84318633 0xFE53
0x84318634 0xFE58
0x84318635 0xFE67
0x84318636-0x84319534 0xFE6C
0x84319535-0x8431A233 0xFF5F
0x8431A234-0x8431A439 0xFFE6
0x8336C934-0x8336CA32 0xE815
0x8336CA33-0x8336CA39 0xE81F
0x8336CB30-0x8336CB33 0xE827
0x8336CB34-0x8336CB38 0xE82D
0x8336CB39-0x8336CD34 0xE833
0x8336CD35-0x8336CF30 0xE844
0x8336CF31-0x8336D035 0xE855
0x8336D036-0x84308630 0xE865
0x84308631-0x84308D36 0xF92D
0x84308D37-0x84309033 0xF97A
0x84309034-0x84309834 0xF996
0x84309835-0x84309933 0xF9E8
0x84309934-0x84309B39 0xF9F2
0x84309C30 0xFA10
0x84309C31 0xFA12
0x84309C32-0x84309C34 0xFA15
0x84309C35-0x84309D30 0xFA19
0x84309D31 0xFA22
0x84309D32-0x84309D33 0xFA25
0x84309D34-0x84318633 0xFA2A
0x84318634 0xFE32
0x84318635-0x84318638 0xFE45
0x84318639 0xFE53
0x84318730 0xFE58
0x84318731 0xFE67
0x84318732-0x84319630 0xFE6C
0x84319631-0x8431A239 0xFF5F
0x8431A330-0x8431A535 0xFFE6

9
etc/charsets/JISC6226.map
View file

@ -1,4 +1,4 @@
# Generated from admin/charsets/mapfiles/Uni2JIS.gz which is a copy of
# Generated from admin/charsets/mapfiles/Uni2JIS which is a copy of
# http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/CJKtable/Uni2JIS.Z
0x2121 0x3000
0x2122 0x3001
@ -31,7 +31,7 @@
0x213D 0x2014
0x213E 0x2010
0x213F 0xFF0F
0x2140 0x005C
0x2140 0xFF3C
0x2141 0x301C
0x2142 0x2016
0x2143 0xFF5C
@ -6797,3 +6797,8 @@
0x737C 0x9F95
0x737D 0x9F9C
0x737E 0x9FA0
0x3442 0x3D4E
0x374E 0x25874
0x3764 0x28EF6
0x513D 0x2F80F
0x7045 0x9724

10
etc/charsets/JISX2131.map
View file

@ -1157,7 +1157,6 @@
0x2d79 0x22BF
0x2d7d 0x2756
0x2d7e 0x261E
0x2e21 0x4FF1
0x2e22 0x0002000B
0x2e23 0x3402
0x2e24 0x4E28
@ -1344,7 +1343,6 @@
0x2f7b 0x000218BD
0x2f7c 0x5B19
0x2f7d 0x5B25
0x2f7e 0x525D
0x3021 0x4E9C
0x3022 0x5516
0x3023 0x5A03
@ -4310,7 +4308,6 @@
0x4f51 0x6E7E
0x4f52 0x7897
0x4f53 0x8155
0x4f54 0x00020B9F
0x4f55 0x5B41
0x4f56 0x5B56
0x4f57 0x5B7D
@ -4352,7 +4349,6 @@
0x4f7b 0x5DA7
0x4f7c 0x5DB8
0x4f7d 0x5DCB
0x4f7e 0x541E
0x5021 0x5F0C
0x5022 0x4E10
0x5023 0x4E15
@ -7743,7 +7739,6 @@
0x7424 0x7464
0x7425 0x51DC
0x7426 0x7199
0x7427 0x5653
0x7428 0x5DE2
0x7429 0x5E14
0x742a 0x5E18
@ -8766,8 +8761,3 @@
0x7e77 0x9F94
0x7e78 0x9F97
0x7e79 0x9FA2
0x7e7a 0x59F8
0x7e7b 0x5C5B
0x7e7c 0x5E77
0x7e7d 0x7626
0x7e7e 0x7E6B

2
etc/charsets/MIK.map
View file

@ -1,4 +1,4 @@
# Generated from admin/charsets/mapfiles/bulgarian-mik.txt.gz which is a copy of
# Generated from admin/charsets/mapfiles/bulgarian-mik.txt which is a copy of
# http://czyborra.com/charsets/bulgarian-mik.txt.gz
0x20-0x7E 0x0020
0x80-0xBF 0x0410

2
etc/charsets/PTCP154.map
View file

@ -1,4 +1,4 @@
# Generated from admin/charsets/mapfiles/PTCP154.gz which is a copy of
# Generated from admin/charsets/mapfiles/PTCP154 which is a copy of
# http://www.iana.org/assignments/charset-reg/PTCP154
0x00-0x7F 0x0000
0x80 0x0496

2
etc/charsets/stdenc.map
View file

@ -1,4 +1,4 @@
# Generated from admin/charsets/mapfiles/stdenc.txt.gz which is a copy of
# Generated from admin/charsets/mapfiles/stdenc.txt which is a copy of
# http://www.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/stdenc.txt
0xFB 0x00DF
0xFA 0x0153

2
etc/charsets/symbol.map
View file

@ -1,4 +1,4 @@
# Generated from admin/charsets/mapfiles/symbol.txt.gz which is a copy of
# Generated from admin/charsets/mapfiles/symbol.txt which is a copy of
# http://www.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/symbol.txt
0xFE 0xF8FE
0xFD 0xF8FD

7
etc/compilation.txt
View file

@ -308,6 +308,13 @@ made it more strict about the error message that follows.
keyboard handler.c(537) : warning C4005: 'min' : macro redefinition
d:\tmp\test.c(23) : error C2143: syntax error : missing ';' before 'if'
d:\tmp\test.c(1145) : see declaration of 'nsRefPtr'
1>test_main.cpp(29): error C2144: syntax error : 'int' should be preceded by ';'
1>test_main.cpp(29): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
1>
1>Build FAILED.
1>
1>Time Elapsed 00:00:01.46
========== Build: 0 succeeded, 1 failed, 0 up-to-date, 0 skipped ==========
* Open Watcom

2
etc/tutorials/TUTORIAL.pt_BR
View file

@ -46,7 +46,7 @@ META, EDIT ou ALT).
Os comandos a seguir são úteis para visualizar telas inteiras
C-v Move para tela inteira posterior
M-x Move para tela inteira anterior
M-v Move para tela inteira anterior
C-l Limpa a tela e re-mostrá todo o texto, movendo o texto ao
redor do cursor para o centro da tela. (Isso é
control-L, não control-1.)

2
etc/tutorials/TUTORIAL.ru
View file

@ -406,7 +406,7 @@ C-k удалит две строки, а также завершающие их
текста). Вы можете восстановить убитый текст в месте удаления или в любой
другой точке редактируемого текста или даже в другом файле. Вы можете
восстановить текст несколько раз и получить несколько копий данного текста.
Некоторые редактора называют операции "убить" и "восстановить" как
Некоторые редакторы называют операции "убить" и "восстановить" иначе:
"вырезать" (cutting) и "вставить" (pasting) (ознакомьтесь с глоссарием
(Glossary) в руководстве по Emacs).

41
lib-src/ChangeLog
View file

@ -1,3 +1,44 @@
2012-10-20 Eli Zaretskii <eliz@gnu.org>
* make-docfile.c (IS_SLASH, DEF_ELISP_FILE): New macros.
(scan_lisp_file): Only pass a .el file if its basename matches a
known file in its entirety. Use IS_SLASH and DEF_ELISP_FILE.
2012-10-20 Andreas Schwab <schwab@linux-m68k.org>
* make-docfile.c (scan_lisp_file): Add bounds checking.
2012-10-20 Eli Zaretskii <eliz@gnu.org>
Prevent silent omission of doc strings from uncompiled Lisp files.
* make-docfile.c (scan_lisp_file): Barf if called with a .el file
other than one of a small list of supported un-compiled files.
* makefile.w32-in (lisp1, lisp2): Name .elc files wherever they
exist. (Bug#12395)
2012-10-17 Eli Zaretskii <eliz@gnu.org>
* ntlib.c: Include <mbstring.h>, to avoid compiler warning about
_mbspbrk.
2012-10-08 Eli Zaretskii <eliz@gnu.org>
* makefile.w32-in (obj): Add cygw32.o.
2012-10-08 Daniel Colascione <dancol@dancol.org>
* emacsclient.c: Include windows.h when HAVE_NTGUI.
(alt_display): New variable. We send the display held by this
variable when the primary display is either unsupported or not
present.
(longopts): Allow display everywhere.
(w32_set_user_model_id): Move lower in file, inside HAVE_NTGUI
section.
(decode_options): Use alt_display. Explain why.
(main): Retry connection with alt_display if connection with main
display fails.
2012-10-01 Fabrice Popineau <fabrice.popineau@gmail.com>
* make-docfile.c (write_globals): Special-case

198
lib-src/emacsclient.c
View file

@ -44,6 +44,10 @@ char *w32_getenv (char *);
#else /* !WINDOWSNT */
# ifdef HAVE_NTGUI
# include <windows.h>
# endif /* HAVE_NTGUI */
# include "syswait.h"
# ifdef HAVE_INET_SOCKETS
@ -140,6 +144,9 @@ int current_frame = 1;
/* The display on which Emacs should work. --display. */
const char *display = NULL;
/* The alternate display we should try if Emacs does not support display. */
const char *alt_display = NULL;
/* The parent window ID, if we are opening a frame via XEmbed. */
char *parent_id = NULL;
@ -182,9 +189,7 @@ struct option longopts[] =
{ "socket-name", required_argument, NULL, 's' },
#endif
{ "server-file", required_argument, NULL, 'f' },
#ifndef WINDOWSNT
{ "display", required_argument, NULL, 'd' },
#endif
{ "parent-id", required_argument, NULL, 'p' },
{ 0, 0, 0, 0 }
};
@ -385,32 +390,6 @@ w32_getenv (char *envvar)
return NULL;
}
void
w32_set_user_model_id (void)
{
HMODULE shell;
HRESULT (WINAPI * set_user_model) (wchar_t * id);
/* On Windows 7 and later, we need to set the user model ID
to associate emacsclient launched files with Emacs frames
in the UI. */
shell = LoadLibrary ("shell32.dll");
if (shell)
{
set_user_model
= (void *) GetProcAddress (shell,
"SetCurrentProcessExplicitAppUserModelID");
/* If the function is defined, then we are running on Windows 7
or newer, and the UI uses this to group related windows
together. Since emacs, runemacs, emacsclient are related, we
want them grouped even though the executables are different,
so we need to set a consistent ID between them. */
if (set_user_model)
set_user_model (L"GNU.Emacs");
FreeLibrary (shell);
}
}
int
w32_window_app (void)
@ -605,16 +584,29 @@ decode_options (int argc, char **argv)
Without the -c option, we used to set `display' to $DISPLAY by
default, but this changed the default behavior and is sometimes
inconvenient. So we force users to use "--display $DISPLAY" if
they want Emacs to connect to their current display. */
they want Emacs to connect to their current display.
Some window systems have a notion of default display not
reflected in the DISPLAY variable. If the user didn't give us an
explicit display, try this platform-specific after trying the
display in DISPLAY (if any). */
if (!current_frame && !tty && !display)
{
display = egetenv ("DISPLAY");
#ifdef NS_IMPL_COCOA
/* Under Cocoa, we don't really use displays the same way as in X,
so provide a dummy. */
if (!display || strlen (display) == 0)
display = "ns";
/* Set these here so we use a default_display only when the user
didn't give us an explicit display. */
#if defined (NS_IMPL_COCOA)
alt_display = "ns";
#elif defined (HAVE_NTGUI)
alt_display = "w32";
#endif
display = egetenv ("DISPLAY");
}
if (!display)
{
display = alt_display;
alt_display = NULL;
}
/* A null-string display is invalid. */
@ -1415,10 +1407,37 @@ set_socket (int no_exit_if_error)
exit (EXIT_FAILURE);
}
#ifdef WINDOWSNT
#ifdef HAVE_NTGUI
FARPROC set_fg; /* Pointer to AllowSetForegroundWindow. */
FARPROC get_wc; /* Pointer to RealGetWindowClassA. */
void
w32_set_user_model_id (void)
{
HMODULE shell;
HRESULT (WINAPI * set_user_model) (wchar_t * id);
/* On Windows 7 and later, we need to set the user model ID
to associate emacsclient launched files with Emacs frames
in the UI. */
shell = LoadLibrary ("shell32.dll");
if (shell)
{
set_user_model
= (void *) GetProcAddress (shell,
"SetCurrentProcessExplicitAppUserModelID");
/* If the function is defined, then we are running on Windows 7
or newer, and the UI uses this to group related windows
together. Since emacs, runemacs, emacsclient are related, we
want them grouped even though the executables are different,
so we need to set a consistent ID between them. */
if (set_user_model)
set_user_model (L"GNU.Emacs");
FreeLibrary (shell);
}
}
BOOL CALLBACK
w32_find_emacs_process (HWND hWnd, LPARAM lParam)
{
@ -1467,7 +1486,7 @@ w32_give_focus (void)
&& (get_wc = GetProcAddress (user32, "RealGetWindowClassA")))
EnumWindows (w32_find_emacs_process, (LPARAM) 0);
}
#endif
#endif /* HAVE_NTGUI */
/* Start the emacs daemon and try to connect to it. */
@ -1537,11 +1556,13 @@ main (int argc, char **argv)
main_argv = argv;
progname = argv[0];
#ifdef WINDOWSNT
/* On Windows 7 and later, we need to explicitly associate emacsclient
with emacs so the UI behaves sensibly. */
#ifdef HAVE_NTGUI
/* On Windows 7 and later, we need to explicitly associate
emacsclient with emacs so the UI behaves sensibly. This
association does no harm if we're not actually connecting to an
Emacs using a window display. */
w32_set_user_model_id ();
#endif
#endif /* HAVE_NTGUI */
/* Process options. */
decode_options (argc, argv);
@ -1577,9 +1598,10 @@ main (int argc, char **argv)
fail ();
}
#ifdef WINDOWSNT
#ifdef HAVE_NTGUI
if (display && !strcmp (display, "w32"))
w32_give_focus ();
#endif
#endif /* HAVE_NTGUI */
/* Send over our environment and current directory. */
if (!current_frame)
@ -1748,46 +1770,56 @@ main (int argc, char **argv)
if (end_p != NULL)
*end_p++ = '\0';
if (strprefix ("-emacs-pid ", p))
{
/* -emacs-pid PID: The process id of the Emacs process. */
emacs_pid = strtol (p + strlen ("-emacs-pid"), NULL, 10);
}
else if (strprefix ("-window-system-unsupported ", p))
{
/* -window-system-unsupported: Emacs was compiled without X
support. Try again on the terminal. */
nowait = 0;
tty = 1;
goto retry;
}
else if (strprefix ("-print ", p))
{
/* -print STRING: Print STRING on the terminal. */
str = unquote_argument (p + strlen ("-print "));
if (needlf)
printf ("\n");
printf ("%s", str);
needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n';
}
else if (strprefix ("-print-nonl ", p))
{
/* -print-nonl STRING: Print STRING on the terminal.
Used to continue a preceding -print command. */
str = unquote_argument (p + strlen ("-print-nonl "));
printf ("%s", str);
needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n';
}
else if (strprefix ("-error ", p))
{
/* -error DESCRIPTION: Signal an error on the terminal. */
str = unquote_argument (p + strlen ("-error "));
if (needlf)
printf ("\n");
fprintf (stderr, "*ERROR*: %s", str);
needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n';
exit_status = EXIT_FAILURE;
}
if (strprefix ("-emacs-pid ", p))
{
/* -emacs-pid PID: The process id of the Emacs process. */
emacs_pid = strtol (p + strlen ("-emacs-pid"), NULL, 10);
}
else if (strprefix ("-window-system-unsupported ", p))
{
/* -window-system-unsupported: Emacs was compiled without support
for whatever window system we tried. Try the alternate
display, or, failing that, try the terminal. */
if (alt_display)
{
display = alt_display;
alt_display = NULL;
}
else
{
nowait = 0;
tty = 1;
}
goto retry;
}
else if (strprefix ("-print ", p))
{
/* -print STRING: Print STRING on the terminal. */
str = unquote_argument (p + strlen ("-print "));
if (needlf)
printf ("\n");
printf ("%s", str);
needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n';
}
else if (strprefix ("-print-nonl ", p))
{
/* -print-nonl STRING: Print STRING on the terminal.
Used to continue a preceding -print command. */
str = unquote_argument (p + strlen ("-print-nonl "));
printf ("%s", str);
needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n';
}
else if (strprefix ("-error ", p))
{
/* -error DESCRIPTION: Signal an error on the terminal. */
str = unquote_argument (p + strlen ("-error "));
if (needlf)
printf ("\n");
fprintf (stderr, "*ERROR*: %s", str);
needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n';
exit_status = EXIT_FAILURE;
}
#ifdef SIGSTOP
else if (strprefix ("-suspend ", p))
{

41
lib-src/make-docfile.c
View file

@ -58,9 +58,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#undef chdir
#define READ_TEXT "rt"
#define READ_BINARY "rb"
#define IS_SLASH(c) ((c) == '/' || (c) == '\\' || (c) == ':')
#else /* not DOS_NT */
#define READ_TEXT "r"
#define READ_BINARY "r"
#define IS_SLASH(c) ((c) == '/')
#endif /* not DOS_NT */
static int scan_file (char *filename);
@ -1025,9 +1027,9 @@ scan_c_file (char *filename, const char *mode)
arglist, but the doc string must still have a backslash and newline
immediately after the double quote.
The only source files that must follow this convention are preloaded
uncompiled ones like loaddefs.el and bindings.el; aside
from that, it is always the .elc file that we look at, and they are no
problem because byte-compiler output follows this convention.
uncompiled ones like loaddefs.el; aside from that, it is always the .elc
file that we should look at, and they are no problem because byte-compiler
output follows this convention.
The NAME and DOCSTRING are output.
NAME is preceded by `F' for a function or `V' for a variable.
An entry is output only if DOCSTRING has \ newline just after the opening ".
@ -1098,15 +1100,48 @@ search_lisp_doc_at_eol (FILE *infile)
return 1;
}
#define DEF_ELISP_FILE(fn) { #fn, sizeof(#fn) - 1 }
static int
scan_lisp_file (const char *filename, const char *mode)
{
FILE *infile;
register int c;
char *saved_string = 0;
/* These are the only files that are loaded uncompiled, and must
follow the conventions of the doc strings expected by this
function. These conventions are automatically followed by the
byte compiler when it produces the .elc files. */
static struct {
const char *fn;
size_t fl;
} const uncompiled[] = {
DEF_ELISP_FILE (loaddefs.el),
DEF_ELISP_FILE (loadup.el),
DEF_ELISP_FILE (charprop.el)
};
int i, match;
size_t flen = strlen (filename);
if (generate_globals)
fatal ("scanning lisp file when -g specified", 0);
if (flen > 3 && !strcmp (filename + flen - 3, ".el"))
{
for (i = 0, match = 0; i < sizeof (uncompiled) / sizeof (uncompiled[0]);
i++)
{
if (uncompiled[i].fl <= flen
&& !strcmp (filename + flen - uncompiled[i].fl, uncompiled[i].fn)
&& (flen == uncompiled[i].fl
|| IS_SLASH (filename[flen - uncompiled[i].fl - 1])))
{
match = 1;
break;
}
}
if (!match)
fatal ("uncompiled lisp file %s is not supported", filename);
}
infile = fopen (filename, mode);
if (infile == NULL)

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

@ -124,7 +124,7 @@ $(BLD)/profile.exe: $(PROFILEOBJS)
obj = dosfns.o msdos.o \
xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
fontset.o menu.o \
w32.o w32console.o w32fns.o w32heap.o w32inevt.o \
w32.o w32console.o w32fns.o w32heap.o w32inevt.o cygw32.o \
w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \
font.o w32font.o w32uniscribe.o \
dispnew.o frame.o scroll.o xdisp.o window.o bidi.o \
@ -209,38 +209,38 @@ lisp1= \
$(lispsource)emacs-lisp/map-ynp.elc \
$(lispsource)menu-bar.elc \
$(lispsource)international/mule.elc \
$(lispsource)international/mule-conf.el \
$(lispsource)international/mule-conf.elc \
$(lispsource)international/mule-cmds.elc \
$(lispsource)international/characters.elc \
$(lispsource)international/charprop.el \
$(lispsource)case-table.elc
lisp2 = \
$(lispsource)language/chinese.el \
$(lispsource)language/cyrillic.el \
$(lispsource)language/indian.el \
$(lispsource)language/sinhala.el \
$(lispsource)language/english.el \
$(lispsource)language/chinese.elc \
$(lispsource)language/cyrillic.elc \
$(lispsource)language/indian.elc \
$(lispsource)language/sinhala.elc \
$(lispsource)language/english.elc \
$(lispsource)language/ethiopic.elc \
$(lispsource)language/european.elc \
$(lispsource)language/czech.el \
$(lispsource)language/slovak.el \
$(lispsource)language/romanian.el \
$(lispsource)language/greek.el \
$(lispsource)language/czech.elc \
$(lispsource)language/slovak.elc \
$(lispsource)language/romanian.elc \
$(lispsource)language/greek.elc \
$(lispsource)language/hebrew.elc \
$(lispsource)language/japanese.el \
$(lispsource)language/korean.el \
$(lispsource)language/lao.el \
$(lispsource)language/cham.el \
$(lispsource)language/tai-viet.el \
$(lispsource)language/thai.el \
$(lispsource)language/japanese.elc \
$(lispsource)language/korean.elc \
$(lispsource)language/lao.elc \
$(lispsource)language/cham.elc \
$(lispsource)language/tai-viet.elc \
$(lispsource)language/thai.elc \
$(lispsource)language/tibetan.elc \
$(lispsource)language/vietnamese.el \
$(lispsource)language/misc-lang.el \
$(lispsource)language/utf-8-lang.el \
$(lispsource)language/georgian.el \
$(lispsource)language/khmer.el \
$(lispsource)language/burmese.el \
$(lispsource)language/vietnamese.elc \
$(lispsource)language/misc-lang.elc \
$(lispsource)language/utf-8-lang.elc \
$(lispsource)language/georgian.elc \
$(lispsource)language/khmer.elc \
$(lispsource)language/burmese.elc \
$(lispsource)register.elc \
$(lispsource)replace.elc \
$(lispsource)simple.elc \
@ -266,7 +266,7 @@ lisp2 = \
$(WINDOW_SUPPORT) \
$(lispsource)widget.elc \
$(lispsource)window.elc \
$(lispsource)version.el
$(lispsource)version.elc
# This is needed the first time we build the tree, since temacs.exe
# does not exist yet, and the DOC rule needs it to rebuild DOC whenever

1
lib-src/ntlib.c
View file

@ -30,6 +30,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <errno.h>
#include <ctype.h>
#include <sys/timeb.h>
#include <mbstring.h>
#include "ntlib.h"

1
lib/gnulib.mk
View file

@ -857,6 +857,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
-e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \
-e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \
-e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
-e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \
-e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \
-e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
-e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \

34
lib/pselect.c
View file

@ -33,6 +33,8 @@
pointer parameter stands for no descriptors, an infinite timeout,
or an unaffected signal mask. */
#if !HAVE_PSELECT
int
pselect (int nfds, fd_set *restrict rfds,
fd_set *restrict wfds, fd_set *restrict xfds,
@ -74,3 +76,35 @@ pselect (int nfds, fd_set *restrict rfds,
return select_result;
}
#else /* HAVE_PSELECT */
# include <unistd.h>
# undef pselect
int
rpl_pselect (int nfds, fd_set *restrict rfds,
fd_set *restrict wfds, fd_set *restrict xfds,
struct timespec const *restrict timeout,
sigset_t const *restrict sigmask)
{
int i;
/* FreeBSD 8.2 has a bug: it does not always detect invalid fds. */
if (nfds < 0 || nfds > FD_SETSIZE)
{
errno = EINVAL;
return -1;
}
for (i = 0; i < nfds; i++)
{
if (((rfds && FD_ISSET (i, rfds))
|| (wfds && FD_ISSET (i, wfds))
|| (xfds && FD_ISSET (i, xfds)))
&& dup2 (i, i) != i)
return -1;
}
return pselect (nfds, rfds, wfds, xfds, timeout, sigmask);
}
#endif

13
lib/stdlib.in.h
View file

@ -457,10 +457,19 @@ _GL_WARN_ON_USE (posix_openpt, "posix_openpt is not portable - "
#if @GNULIB_PTSNAME@
/* Return the pathname of the pseudo-terminal slave associated with
the master FD is open on, or NULL on errors. */
# if !@HAVE_PTSNAME@
# if @REPLACE_PTSNAME@
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
# undef ptsname
# define ptsname rpl_ptsname
# endif
_GL_FUNCDECL_RPL (ptsname, char *, (int fd));
_GL_CXXALIAS_RPL (ptsname, char *, (int fd));
# else
# if !@HAVE_PTSNAME@
_GL_FUNCDECL_SYS (ptsname, char *, (int fd));
# endif
# endif
_GL_CXXALIAS_SYS (ptsname, char *, (int fd));
# endif
_GL_CXXALIASWARN (ptsname);
#elif defined GNULIB_POSIXCHECK
# undef ptsname

592
lisp/ChangeLog
View file

@ -1,3 +1,566 @@
2012-10-20 Chong Yidong <cyd@gnu.org>
* vc/vc.el (vc-diff-internal): Set up Diff mode even if there are
no changes to show (Bug#12586).
* eshell/esh-cmd.el (eshell-rewrite-for-command): Copy the body
list explicitly (Bug#12571).
2012-10-20 Arne Jørgensen <arne@arnested.dk>
* progmodes/flymake.el (flymake-create-temp-inplace): Use
file-truename.
2012-10-20 Eli Zaretskii <eliz@gnu.org>
* loadup.el: Update comment about uncompiled Lisp files. (Bug#12395)
2012-10-20 Jay Belanger <jay.p.belanger@gmail.com>
* calc/calc-units.el (math-extract-units): Properly extract powers
of units.
2012-10-20 Daniel Colascione <dancol@dancol.org>
* frame.el (make-frame): Set x-display-name as we used to in order
to unbreak creating an X11 frame from an Emacs daemon started
without a display.
2012-10-19 Stefan Monnier <monnier@iro.umontreal.ca>
* minibuffer.el (minibuffer-force-complete): Make the next completion use
the same completion-field (bug@12221).
2012-10-19 Martin Rudalics <rudalics@gmx.at>
* emacs-lisp/debug.el (debug): Record height of debugger window
also when debugger will be back (Bug#8789).
2012-10-18 Chong Yidong <cyd@gnu.org>
* progmodes/gdb-mi.el (gdb-display-buffer-other-frame-action):
Convert to defcustom.
(gdb-get-source-file): Don't bind pop-up-windows.
* progmodes/gud.el (gud-display-line): Don't specially re-use
other frames for the gdb-mi case (Bug#12648).
2012-10-18 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/advice.el: Clean up commentary a bit.
(ad-do-advised-functions, ad-with-originals): Use `declare'.
(byte-code-function-p): Never redefine.
* emacs-lisp/gv.el (cond): Same fix as before for `if'.
2012-10-18 Glenn Morris <rgm@gnu.org>
* dired.el (dired-sort-toggle): Some ls implementations only allow
a single option string. (Bug#12666)
* minibuffer.el (completion-cycle-threshold): Doc fix.
2012-10-17 Kenichi Handa <handa@gnu.org>
* international/mule.el (set-keyboard-coding-system):
Recover input meta mode when the new coding system doesn not use 8-bit.
Supply TERMINAL arg to set-input-meta-mode.
2012-10-17 Michael Heerdegen <michael_heerdegen@web.de> (tiny change)
* wdired.el (wdired-old-marks): New variable.
(wdired-change-to-wdired-mode): Locally set wdired-old-marks.
(wdired-do-renames): Move point with renamed file and don't lose
mark status (Bug#11795).
2012-10-16 Juri Linkov <juri@jurta.org>
* replace.el (query-replace-help): Mention multi-buffer replacement
keys in the Help message. (Bug#12655)
2012-10-15 Chong Yidong <cyd@gnu.org>
* emacs-lisp/byte-run.el (defsubst): Doc fix.
2012-10-14 Eli Zaretskii <eliz@gnu.org>
* window.el (display-buffer): Doc fix.
* progmodes/compile.el (compilation-error-regexp-alist-alist):
Adjust the msft regexp to the output of Studio 2010, and move msft
before edg-1. See the discussion on emacs-devel,
http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00579.html,
for the details.
2012-10-14 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/eieio.el (eieio-oset-default, eieio-oset, oset-default)
(oset): Move uses of object-class-fast macro after its definition.
* emacs-lisp/gv.el (if): Don't use closures in non-lexical-binding code.
2012-10-13 Chong Yidong <cyd@gnu.org>
* textmodes/ispell.el (ispell-pdict-save): If flyspell-mode is
enabled, re-enable it (Bug#11963).
2012-10-13 Martin Rudalics <rudalics@gmx.at>
* emacs-lisp/debug.el (debug): When debugger-will-be-back is
non-nil, restore window configuration (Bug#12623).
2012-10-12 Stefan Monnier <monnier@iro.umontreal.ca>
* help-fns.el (describe-variable, describe-function-1):
* help-mode.el (help-make-xrefs): Remove error handler, made unneeded.
* emacs-lisp/eieio.el (lisp-imenu-generic-expression): Fix typo.
2012-10-12 Glenn Morris <rgm@gnu.org>
* mail/rmailsum.el (rmail-header-summary):
Fix 2010-11-26 test for multiline Subject: field. (Bug#12625)
2012-10-12 Fabián Ezequiel Gallina <fgallina@cuca>
* progmodes/python.el (python-mode-map):
Replace subtitute-key-definition with proper command remapping.
(python-nav--up-list): Fix behavior for blocks on the same level.
2012-10-11 Stefan Monnier <monnier@iro.umontreal.ca>
* help-fns.el (describe-function-1): Handle autoloads w/o docstrings.
* emacs-lisp/bytecomp.el (byte-compile-eval): Adjust to long-ago
changes to the format of load-history.
* international/mule-cmds.el (read-char-by-name): Move let-binding of
completion-ignore-case in case that var is buffer-local (bug#12615).
2012-10-11 Kenichi Handa <handa@gnu.org>
* international/eucjp-ms.el: Re-generated.
2012-10-10 Kenichi Handa <handa@gnu.org>
* select.el (xselect--encode-string): If a coding is specified for
selection, and that is compatible with COMPOUND_TEXT, use it.
2012-10-10 Martin Rudalics <rudalics@gmx.at>
* window.el (switch-to-buffer-preserve-window-point): New option.
(switch-to-buffer):
Obey `switch-to-buffer-preserve-window-point' (Bug#4041).
2012-10-09 Stefan Monnier <monnier@iro.umontreal.ca>
* newcomment.el (comment-start-skip, comment-end-skip, comment-end):
Don't document nil as a useful value (bug#12583).
2012-10-09 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-debug-message):
Remove "tramp-with-progress-reporter" from regexp of ignored functions.
(with-tramp-progress-reporter): Rename from
`tramp-with-progress-reporter'.
(with-tramp-file-property, with-tramp-connection-property):
Move from tramp-cache.el, rename from `with-file-property' and
`with-connection-property', respectively.
* net/tramp-cache.el: Remove `with-file-property' and
`with-connection-property'.
* net/tramp.el:
* net/tramp-gvfs.el:
* net/tramp-sh.el:
* net/tramp-smb.el: Adapt callees.
* net/trampver.el: Update release number.
2012-10-09 Glenn Morris <rgm@gnu.org>
* w32-fns.el (set-message-beep):
* term/w32-win.el (set-message-beep): Update declarations.
2012-10-09 Stefan Monnier <monnier@iro.umontreal.ca>
* bindings.el (mode-line-toggle-read-only, mode-line-toggle-modified)
(mode-line-widen, mode-line-input-method-map)
(mode-line-coding-system-map, mode-line-remote)
(mode-line-unbury-buffer, mode-line-bury-buffer)
(mode-line-next-buffer, mode-line-previous-buffer):
Replace save-selected-window+select-window => with-selected-window.
* progmodes/cc-bytecomp.el (cc-bytecomp-defmacro): Remove, unused.
* progmodes/cc-vars.el (bq-process): Remove, unused.
* emacs-lisp/cl-macs.el (cl-defstruct): Obey the :read-only property.
2012-10-09 Fabián Ezequiel Gallina <fgallina@cuca>
Implemented `backward-up-list'-like navigation.
* progmodes/python.el (python-nav-up-list)
(python-nav-backward-up-list): New functions.
(python-mode-map): Define substitute key for backward-up-list to
python-nav-backward-up-list.
2012-10-08 Fabián Ezequiel Gallina <fgallina@cuca>
* progmodes/python.el (python-fill-paragraph): Rename from
python-fill-paragraph-function. Fixed fill-paragraph for
decorators (Bug#12605).
2012-10-08 Fabián Ezequiel Gallina <fgallina@cuca>
* progmodes/python.el (python-shell-output-filter): Handle extra
carriage return in OSX (Bug#12409).
2012-10-08 Fabián Ezequiel Gallina <fgallina@cuca>
Fix shell handling of unbalanced quotes and parens in output.
* progmodes/python.el (python-rx-constituents): Add string-delimiter.
(python-syntax-propertize-function): Use it.
(python-shell-output-syntax-table): New var.
(inferior-python-mode): Prevent unbalanced parens/quotes from
previous output mess with current input context.
2012-10-08 Juanma Barranquero <lekktu@gmail.com>
* generic-x.el (javascript-generic-mode, javascript-generic-mode-hook):
Make obsolete aliases of js-mode and js-mode-hook (from js.el).
2012-10-08 Michael Albinus <michael.albinus@gmx.de>
* ffap.el (ffap-replace-file-component): Support Tramp file name
syntax, not only ange-ftp's one.
2012-10-08 Glenn Morris <rgm@gnu.org>
* cus-start.el (message-log-max): Set :version.
* calendar/calendar.el (calendar-intermonth-header): Doc fix.
2012-10-08 Martin Rudalics <rudalics@gmx.at>
* emacs-lisp/edebug.el (edebug-pop-to-buffer): Don't try to split
the minibuffer window (Bug#10851).
2012-10-08 Fabián Ezequiel Gallina <fgallina@cuca>
Enhancements on forward-sexp movement.
* progmodes/python.el (python-nav-beginning-of-statement)
(python-nav-end-of-statement): Return point-marker.
(python-nav-forward-sexp): lisp-like forward-sexp behavior.
(python-info-current-symbol)
(python-info-statement-starts-block-p): Rename from
python-info-beginning-of-block-p.
(python-info-statement-ends-block-p): Rename from
python-info-end-of-block-p.
(python-info-beginning-of-statement-p)
(python-info-end-of-statement-p)
(python-info-beginning-of-block-p, python-info-end-of-block-p):
New functions.
2012-10-08 Stefan Monnier <monnier@iro.umontreal.ca>
* comint.el (comint-preinput-scroll-to-bottom): Preserve the
frame-selected-windows.
2012-10-08 Daniel Colascione <dancol@dancol.org>
* battery.el (battery-status-function): Check for
w32-battery-status itself, not system-time windows-nt.
* frame.el: Require cl-lib.
(display-format-alist): New variable mapping frame types to
functions that initialize them.
(window-system-for-display): New function: interprets
display-format-alist.
(make-frame-on-display): Remove existing display-selection logic
and just forward to make-frame, which will now DTRT.
(make-frame): Restructure to use window-system-for-display to
figure out how to create a frame on a given display.
(display-mouse-p): Look for frame-type w32, not a particular
system-type.
* loadup.el: Load w32 lisp code when we have the w32 feature.
* mouse.el (mouse-yank-primarY): Look for frame-type w32, not
system-type windows-nt.
* server.el (server-create-window-system-frame): Look for window
type.
(server-proces-filter): Only force a window system when windows-nt
_and_ w32. Explain why.
* simple.el (normal-erase-is-backspace-mode): Add w32 to the list
of window systems we configure for the mode.
* startup.el (command-line): Mark window system is initialized
after we've done it.
* common-win.el (x-select-text): Look for w32, not windows-nt.
* ns-win.el: Require cl-lib. Add ourselves to
display-format-alist.
(ns-initialize-window-system): Assert we're not initialized twice.
* w32-win.el: Enable lexical binding; require cl-lib; add
ourselves to display-format-alist.
(w32-handle-dropped-file): Convert incoming dropped files from
Windows paths to Cygwin ones before passing them on to the rest of
Emacs.
(w32-drag-n-drop): New paramter new-frame. Simplify logic.
(w32-initialize-window-system): Assert we're not initialized twice.
* x-win.el: Require cl-lib; add ourselves to display-format-alist.
(x-initialize-window-system): Assert we're not initialized twice.
* w32-common-fns.el: New File.
(w32-version, w32-using-nt, w32-get-clipboard-data)
(w32-set-clipboard-data, x-set-selection, x-get-selection)
(w32-charset-info-alist, x-last-selected, text)
(x-get-selection-value, x-selection-value): Move here.
* w32-fns.el: Require w32-common-fns.
(w32-version, w32-using-nt, w32-get-clipboard-data)
(w32-set-clipboard-data, x-set-selection, x-get-selection)
(w32-charset-info-alist, x-last-selected, text)
(x-get-selection-value, x-selection-value): Move to
w32-common-fns.
* w32-vars.el:
(w32-allow-system-shell, w32-system-shells): Define only in
non-cygwin case.
2012-10-07 Stefan Monnier <monnier@iro.umontreal.ca>
* subr.el (read-passwd-map): Don't use `defconst' (bug#12597).
(read-passwd): Remove a few more potential sources of leaks.
2012-10-07 Fabián Ezequiel Gallina <fgallina@cuca>
* progmodes/python.el (inferior-python-mode)
(python-shell-make-comint): Fix initialization of local
variables copied from parent buffer.
2012-10-07 Jan Djärv <jan.h.d@swipnet.se>
* term/ns-win.el (ns-read-file-name): Update declaration to match
nsfns.m.
(ns-respond-to-change-font): Change fontsize separatly so we are sure
it is set when font is acted upon.
2012-10-07 Fabián Ezequiel Gallina <fgallina@cuca>
Enhancements to indentation.
* progmodes/python.el (python-indent-context): Give priority to
inside-string context. Make comments indentation markers.
(python-indent-region): Do not mess with strings, unless it's the
enclosing set of quotes.
2012-10-07 Stefan Monnier <monnier@iro.umontreal.ca>
* window.el (internal--before-save-selected-window)
(internal--after-save-selected-window): New functions extracted from
save-selected-window. Make sure we return the `alist' we construct.
(save-selected-window): Use them.
* textmodes/tex-mode.el (tex-recenter-output-buffer):
Use with-selected-window.
* emacs-lisp/autoload.el (make-autoload): Add `cl-defmacro' to the
forms that define macros (bug#12593).
2012-10-07 Kenichi Handa <handa@gnu.org>
* international/mule-conf.el (compound-text-with-extensions):
Add :mime-charset property as x-ctext.
2012-10-07 Stefan Merten <smerten@oekonux.de>
* textmodes/rst.el (rst-new-adornment-down, rst-indent-field)
(rst-indent-literal-normal, rst-indent-literal-minimized)
(rst-indent-comment): Correct :version tag.
(rst-official-cvs-rev): Correct version string.
2012-10-07 Glenn Morris <rgm@gnu.org>
* mail/rmailmm.el (rmail-mime-process-multipart):
Do not confuse a multipart message with an epilogue
with a "truncated" one; fixes 2011-06-27 change. (Bug#10101)
2012-10-07 Fabián Ezequiel Gallina <fgallina@cuca>
Fix shell output retrieval and comint-prompt-regexp init.
* progmodes/python.el (inferior-python-mode):
(python-shell-make-comint): Fix initialization of
comint-prompt-regexp from copied file local variables.
(python-shell-fetched-lines): Remove var.
(python-shell-output-filter-in-progress): Rename from
python-shell-fetch-lines-in-progress.
(python-shell-output-filter-buffer): Rename from
python-shell-fetch-lines-string.
(python-shell-fetch-lines-filter): Delete function.
(python-shell-output-filter): New function.
(python-shell-send-string-no-output): Use them.
2012-10-07 Glenn Morris <rgm@gnu.org>
* hi-lock.el (hi-lock-process-phrase):
Try to make it less fragile. (Bug#7161)
* hi-lock.el (hi-lock-face-phrase-buffer): Doc fix.
2012-10-06 Glenn Morris <rgm@gnu.org>
* ehelp.el (electric-help-mode): Use help-mode rather than
non-existent mode `help'.
(electric-help-map): Use button-buffer-map. (Bug#10917)
* textmodes/reftex-vars.el (reftex-create-bibtex-header)
(reftex-create-bibtex-footer): Fix custom types.
* progmodes/sh-script.el (sh-indent-after-continuation):
Add explicit :group.
* textmodes/rst.el (rst-preferred-decorations)
(rst-shift-basic-offset): Clarify obsolescence versions.
* profiler.el (profiler): Add missing group :version tag.
* avoid.el (mouse-avoidance-banish-position):
* proced.el (proced-renice-command):
* calc/calc.el (calc-ensure-consistent-units):
* calendar/icalendar.el (icalendar-import-format-uid):
* net/tramp.el (tramp-save-ad-hoc-proxies):
* progmodes/bug-reference.el (bug-reference-bug-regexp):
* progmodes/flymake.el (flymake-error-bitmap)
(flymake-warning-bitmap, flymake-fringe-indicator-position):
* progmodes/sh-script.el (sh-indent-after-continuation):
* progmodes/verilog-mode.el (verilog-auto-template-warn-unused)
(verilog-before-save-font-hook, verilog-after-save-font-hook):
* progmodes/vhdl-mode.el (vhdl-makefile-default-targets)
(vhdl-array-index-record-field-in-sensitivity-list)
(vhdl-indent-comment-like-next-code-line):
* textmodes/reftex-vars.el (reftex-ref-style-alist)
(reftex-ref-macro-prompt, reftex-ref-style-default-list)
(reftex-cite-key-separator, reftex-create-bibtex-header)
(reftex-create-bibtex-footer):
* textmodes/rst.el (rst-new-adornment-down, rst-indent-field)
(rst-indent-literal-normal, rst-indent-literal-minimized)
(rst-indent-comment): Add missing custom :version tags.
* calendar/timeclock.el (timeclock-modeline-display):
Add missing obsolete alias for renamed user option.
* strokes.el (strokes-modeline-string):
* emulation/crisp.el (crisp-mode-modeline-string):
* eshell/esh-mode.el (eshell-status-in-modeline):
Aliases to defcustoms must come before the defcustom.
* calendar/cal-tex.el (cal-tex-diary, cal-tex-cursor-week)
(cal-tex-cursor-week2, cal-tex-cursor-week-iso)
(cal-tex-cursor-week-monday): Doc fixes.
(cal-tex-cursor-week2-summary): Doc fix.
Rename from cal-tex-cursor-week-at-a-glance.
* calendar/cal-menu.el (cal-menu-context-mouse-menu):
Tweak week descriptions. Add cal-tex-cursor-week2-summary.
* calendar/calendar.el (calendar-mode-map):
Add cal-tex-cursor-week2-summary.
2012-10-06 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/cl-macs.el (cl-defstruct): Improve docstring.
* subr.el (read-passwd-map): New var.
(read-passwd): Use `read-string' again.
* minibuffer.el (delete-minibuffer-contents): Make it interactive.
2012-10-06 Jambunathan K <kjambunathan@gmail.com>
* register.el (append-to-register, prepend-to-register):
Deactivate mark, as does `copy-to-register' (bug#12389).
2012-10-06 Chong Yidong <cyd@gnu.org>
* files.el (auto-mode-alist): Add .by and .wy (Semantic grammars).
2012-10-06 Ikumi Keita <ikumi@ikumi.que.jp> (tiny change)
* international/characters.el: Fix simple mistake ((car chars) ->
elt), delete duplicated code.
2012-10-06 Glenn Morris <rgm@gnu.org>
* subr.el (read-passwd): Allow C-u to erase entry. (Bug#12570)
2012-10-06 Julian Scheid <julians37@gmail.com> (tiny change)
* color.el (color-hsl-to-rgb): Fix incorrect results for
small and large hue values. (Bug#12559)
2012-10-05 Fabián Ezequiel Gallina <fgallina@cuca>
Enhancements to docstring formatting when filling paragraphs.
* progmodes/python.el (python-fill-docstring-style): Rename from
python-fill-string-style. Added new style.
(python-fill-string): Use new style. Better checks for
docstrings.
2012-10-05 Glenn Morris <rgm@gnu.org>
* net/newst-treeview.el (newsticker-group-move-feed): Doc fix.
* color.el (color-name-to-rgb, color-rgb-to-hex)
(color-hue-to-rgb, color-hsl-to-rgb, color-rgb-to-hsv)
(color-rgb-to-hsl, color-srgb-to-xyz, color-saturate-hsl)
(color-desaturate-hsl, color-desaturate-name, color-lighten-hsl)
(color-lighten-name, color-darken-hsl, color-darken-name): Doc fixes.
* emacs-lisp/timer.el (with-timeout): Add missing progn. (Bug#12577)
2012-10-05 Juanma Barranquero <lekktu@gmail.com>
* ido.el (ido-directory-too-big-p): Pass dir through file-truename
to get the correct size across symlinks.
* ido.el (ido-buffer-disable-smart-matches): Fix typo in docstring.
2012-10-04 Juri Linkov <juri@jurta.org>
* replace.el (query-replace-interactive): Declare obsolete.
(query-replace-read-from): Add the last incremental search string
to the list of default values accessible via M-n.
(map-query-replace-regexp): Use `read-regexp'.
(query-replace, query-replace-regexp, query-replace-regexp-eval)
(map-query-replace-regexp, replace-string, replace-regexp):
Fix docstrings to replace mentions of `query-replace-interactive'
with alternatives. (Bug#12526)
2012-10-04 Juri Linkov <juri@jurta.org>
* dired.el (dired-shrink-to-fit): Declare obsolete. (Bug#1806)
(dired-pop-to-buffer): Declare obsolete.
(dired-mark-pop-up): Doc fix.
2012-10-04 Fabián Ezequiel Gallina <fgallina@cuca>
Allow user to set docstring style for fill-paragraph.
* progmodes/python.el
(python-fill-comment-function, python-fill-string-function)
(python-fill-decorator-function, python-fill-paren-function):
Remove :safe for defcustoms.
(python-fill-string-style): New defcustom
(python-fill-paragraph-function): Enhance context detection.
(python-fill-string): Honor python-fill-string-style settings.
2012-10-04 Martin Rudalics <rudalics@gmx.at>
* emacs-lisp/edebug.el (edebug-pop-to-buffer): Select window
after setting its buffer (Bug#10805).
2012-10-03 Fabián Ezequiel Gallina <fgallina@cuca>
Fix cornercase for string syntax.
@ -22,8 +585,8 @@
2012-10-02 Chong Yidong <cyd@gnu.org>
* progmodes/hideif.el (hif-lookup, hif-defined): Handle
semantic-c-takeover-hideif.
* progmodes/hideif.el (hif-lookup, hif-defined):
Handle semantic-c-takeover-hideif.
2012-10-02 Paul Eggert <eggert@cs.ucla.edu>
@ -39,8 +602,8 @@
2012-10-02 Sergio Durigan Junior <sergiodj@riseup.net> (tiny change)
* net/eudcb-bbdb.el (eudc-bbdb-format-record-as-result): Fix
querying BBDB for entries without a last name (Bug#11580).
* net/eudcb-bbdb.el (eudc-bbdb-format-record-as-result):
Fix querying BBDB for entries without a last name (Bug#11580).
2012-10-02 Chong Yidong <cyd@gnu.org>
@ -116,9 +679,9 @@
* emacs-lisp/eieio-base.el (eieio-persistent-read): New input args
specifying the expected class, and whether subclassing is allowed.
(eieio-persistent-convert-list-to-object):
(eieio-persistent-validate/fix-slot-value)
(eieio-persistent-slot-type-is-class-p): New functions.
(eieio-named::slot-missing): Doc fix.
(eieio-persistent-validate/fix-slot-value)
(eieio-persistent-slot-type-is-class-p): New functions.
(eieio-named::slot-missing): Doc fix.
* emacs-lisp/eieio-datadebug.el (data-debug/eieio-insert-slots):
Stop using unused publd variable.
@ -331,7 +894,7 @@
2012-09-30 Juri Linkov <juri@jurta.org>
* arc-mode.el (archive-summarize): Let-bind `buffer-file-truename'
to nil around the call to `add-text-properties' to prevent
to nil around the call to `insert' to prevent
directory time modification by lock_file. (Bug#2295)
* tar-mode.el (tar-summarize-buffer): Idem.
@ -1487,12 +2050,12 @@
2012-09-08 Jambunathan K <kjambunathan@gmail.com>
* register.el (register): New group.
(register-separator): New user option.
(separator-register): New user option.
(increment-register): Route it to `append-to-register', if
register contains text. Implication is that `C-x r +' can now be
used for appending to a text register (bug#12217).
(append-to-register, prepend-to-register): Add separator based on
`register-separator.
`separator-register'.
2012-09-08 Alan Mackenzie <acm@muc.de>
@ -1561,7 +2124,7 @@
* ses.el (ses-widen):
* simple.el (count-words--buffer-message):
* net/browse-url.el (browse-url-of-buffer): Use it
* net/browse-url.el (browse-url-of-buffer): Use it.
* simple.el (count-words-region): Don't signal an error if there
is a non-nil prefix arg and the mark is not set.
@ -8314,7 +8877,8 @@
2012-03-18 Leo Liu <sdl.web@gmail.com>
* net/rcirc.el (rcirc-cmd-quit): Allow quiting all servers with prefix.
* net/rcirc.el (rcirc-cmd-quit): Allow quitting all servers with
prefix.
2012-03-17 Eli Zaretskii <eliz@gnu.org>
@ -15842,7 +16406,7 @@
2011-06-22 Leo Liu <sdl.web@gmail.com>
* minibuffer.el (completing-read-function)
(completing-read-default): Move from minibuf.c
(completing-read-default): Move from minibuf.c.
2011-06-22 Richard Stallman <rms@gnu.org>
@ -17699,7 +18263,7 @@
Remove unnecessary and incorrect declarations.
* emacs-lisp/check-declare.el (check-declare-scan):
Handle byte-compile-initial-macro-environment in bytecomp.el
Handle byte-compile-initial-macro-environment in bytecomp.el.
2011-05-05 Stefan Monnier <monnier@iro.umontreal.ca>

2
lisp/ChangeLog.10
View file

@ -5492,7 +5492,7 @@
2003-02-14 Dave Love <fx@gnu.org>
* international/code-pages.el: Undo `Trailing whitepace deleted.'
* international/code-pages.el: Undo `Trailing whitespace deleted.'
damage.
(cp1125, mik): Nullify mime-charset.

4
lisp/ChangeLog.15
View file

@ -10962,7 +10962,7 @@
* Version 23.2 released.
2010-05-07 Deniz Dogan <deniz.a.m.dogan@gmail.com> (tiny change)
2010-05-07 Deniz Dogan <deniz.a.m.dogan@gmail.com>
Stefan Monnier <monnier@iro.umontreal.ca>
Highlight vendor specific properties.
@ -15541,7 +15541,7 @@
* window.el (move-to-window-line-last-op): Remove.
(move-to-window-line-top-bottom): Reuse recenter-last-op instead.
2009-11-23 Deniz Dogan <deniz.a.m.dogan@gmail.com> (tiny change)
2009-11-23 Deniz Dogan <deniz.a.m.dogan@gmail.com>
Make M-r mirror the new cycling behavior of C-l.
* window.el (move-to-window-line-last-op): New var.

1
lisp/avoid.el
View file

@ -128,6 +128,7 @@ SIDE-POS: Distance from right or left edge of frame or window.
TOP-OR-BOTTOM: banish the mouse to top or bottom of frame or window.
TOP-OR-BOTTOM-POS: Distance from top or bottom edge of frame or window."
:group 'avoid
:version "24.3"
:type '(alist :key-type symbol :value-type symbol)
:options '(frame-or-window side (side-pos integer)
top-or-bottom (top-or-bottom-pos integer)))

2
lisp/battery.el
View file

@ -60,7 +60,7 @@
(> (buffer-size) 0)))
(error nil)))
'battery-pmset)
((eq system-type 'windows-nt)
((fboundp 'w32-battery-status)
'w32-battery-status))
"Function for getting battery status information.
The function has to return an alist of conversion definitions.

38
lisp/bindings.el
View file

@ -38,23 +38,20 @@ corresponding to the mode line clicked."
(defun mode-line-toggle-read-only (event)
"Like `toggle-read-only', for the mode-line."
(interactive "e")
(save-selected-window
(select-window (posn-window (event-start event)))
(with-selected-window (posn-window (event-start event))
(read-only-mode 'toggle)))
(defun mode-line-toggle-modified (event)
"Toggle the buffer-modified flag from the mode-line."
(interactive "e")
(save-selected-window
(select-window (posn-window (event-start event)))
(with-selected-window (posn-window (event-start event))
(set-buffer-modified-p (not (buffer-modified-p)))
(force-mode-line-update)))
(defun mode-line-widen (event)
"Widen a buffer from the mode-line."
(interactive "e")
(save-selected-window
(select-window (posn-window (event-start event)))
(with-selected-window (posn-window (event-start event))
(widen)
(force-mode-line-update)))
@ -63,17 +60,13 @@ corresponding to the mode line clicked."
(define-key map [mode-line mouse-2]
(lambda (e)
(interactive "e")
(save-selected-window
(select-window
(posn-window (event-start e)))
(with-selected-window (posn-window (event-start e))
(toggle-input-method)
(force-mode-line-update))))
(define-key map [mode-line mouse-3]
(lambda (e)
(interactive "e")
(save-selected-window
(select-window
(posn-window (event-start e)))
(with-selected-window (posn-window (event-start e))
(describe-current-input-method))))
(purecopy map)))
@ -82,16 +75,14 @@ corresponding to the mode line clicked."
(define-key map [mode-line mouse-1]
(lambda (e)
(interactive "e")
(save-selected-window
(select-window (posn-window (event-start e)))
(with-selected-window (posn-window (event-start e))
(when (and enable-multibyte-characters
buffer-file-coding-system)
(describe-coding-system buffer-file-coding-system)))))
(define-key map [mode-line mouse-3]
(lambda (e)
(interactive "e")
(save-selected-window
(select-window (posn-window (event-start e)))
(with-selected-window (posn-window (event-start e))
(call-interactively 'set-buffer-file-coding-system))))
(purecopy map))
"Local keymap for the coding-system part of the mode line.")
@ -237,8 +228,7 @@ mnemonics of the following coding systems:
'mouse-face 'mode-line-highlight
'help-echo (purecopy (lambda (window _object _point)
(format "%s"
(save-selected-window
(select-window window)
(with-selected-window window
(concat
(if (file-remote-p default-directory)
"Current directory is remote: "
@ -474,15 +464,13 @@ By default, this shows the information specified by
(defun mode-line-unbury-buffer (event) "\
Call `unbury-buffer' in this window."
(interactive "e")
(save-selected-window
(select-window (posn-window (event-start event)))
(with-selected-window (posn-window (event-start event))
(unbury-buffer)))
(defun mode-line-bury-buffer (event) "\
Like `bury-buffer', but temporarily select EVENT's window."
(interactive "e")
(save-selected-window
(select-window (posn-window (event-start event)))
(with-selected-window (posn-window (event-start event))
(bury-buffer)))
(defun mode-line-other-buffer () "\
@ -493,15 +481,13 @@ Switch to the most recently selected buffer other than the current one."
(defun mode-line-next-buffer (event)
"Like `next-buffer', but temporarily select EVENT's window."
(interactive "e")
(save-selected-window
(select-window (posn-window (event-start event)))
(with-selected-window (posn-window (event-start event))
(next-buffer)))
(defun mode-line-previous-buffer (event)
"Like `previous-buffer', but temporarily select EVENT's window."
(interactive "e")
(save-selected-window
(select-window (posn-window (event-start event)))
(with-selected-window (posn-window (event-start event))
(previous-buffer)))
(defmacro bound-and-true-p (var)

14
lisp/calc/calc-units.el
View file

@ -1481,10 +1481,16 @@ If COMP or STD is non-nil, put that in the units table instead."
(mapcar 'math-remove-units (cdr expr))))))
(defun math-extract-units (expr)
(if (memq (car-safe expr) '(* /))
(cons (car expr)
(mapcar 'math-extract-units (cdr expr)))
(if (math-check-unit-name expr) expr 1)))
(cond
((memq (car-safe expr) '(* /))
(cons (car expr)
(mapcar 'math-extract-units (cdr expr))))
((and
(eq (car-safe expr) '^)
(math-check-unit-name (nth 1 expr)))
expr)
((math-check-unit-name expr) expr)
(t 1)))
(defun math-build-units-table-buffer (enter-buffer)
(if (not (and math-units-table math-units-table-buffer-valid

1
lisp/calc/calc.el
View file

@ -423,6 +423,7 @@ in normal mode."
"If non-nil, make sure new units are consistent with current units
when converting units."
:group 'calc
:version "24.3"
:type 'boolean)
(defcustom calc-undo-length

9
lisp/calendar/cal-menu.el
View file

@ -237,10 +237,11 @@ is non-nil."
;; These did not work if called without calendar window selected.
("Prepare LaTeX buffer"
["Daily (1 page)" cal-tex-cursor-day]
["Weekly (1 page)" cal-tex-cursor-week]
["Weekly (2 pages)" cal-tex-cursor-week2]
["Weekly (other style; 1 page)" cal-tex-cursor-week-iso]
["Weekly (yet another style; 1 page)" cal-tex-cursor-week-monday]
["Weekly (1 page, with hours)" cal-tex-cursor-week]
["Weekly (2 pages, with hours)" cal-tex-cursor-week2]
["Weekly (1 page, no hours)" cal-tex-cursor-week-iso]
["Weekly (1 page, with hours, different style)" cal-tex-cursor-week-monday]
["Weekly (2 pages, no hours)" cal-tex-cursor-week2-summary]
["Monthly" cal-tex-cursor-month]
["Monthly (landscape)" cal-tex-cursor-month-landscape]
["Yearly" cal-tex-cursor-year]

81
lisp/calendar/cal-tex.el
View file

@ -37,6 +37,7 @@
;; cal-tex-cursor-month
;; cal-tex-cursor-week
;; cal-tex-cursor-week2
;; cal-tex-cursor-week2-summary
;; cal-tex-cursor-week-iso
;; cal-tex-cursor-week-monday
;; cal-tex-cursor-filofax-2week
@ -82,8 +83,6 @@ Setting this to nil may speed up calendar generation."
(defcustom cal-tex-diary nil
"Non-nil means diary entries are printed in LaTeX calendars that support it.
At present, this only affects the monthly, filofax, and iso-week
calendars (i.e. not the yearly, plain weekly, or daily calendars).
Setting this to nil may speed up calendar generation."
:type 'boolean
:group 'calendar-tex)
@ -717,11 +716,15 @@ this is only an upper bound."
;; TODO respect cal-tex-daily-start,end (see cal-tex-week-hours).
;;;###cal-autoload
(defun cal-tex-cursor-week (&optional n event)
"Make a LaTeX calendar buffer for a two-page one-week calendar.
It applies to the week that point is in. The optional prefix
argument N specifies number of weeks (default 1). The calendar
shows holidays if `cal-tex-holidays' is non-nil (note that diary
entries are not shown). The calendar shows the hours 8-12am, 1-5pm."
"Make a one page LaTeX calendar for one week, showing hours of the day.
There are two columns; with 8-12am in the first and 1-5pm in the second.
It shows holidays if `cal-tex-holidays' is non-nil.
It does not show diary entries.
The optional prefix argument N specifies a number of weeks (default 1).
By default, the calendar is for the week at point; the optional
argument EVENT specifies a different buffer position."
(interactive (list (prefix-numeric-value current-prefix-arg)
last-nonmenu-event))
(or n (setq n 1))
@ -768,12 +771,15 @@ entries are not shown). The calendar shows the hours 8-12am, 1-5pm."
;; TODO respect cal-tex-daily-start,end (see cal-tex-week-hours).
;;;###cal-autoload
(defun cal-tex-cursor-week2 (&optional n event)
"Make a LaTeX calendar buffer for a two-page one-week calendar.
It applies to the week that point is in. Optional prefix
argument N specifies number of weeks (default 1). The calendar
shows holidays if `cal-tex-holidays' is non-nil (note that diary
entries are not shown). The calendar shows the hours 8-12am, 1-5pm.
Optional EVENT indicates a buffer position to use instead of point."
"Make a two page LaTeX calendar for one week, showing hours of the day.
There are two columns; with 8-12am in the first and 1-5pm in the second.
It shows holidays if `cal-tex-holidays' is non-nil.
It does not show diary entries.
The optional prefix argument N specifies a number of weeks (default 1).
By default, the calendar is for the week at point; the optional
argument EVENT specifies a different buffer position."
(interactive (list (prefix-numeric-value current-prefix-arg)
last-nonmenu-event))
(or n (setq n 1))
@ -848,12 +854,15 @@ Optional EVENT indicates a buffer position to use instead of point."
;;;###cal-autoload
(defun cal-tex-cursor-week-iso (&optional n event)
"Make a LaTeX calendar buffer for a one page ISO-style weekly calendar.
Optional prefix argument N specifies number of weeks (default 1).
The calendar shows holiday and diary entries if
`cal-tex-holidays' and `cal-tex-diary', respectively, are non-nil.
It does not show hours of the day. Optional EVENT indicates a buffer
position to use instead of point."
"Make a one page LaTeX calendar for one week, in the ISO-style.
It does not show hours of the day.
It shows holidays if `cal-tex-holidays' is non-nil.
It shows diary entries if `cal-tex-diary' is non-nil.
The optional prefix argument N specifies a number of weeks (default 1).
By default, the calendar is for the week at point; the optional
argument EVENT specifies a different buffer position."
(interactive (list (prefix-numeric-value current-prefix-arg)
last-nonmenu-event))
(or n (setq n 1))
@ -976,13 +985,16 @@ shown are hard-coded to 8-12, 13-17."
;; TODO respect cal-tex-daily-start,end (see cal-tex-weekly4-box).
;;;###cal-autoload
(defun cal-tex-cursor-week-monday (&optional n event)
"Make a LaTeX calendar buffer for a two-page one-week calendar.
It applies to the week that point is in, and starts on Monday.
Optional prefix argument N specifies number of weeks (default 1).
The calendar shows holidays if `cal-tex-holidays' is
non-nil (note that diary entries are not shown). The calendar shows
the hours 8-12am, 1-5pm. Optional EVENT indicates a buffer position
to use instead of point."
"Make a one page LaTeX calendar for one week, showing hours of the day.
There are two columns; with M-W in the first and T-S in the second.
It shows the hours 8-12am and 1-5pm.
It shows holidays if `cal-tex-holidays' is non-nil.
It does not show diary entries.
The optional prefix argument N specifies a number of weeks (default 1).
By default, the calendar is for the week at point; the optional
argument EVENT specifies a different buffer position."
(interactive (list (prefix-numeric-value current-prefix-arg)
last-nonmenu-event))
(or n (setq n 1))
@ -1203,13 +1215,16 @@ shown are hard-coded to 8-12, 13-17."
(run-hooks 'cal-tex-hook)))
;;;###cal-autoload
(defun cal-tex-cursor-week-at-a-glance (&optional n event)
"One-week-at-a-glance full page calendar for week indicated by cursor.
Optional prefix argument N specifies number of weeks (default 1),
starting on Mondays. The calendar shows holiday and diary entries
if `cal-tex-holidays' and `cal-tex-diary', respectively, are non-nil.
It does not show hours of the day. Optional EVENT indicates a buffer
position to use instead of point."
(defun cal-tex-cursor-week2-summary (&optional n event)
"Make a two page LaTeX calendar for one week, with optional diary entries.
It does not show hours of the day.
It shows holidays if `cal-tex-holidays' is non-nil.
It shows diary entries if `cal-tex-diary' is non-nil.
The optional prefix argument N specifies a number of weeks (default 1).
By default, the calendar is for the week at point; the optional
argument EVENT specifies a different buffer position."
(interactive (list (prefix-numeric-value current-prefix-arg)
last-nonmenu-event))
(cal-tex-weekly-common n event))

7
lisp/calendar/calendar.el
View file

@ -511,7 +511,7 @@ Must be at least one less than `calendar-column-width'."
:version "23.1")
(defcustom calendar-intermonth-header nil
"Header text display in the space to the left of each calendar month.
"Header text to display in the space to the left of each calendar month.
See `calendar-intermonth-text'."
:group 'calendar
:initialize 'custom-initialize-default
@ -1683,8 +1683,9 @@ line."
(define-key map "td" 'cal-tex-cursor-day)
(define-key map "tw1" 'cal-tex-cursor-week)
(define-key map "tw2" 'cal-tex-cursor-week2)
(define-key map "tw3" 'cal-tex-cursor-week-iso)
(define-key map "tw4" 'cal-tex-cursor-week-monday)
(define-key map "tw3" 'cal-tex-cursor-week-iso) ; FIXME twi ?
(define-key map "tw4" 'cal-tex-cursor-week-monday) ; twm ?
(define-key map "twW" 'cal-tex-cursor-week2-summary)
(define-key map "tfd" 'cal-tex-cursor-filofax-daily)
(define-key map "tfw" 'cal-tex-cursor-filofax-2week)
(define-key map "tfW" 'cal-tex-cursor-filofax-week)

1
lisp/calendar/icalendar.el
View file

@ -186,6 +186,7 @@ the URL."
This applies only if the UID is not empty! `%s' is replaced by
the UID."
:type 'string
:version "24.3"
:group 'icalendar)
(defcustom icalendar-import-format-status

3
lisp/calendar/timeclock.el
View file

@ -321,6 +321,9 @@ display (non-nil means on)."
(force-mode-line-update)
(setq timeclock-mode-line-display on-p)))
(define-obsolete-variable-alias 'timeclock-modeline-display
'timeclock-mode-line-display "24.3")
;; This has to be here so that the function definition of
;; `timeclock-mode-line-display' is known to the "set" function.
(defcustom timeclock-mode-line-display nil

62
lisp/cedet/ChangeLog
View file

@ -1,3 +1,65 @@
2012-10-14 David Engster <deng@randomsample.de>
* semantic.el (semantic-error-if-unparsed): New function. Raise
error if buffer was not parsed by Semantic (bug #12045).
(navigate-menu, edit-menu, cedet-menu-map): Enable Semantic items
only if buffer was parsed. Also, replace ':active' with ':enable'
where necessary.
* semantic/wisent/python.el
(semantic-python-get-system-include-path): Use
`python-shell-internal-send-string' if available to query Python
for system paths.
* semantic/senator.el (senator-next-tag, senator-previous-tag)
(senator-go-to-up-reference): Use `semantic-error-if-unparsed'.
* semantic/complete.el (semantic-complete-jump-local)
(semantic-complete-jump, semantic-complete-jump-local-members)
(semantic-complete-self-insert): Use `semantic-error-if-unparsed'.
(semantic-complete-inline-project): Fix autoload cookie.
* semantic/analyze/complete.el
(semantic-analyze-possible-completions): Check if buffer was
parsed. Only raise an error if function was called interactively,
otherwise silently return nil.
* cedet.el (cedet-menu-map): Fix copy&paste typo in menu creation.
2012-10-08 David Engster <deng@randomsample.de>
* semantic/bovine/el.el: Add `semantic-default-elisp-setup' to
`emacs-lisp-mode-hook'. This was accidentally removed during the
CEDET update (2012-10-01T18:10:29Z!cyd@gnu.org).
2012-10-07 David Engster <deng@randomsample.de>
* semantic/wisent/python.el (semantic-ctxt-current-function)
(semantic-ctxt-current-assignment): New overrides, simply
returning nil. The defaults do not work correctly and can send
the parser in an infinite loop (bug#12458).
* semantic/ede-grammar.el (project-compile-target): Fix grammar
compilation after introduction of %provide statement.
* semantic.el (semantic-new-buffer-setup-functions): Remove setup
function for `f90-mode', since the parser only exists upstream.
2012-10-06 Glenn Morris <rgm@gnu.org>
* semantic/complete.el (semantic-displayor-tooltip-max-tags): Doc fix.
* semantic/complete.el (semantic-displayor-tooltip-mode)
(semantic-displayor-tooltip-initial-max-tags)
(semantic-displayor-tooltip-max-tags): Add missing custom :version tags.
* ede/linux.el (project-linux): Add missing group :version tag.
2012-10-06 Chong Yidong <cyd@gnu.org>
* semantic/bovine/grammar.el:
* semantic/wisent/grammar.el: Move from admin/grammars. Add
autoloads for bovine-grammar-mode and wisent-grammar-mode.
2012-10-02 Chong Yidong <cyd@gnu.org>
* srecode.el, ede.el: Restore Version header.

2
lisp/cedet/cedet.el
View file

@ -59,7 +59,7 @@
(define-key map [navigate-menu] 'undefined)
(define-key map [semantic-options-separator] 'undefined)
(define-key map [global-semantic-highlight-func-mode] 'undefined)
(define-key map [global-semantic-highlight-func-mode] 'undefined)
(define-key map [global-semantic-stickyfunc-mode] 'undefined)
(define-key map [global-semantic-decoration-mode] 'undefined)
(define-key map [global-semantic-idle-completions-mode] 'undefined)
(define-key map [global-semantic-idle-summary-mode] 'undefined)

4
lisp/cedet/ede.el
View file

@ -1358,13 +1358,13 @@ Return the first non-nil value returned by PROC."
(defmethod ede-system-include-path ((this ede-project))
"Get the system include path used by project THIS."
nil)
(defmethod ede-system-include-path ((this ede-target))
"Get the system include path used by project THIS."
nil)
(defmethod ede-source-paths ((this ede-project) mode)
"Get the base to all source trees in the current projet for MODE.
"Get the base to all source trees in the current project for MODE.
For example, <root>/src for sources of c/c++, Java, etc,
and <root>/doc for doc sources."
nil)

4
lisp/cedet/ede/auto.el
View file

@ -68,7 +68,7 @@ into memory.")
;; Add new types of dirmatches here.
;; Error for wierd stuff
;; Error for weird stuff
(t (error "Unknown dirmatch type.")))))
@ -285,7 +285,7 @@ the current buffer."
;; If this file DOES NOT match dirmatch, we set the callfcn
;; to nil, meaning don't load the ede support file for this
;; type of project. If it does match, we will load the file
;; and use a more accurate programatic match from there.
;; and use a more accurate programmatic match from there.
(unless (ede-project-dirmatch-p file dirmatch)
(setq callfcn nil))))
;; Call into the project support file for a match.

2
lisp/cedet/ede/autoconf-edit.el
View file

@ -165,7 +165,7 @@ items such as CHECK_HEADERS."
(setq param (substring param (match-end 0))))
(when (string-match "\\s-*\\]?\\s-*\\'" param)
(setq param (substring param 0 (match-beginning 0))))
;; Look for occurances of backslash newline
;; Look for occurrences of backslash newline
(while (string-match "\\s-*\\\\\\s-*\n\\s-*" param)
(setq param (replace-match " " t t param)))
param)

2
lisp/cedet/ede/linux.el
View file

@ -44,7 +44,7 @@
"File and tag browser frame."
:group 'tools
:group 'ede
)
:version "24.3")
(defcustom project-linux-compile-target-command (concat ede-make-command " -k -C %s SUBDIRS=%s")
"*Default command used to compile a target."

2
lisp/cedet/inversion.el
View file

@ -348,7 +348,7 @@ Optional argument RESERVED is saved for later use."
;;;###autoload
(defun inversion-require-emacs (emacs-ver xemacs-ver sxemacs-ver)
"Declare that you need either EMACS-VER, XEMACS-VER or SXEMACE-ver.
"Declare that you need either EMACS-VER, XEMACS-VER or SXEMACS-ver.
Only checks one based on which kind of Emacs is being run."
(let ((err (inversion-test 'emacs
(cond ((featurep 'sxemacs)

38
lisp/cedet/semantic.el
View file

@ -273,7 +273,6 @@ setup to use Semantic."
(js-mode . wisent-javascript-setup-parser)
(python-mode . wisent-python-default-setup)
(scheme-mode . semantic-default-scheme-setup)
(f90-mode . semantic-default-f90-setup)
(srecode-template-mode . srecode-template-setup-parser)
(texinfo-mode . semantic-default-texi-setup)
(makefile-automake-mode . semantic-default-make-setup)
@ -320,6 +319,11 @@ a parse of the buffer.")
"Return non-nil if the current buffer was set up for parsing."
semantic-new-buffer-fcn-was-run)
(defsubst semantic-error-if-unparsed ()
"Raise an error if current buffer was not parsed by Semantic."
(unless semantic-new-buffer-fcn-was-run
(error "Buffer was not parsed by Semantic.")))
(defsubst semantic--umatched-syntax-needs-refresh-p ()
"Return non-nil if the unmatched syntax cache needs a refresh.
That is, if it is dirty or if the current parse tree isn't up to date."
@ -908,75 +912,91 @@ Throw away all the old tags, and recreate the tag database."
;; Edit Tags submenu:
(define-key edit-menu [semantic-analyze-possible-completions]
'(menu-item "List Completions" semantic-analyze-possible-completions
:enable (semantic-active-p)
:help "Display a list of completions for the tag at point"))
(define-key edit-menu [semantic-complete-analyze-inline]
'(menu-item "Complete Tag Inline" semantic-complete-analyze-inline
:enable (semantic-active-p)
:help "Display inline completion for the tag at point"))
(define-key edit-menu [semantic-completion-separator]
'("--"))
(define-key edit-menu [senator-transpose-tags-down]
'(menu-item "Transpose Tags Down" senator-transpose-tags-down
:active (semantic-current-tag)
:enable (and (semantic-active-p)
(semantic-current-tag))
:help "Transpose the current tag and the next tag"))
(define-key edit-menu [senator-transpose-tags-up]
'(menu-item "Transpose Tags Up" senator-transpose-tags-up
:active (semantic-current-tag)
:enable (and (semantic-active-p)
(semantic-current-tag))
:help "Transpose the current tag and the previous tag"))
(define-key edit-menu [semantic-edit-separator]
'("--"))
(define-key edit-menu [senator-yank-tag]
'(menu-item "Yank Tag" senator-yank-tag
:active (not (ring-empty-p senator-tag-ring))
:enable (not (ring-empty-p senator-tag-ring))
:help "Yank the head of the tag ring into the buffer"))
(define-key edit-menu [senator-copy-tag-to-register]
'(menu-item "Copy Tag To Register" senator-copy-tag-to-register
:active (semantic-current-tag)
:enable (and (semantic-active-p)
(semantic-current-tag))
:help "Yank the head of the tag ring into the buffer"))
(define-key edit-menu [senator-copy-tag]
'(menu-item "Copy Tag" senator-copy-tag
:active (semantic-current-tag)
:enable (and (semantic-active-p)
(semantic-current-tag))
:help "Copy the current tag to the tag ring"))
(define-key edit-menu [senator-kill-tag]
'(menu-item "Kill Tag" senator-kill-tag
:active (semantic-current-tag)
:enable (and (semantic-active-p)
(semantic-current-tag))
:help "Kill the current tag, and copy it to the tag ring"))
;; Navigate Tags submenu:
(define-key navigate-menu [senator-narrow-to-defun]
'(menu-item "Narrow to Tag" senator-narrow-to-defun
:active (semantic-current-tag)
:enable (and (semantic-active-p)
(semantic-current-tag))
:help "Narrow the buffer to the bounds of the current tag"))
(define-key navigate-menu [semantic-narrow-to-defun-separator]
'("--"))
(define-key navigate-menu [semantic-symref-symbol]
'(menu-item "Find Tag References..." semantic-symref-symbol
:enable (semantic-active-p)
:help "Read a tag and list the references to it"))
(define-key navigate-menu [semantic-complete-jump]
'(menu-item "Find Tag Globally..." semantic-complete-jump
:enable (semantic-active-p)
:help "Read a tag name and find it in the current project"))
(define-key navigate-menu [semantic-complete-jump-local-members]
'(menu-item "Find Local Members ..." semantic-complete-jump-local-members
:enable (semantic-active-p)
:help "Read a tag name and find a local member with that name"))
(define-key navigate-menu [semantic-complete-jump-local]
'(menu-item "Find Tag in This Buffer..." semantic-complete-jump-local
:enable (semantic-active-p)
:help "Read a tag name and find it in this buffer"))
(define-key navigate-menu [semantic-navigation-separator]
'("--"))
(define-key navigate-menu [senator-go-to-up-reference]
'(menu-item "Parent Tag" senator-go-to-up-reference
:enable (semantic-active-p)
:help "Navigate up one reference by tag"))
(define-key navigate-menu [senator-next-tag]
'(menu-item "Next Tag" senator-next-tag
:enable (semantic-active-p)
:help "Go to the next tag"))
(define-key navigate-menu [senator-previous-tag]
'(menu-item "Previous Tag" senator-previous-tag
:enable (semantic-active-p)
:help "Go to the previous tag"))
;; Top level menu items:
(define-key cedet-menu-map [semantic-force-refresh]
'(menu-item "Reparse Buffer" semantic-force-refresh
:help "Force a full reparse of the current buffer"
:visible semantic-mode))
:visible semantic-mode
:enable (semantic-active-p)))
(define-key cedet-menu-map [semantic-edit-menu]
`(menu-item "Edit Tags" ,edit-menu
:visible semantic-mode))

33
lisp/cedet/semantic/analyze/complete.el
View file

@ -87,20 +87,25 @@ in a buffer."
;; In theory, we don't need the below since the context will
;; do it for us.
;;(semantic-refresh-tags-safe)
(with-syntax-table semantic-lex-syntax-table
(let* ((context (if (semantic-analyze-context-child-p context)
context
(semantic-analyze-current-context context)))
(ans (if (not context)
(error "Nothing to complete")
(:override))))
;; If interactive, display them.
(when (called-interactively-p 'any)
(with-output-to-temp-buffer "*Possible Completions*"
(semantic-analyze-princ-sequence ans "" (current-buffer)))
(shrink-window-if-larger-than-buffer
(get-buffer-window "*Possible Completions*")))
ans)))
(if (semantic-active-p)
(with-syntax-table semantic-lex-syntax-table
(let* ((context (if (semantic-analyze-context-child-p context)
context
(semantic-analyze-current-context context)))
(ans (if (not context)
(error "Nothing to complete")
(:override))))
;; If interactive, display them.
(when (called-interactively-p 'any)
(with-output-to-temp-buffer "*Possible Completions*"
(semantic-analyze-princ-sequence ans "" (current-buffer)))
(shrink-window-if-larger-than-buffer
(get-buffer-window "*Possible Completions*")))
ans))
;; Buffer was not parsed by Semantic.
;; Raise error if called interactively.
(when (called-interactively-p 'any)
(error "Buffer was not parsed by Semantic."))))
(defun semantic-analyze-possible-completions-default (context &optional flags)
"Default method for producing smart completions.

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