summaryrefslogtreecommitdiff
path: root/config.bat
Commit message (Expand)AuthorAgeFilesLines
* config.bat: fix some confusing wordingReuben Thomas2014-08-101-1/+1
* Minor fixes in the last commit wrt MS-DOS build.... config.bat: Fix EOL format in lines modified by last commit. msdos/INSTALL: Fix last change. Eli Zaretskii2014-08-091-28/+28
* Remove support for DJGPP < 2.02...This also removes some specially-licensed files and lots of accompanying explanation. Reuben Thomas2014-08-091-29/+28
* Fix the MSDOS build.... src/unexcoff.c [MSDOS]: Include libc/atexit.h. (copy_text_and_data): Zero out the atexit chain pointer before dumping Emacs. src/termhooks.h (encode_terminal_code): Update prototype. src/term.c (encode_terminal_code) [DOS_NT]: Make it externally visible for all DOS_NT ports, not just WINDOWSNT. (syms_of_term) [!MSDOS]: Don't define 'tty-menu-*' symbols on MSDOS. src/sysdep.c (emacs_sigaction_init, init_signals): Don't use SIGCHLD unless it is defined. (emacs_pipe) [MSDOS]: Redirect to 'pipe'. src/process.c (close_on_exec, accept4, process_socket): Move into the "ifdef subprocesses" part. (catch_child_signal): Condition by "ifdef subprocesses". (syms_of_process) <Qinternal_default_process_sentinel> <Qinternal_default_process_filter>: Condition by "ifdef subprocesses". src/msdos.h: Add prototypes for new functions. (EINPROGRESS): Define. (O_CLOEXEC): Define to zero. src/msdos.c (check_window_system): Remove unnecessary an incompatible duplicate function. (sys_opendir, readlinkat, faccessat, fstatat, unsetenv): New functions in support of new functionality. src/menu.c (single_menu_item): Add visual indication of submenu also for menus on MSDOS frames. (Fx_popup_menu) [!MSDOS]: Do not call tty_menu_show on MSDOS. src/lisp.h (CHECK_PROCESS) [!subprocesses]: Do not define when async subprocesses aren't supported. src/font.h (FONT_WIDTH) [MSDOS]: MSDOS-specific definition. src/emacs.c (close_output_streams): Zero out errno before calling close_stream. src/dired.c [MSDOS]: Include msdos.h. src/conf_post.h (opendir) [MSDOS]: Redirect to sys_opendir. (DATA_START) [MSDOS]: Define. (SYSTEM_PURESIZE_EXTRA) [MSDOS]: Enlarge by 25K. src/callproc.c (block_child_signal, unblock_child_signal) [MSDOS]: Ifdef away for MSDOS. (record_kill_process) [MSDOS]: Ifdef away the entire body for MSDOS. (call_process_cleanup) [MSDOS]: Ifdef away portions not relevant for MSDOS. (call_process) [MSDOS]: Fix call sequence of dostounix_filename. Use temporary file template that is compatible with mkostemp. Move vfork-related portions under #ifndef MSDOS. (syms_of_callproc): Unify templates of MSDOS and WINDOWSNT. lisp/term/pc-win.el (x-list-fonts, x-get-selection-value): Provide doc strings, as required by snarf-documentation. msdos/sedlisp.inp: msdos/sedlibmk.inp: msdos/sedleim.inp: msdos/sed3v2.inp: msdos/sed2v2.inp: msdos/sed1v2.inp: Update Sed scripts for Emacs 24.4. msdos/inttypes.h: Add PRIdMAX. msdos/INSTALL: Update for Emacs 24.4. msdos/sedadmin.inp: New file. Eli Zaretskii2014-04-161-2/+16
* Fix copyright years by hand....These are dates that admin/update-copyright did not update, or updated incorrectly. Paul Eggert2014-01-011-1/+1
* Remove the autogen/ directory...Ref: http://lists.gnu.org/archive/html/emacs-devel/2013-10/msg00806.html * autogen: Remove directory. Move update_autogen to admin/. * autogen.sh: Remove reference to copy_autogen. * GNUmakefile (configure): * Makefile.in (bootstrap): Do not try to run copy_autogen. * config.bat: Use msdos/autogen rather than autogen. * admin/update_autogen: Move here from ../autogen. (usage): Update. Remove -l, add -A. (autogendir): New variable. (ldefs_flag): Default to set. (genfiles): Reduce to only ms-dos relevant files. (main): Make checking autogen sources optional. Make copying of autogen files optional. * msdos/autogen/config.in: * msdos/autogen/Makefile.in: Move here from ../autogen. * nt/INSTALL: Remove reference to copy_autogen. * nt/config.nt: Comment. Glenn Morris2013-11-041-3/+3
* Update copyright notices for 2013.Paul Eggert2013-01-011-1/+1
* Adapt the MSDOS build to the latest changes on mainline.Eli Zaretskii2012-11-031-0/+1
* Use Gnulib stdalign and environ modules (Bug#9772, Bug#9960)....* .bzrignore: Add lib/stdalign.h. * config.bat: Do not set NO_DECL_ALIGN; no longer needed. Copy lib/stdalign.in.h to lib/stdalign.in-h as needed. * configure.ac (HAVE_ATTRIBUTE_ALIGNED): Remove the code that fiddles with this, as gnulib now does this for us. * admin/merge-gnulib: Add environ, stdalign. * m4/environ.m4: New file, from gnulib. * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate. * lib/stdalign.in.h, m4/stdalign.m4: New files, from gnulib. * sed2v2.inp (HAVE_ATTRIBUTE_ALIGNED): Remove edit. * sedlibmk.inp (STDALIGN_H, @GL_GENERATE_STDALIGN_H_TRUE@) (GL_GENERATE_STDALIGN_H_FALSE): New edits. * nt/config.nt (HAVE_ATTRIBUTE_ALIGNED): Remove. * src/alloc.c (XMALLOC_BASE_ALIGNMENT, GC_POINTER_ALIGNMENT, pure_alloc): Simplify by using alignof. (pure_alloc) [! USE_LSB_TAG]: Don't over-align EMACS_INT values. * src/lisp.h: Include <stdalign.h>. (GCALIGNMENT): New macro and constant. (DECL_ALIGN): Remove. All uses replaced by alignas (GCALIGNMENT). (USE_LSB_TAG): ifdef on alignas, not on DECL_ALIGN. (stdalign): New macro, if not already defined. Paul Eggert2012-07-281-17/+1
* Fix the MSDOS build following gnulib update.... config.bat (lib): Create/update lib/stdalign.in-h and lib/sys_types.in-h. msods/sedlibmk.inp (GNULIB_GL_UNISTD_H_GETOPT, GNULIB_POSIX_OPENPT) (GNULIB_ISATTY, GNULIB_PTSNAME_R, GNULIB_RANDOM) (GNULIB_SETHOSTNAME, HAVE_POSIX_OPENPT, HAVE_PTSNAME_R) (HAVE_RANDOM, HAVE_SETHOSTNAME, NEXT_SYS_TYPES_H) (NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H, REPLACE_FTRUNCATE) (REPLACE_ISATTY, REPLACE_PTSNAME_R, REPLACE_RANDOM_R) (REPLACE_STRTOIMAX, STDALIGN_H, WINDOWS_64_BIT_OFF_T) (WINDOWS_64_BIT_ST_SIZE, GL_GENERATE_STDALIGN_H_TRUE) (GL_GENERATE_STDALIGN_H_FALSE): Edit as appropriate for DJGPP. (cat FOO): Edit into "sed -e '' FOO >>". Eli Zaretskii2012-05-271-0/+2
* Convert some consecutive FSF copyright years to ranges; add 2012.Glenn Morris2012-01-051-3/+1
* Fix previous commit.... config.bat: Use config.in and Makefile.in from src/ and lib/, if they exist there, else from autogen/. make-dist: Don't add `autogen'. Eli Zaretskii2011-10-311-3/+6
* Restore GNUmakefile. Fix capitalization in config.bat.Eli Zaretskii2011-09-291-1/+1
* Fix the MSDOS build.... msdos/mainmake.v2 (boot): Condition the value on the existence of autogen/README, not admin/admin.el, since the latter is now part of the release tarball. (install): Don't copy lib-src/fns.el, as that file is no longer generated in that directory. msdos/sed1v2.inp (LIB_PTHREAD, LIB_PTHREAD_SIGMASK): Edit to empty. (SETTINGS_CFLAGS, SETTINGS_LIBS): Edit these instead of GCONF_CFLAGS and GCONF_LIBS. msdos/sedlibmk.inp (ALLOCA_H, AR, ARFLAGS, GNULIB_CHDIR, GNULIB_DUP) (GNULIB_FDATASYNC, GNULIB_FDOPEN, GNULIB_FSTAT, GNULIB_PCLOSE) (GNULIB_PTHREAD_SIGMASK, GNULIB_RAISE, GNULIB_SIGACTION) (GNULIB_SIGPROCMASK, GNULIB_SIGNAL_H_SIGPIPE, HAVE_FDATASYNC) (HAVE_PCLOSE, HAVE_POPEN, HAVE_POSIX_SIGNALBLOCKING) (HAVE_PTHREAD_SIGMASK, HAVE_RAISE, HAVE_SIGACTION) (HAVE_SIGHANDLER_T, HAVE_SIGINFO_T, HAVE_SIGSET_T) (HAVE_STRUCT_SIGACTION_SA_SIGACTION) (HAVE_TYPE_VOLATILE_SIG_ATOMIC_T, LIB_PTHREAD) (LIB_PTHREAD_SIGMASK, NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H) (NEXT_SIGNAL_H, REPLACE_FDOPEN, REPLACE_PTHREAD_SIGMASK) (REPLACE_RAISE): New edits. (gl_LIBOBJS): Remove md5.o, filemode.o, and sha1.o. Add pthread_sigmask.o. (@GL_GENERATE_ALLOCA_H_TRUE@, @GL_GENERATE_ALLOCA_H_FALSE@): Edit to comment out unneeded lines. (warn-on-use.h): Edit the recipe commands to work with DJGPP without requiring a Unixy shell. msdos/inttypes.h (strtoimax) [DJGPP < 2.04]: New macro. msdos/sed2v2.inp (HAVE_ALLOCA, HAVE_DECL_STRTOLL, HAVE_DECL_STRTOIMAX) (HAVE_STRTOLL, HAVE_SIGSET_T, HAVE_SNPRINTF): New edits. .bzrignore: Add ./GNUMakefile.unix. config.bat: Rename GNUMakefile, so it is not run on MS-DOS. Rename signal.in.h and alloca.in.h. src/sysdep.c (snprintf) [EOVERFLOW]: If EOVERFLOW is not defined, use EDOM. Eli Zaretskii2011-09-291-0/+4
* Use backslashes where DOS requires it.Paul Eggert2011-07-251-2/+2
* Merge from gnulib, using build-aux to remove clutter....* m4/largefile.m4: New file, so that Emacs does not mess up when accessing files with large inode numbers in MacOS X 10.5 and later. * m4/nocrash.m4: New file, to avoid triggering background debugger and/or create core dumps during 'configure'. * build-aux/move-if-change: Renamed from move-if-change. * build-aux/snippet/arg-nonnull.h: Renamed from arg-nonnull.h. * build-aux/snippet/c++defs.h: Renamed from c++defs.h. * build-aux/snippet/warn-on-use.h: Renamed from warn-on-use.h. * build-aux/snippet/_Noreturn.h: New file, for draft C1X _Noreturn. * .bzrignore: The autogenerated files compile, config.guess, config.sub, depcomp, install-sh, and missing are now in build-aux. * Makefile.in (epaths-force, sync-from-gnulib): move-if-change is now in build-aux. (GNULIB_TOOL_FLAGS): Avoid threadlib; this is now a prerequisite of gnulib's pthread_sigmask module, but Emacs doesn't need it. (mkdir): install-sh is now in build-aux. * config.bat: c++defs.h is now in build-aux/snippets. * configure.in: Specify AC_CONFIG_AUX_DIR with build-aux (the usual parameter). * lib/gnulib.mk, m4/gl-comp.m4: Regenerate. * lib/makefile.w32-in (ARG_NONNULL_H): arg-nonnull.h moved to build-aux/snippet. * lib/pthread_sigmask.c, lib/stdlib.in.h, m4/extensions.m4: * m4/getopt.m4, m4/gnulib-common.m4, m4/pthread_sigmask.m4: Merge from gnuilib. This fixes porting bugs on Cygwin, Irix, and Solaris, enables MacOS extensions, and enables nocrash during 'configure'. * make-dist: Adjust to new build-aux and build-aux/snippit dirs. * admin/notes/copyright: The files compile, config.guess, config.sub, depcomp, install-sh, missing, and move-if-change are now in the new build-aux subdirectory. The files arg-nonnull.h, c++defs.h, and warn-on-use.h are now in build-aux/snippets. New file build-aux/snippets/_Noreturn.h. * leim/Makefile.in (install): install-sh is now in build-aux. * lib-src/Makefile.in ($(DESTDIR)${archlibdir}): install-sh moved to build-aux. * msdos/sedlibmk.inp (CONFIG_CLEAN_VPATH_FILES): Adjust to snippet moves from top level to build-aux/snippet. * src/Makefile.in (gl-stamp): move-if-change is now in build-aux. Paul Eggert2011-07-241-2/+2
* Fix the MSDOS build as follows from 2011-05-19T06:04:16Z!rgm@gnu.org, 2011-05...... config.bat: Concatenate lisp.mk onto the end of src/Makefile. msdos/sed1v2.inp (make-docfile commands): Recognize only if the line begins with a TAB. Use $(etc) rather than a literal "../etc". (`sed SED-COMMAND $(srcdir)/lisp.mk`): Edit to replace with "$(lisp). (@lisp_frag@): Edit out. msdos/sedlibmk.inp (GNULIB_GROUP_MEMBER, HAVE_GROUP_MEMBER): Edit to zero. src/callproc.c (Fcall_process) [MSDOS]: Fix arguments to report_file_error introduced by the change from 2011-05-07. Eli Zaretskii2011-05-201-1/+1
* Fix previous commit.... config.bat: Use autogen/config.in in one more place. msdos/sedlibmk.inp (GNULIB_PRINTF, GNULIB_PRINTF_POSIX): Add missing variables. (MKDIR_P): Fix replacement command. (NEXT_AS_FIRST_DIRECTIVE_STDIO_H, NEXT_STDIO_H): Edit to "<stdio.h>", as lib/stdio.h cannot be left unused. Eli Zaretskii2011-03-251-1/+1
* Adapt config.bat and msdos/sedlibmk.inp to autogen and addition of stdio.... msdos/sedlibmk.inp: Adapt to addition of the gnulib stdio module. config.bat: Generate src/config.h and lib/Makefile from autogen/config.in and autogen/Makefile.in. Eli Zaretskii2011-03-251-2/+3
* Fix the MS-DOS configury due to new gnulib modules.... config.bat: Rename stdint.in.h and sys_stat.in.h. Call depfiles.bat even if lib/deps already exist. msdos/depfiles.bat: Create a dummy .Po file only if a file by the same name does not already exist in the deps/ subdirectory. Eli Zaretskii2011-02-261-3/+6
* Fix generation of auto-dependency files in lib/.... .bzrignore: Add lib/deps/. config.bat: Generate *.Po files in lib/deps. msdos/sedlibmk.inp (CONFIG_CLEAN_VPATH_FILES): Fix editing of *-clean rules. msdos/depfiles.bat: New file. Eli Zaretskii2011-02-191-0/+3
* Initial version of fix for the MS-DOS build, not yet tested.... config.bat: Configure in `lib'. msdos/sedlibmk.inp: New file. msdos/sedlibcf.inp: New file. msdos/sed1v2.inp (NS_OBJC_OBJ): Edit to empty. (@true): Edit to "@rem". (move-if-change): Edit to "update". (echo): Edit to "djecho". (cd $(lib) && ...): Edit to "$(MAKE) -C ...". msdos/mainmake.v2 (version): Remove, no longer needed (config.in defines VERSION). (all): Add lib. (lib): New target and recipe. (lib-src): Depend on lib. (src): Depend on lib and lib-src. (clean, mostlyclean, distclean, maintainer-clean, extraclean) (bootstrap-clean): Recurse into lib. msdos/sed2v2.inp: Remove workaround for the "#if ! HAVE_MKTIME || BROKEN_MKTIME" stuff -- it's no longer in src/config.in. (HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV) (HAVE__BOOL): Edit to 1. (VERSION, inline, restrict): Edit for DJGPP. src/s/msdos.h (strtold): Define to _strtold. admin/admin.el (set-version): Add msdos/sed2v2.inp. Eli Zaretskii2011-02-191-1/+18
* Nuke arch-tags.Glenn Morris2011-01-151-3/+0
* Merge from emacs-23Stefan Monnier2011-01-141-1/+1
|\
| * Add 2011 to FSF/AIST copyright years.Glenn Morris2011-01-021-1/+1
* | Restore files that I seem to have mistakenly deleted.Katsumi Yamaoka2010-12-031-0/+321
* | gnus-demon.el (gnus-demon-init): Fix time computing when time is nil.Julien Danjou2010-12-031-321/+0
* | Support building with libxml2, if it is installed.... config.bat: Detect that libxml2 is installed and if so, build with it. Eli Zaretskii2010-09-181-0/+26
* | Update config.bat due to lisp/gnus/.dir-locals.el.... config.bat: Produce lisp/gnus/_dir-locals.el from lisp/gnus/.dir-locals.el. Eli Zaretskii2010-09-041-0/+1
* | Fix the MS-DOS build due to changes in configury.... config.bat: Remove white space around "+" in COPY commands. msods/mainmake.v2 (version): Use emacs_version[] in src/emacs.c instead of lisp/version.el (see 2010-05-15T21:11:37Z!raeburn@raeburn.org). msdos/sed1v2.inp (MKDEPDIR): Edit to empty. Delete lines in rules that invoke $(MKDEPDIR). Fix editing rules that begin with "cd ../lisp". Edit out sh if-then-else-fi constructs that test ${CANNOT_DUMP}. Edit out "|| exit ;\" constructs in emacs${EXEEXT} rule. Eli Zaretskii2010-06-261-1/+1
* | Do not preprocess src/Makefile.in....* configure.in: Do not preprocess src/Makefile.in. (cpp_undefs, CPP_NEED_TRADITIONAL): Remove. (AC_EGREP_CPP): Test no longer needed. * configure: Regenerate. * config.bat: Do not preprocess src/Makefile.in. * make-dist: No more Makefile.c files. * INSTALL, src/README: Makefiles are not preprocessed. * src/Makefile.in, src/autodeps.mk, src/deps.mk, src/ns.mk: Convert comments to Makefile format. * lib-src/Makefile.in (distclean): No more Makefile.c. * src/Makefile.in (bootstrap-clean): No more Makefile.c. * admin/notes/cpp: Remove file. * admin/quick-install-emacs (AVOID): No more Makefile.c files. * etc/PROBLEMS, etc/MACHINES: Remove details of cpp problems which can no longer occur. Glenn Morris2010-05-261-5/+4
* | * config.bat: Need to add the deps.mk file before running cpp.Glenn Morris2010-05-191-4/+4
* | Handle auto-depend with configure....* make-dist (src): Include *.mk. * config.bat: Concatenate deps.mk onto the end of src/Makefile. * configure.in (DEPFLAGS, MKDEPDIR): New output variables. (deps_frag): New output file. (AUTO_DEPEND): Remove this definition. * src/Makefile.in (DEPDIR): New constant. (DEPFLAGS): Set with configure, not cpp. (MKDEPDIR): New, set by configure. (.c.o, .m.o, ecrt0.o): Use $MKDEPDIR. (clean): Use $DEPDIR. (deps_frag): Include from configure. Move static/dynamic dependency stuff to deps.mk/autodeps.mk. * src/deps.mk, src/autodeps.mk: New files, extracted from Makefile.in. * msdos/sed1v2.inp (DEPFLAGS, deps_frag): Edit to empty. (MKDEPDIR): Edit to ':'. Glenn Morris2010-05-191-2/+3
* | Set rallocobj with configure, not cpp....* configure.in (REL_ALLOC): Unset on gnu, gnu-linux if DOUG_LEA_MALLOC. (RALLOC_OBJ): New output variable. * config.bat (RALLOC_OBJ): Edit to empty if sys_malloc. * src/Makefile.in (RALLOC_OBJ): New, set by configure. (rallocobj): Replace with the previous variable. (otherobj): Use $RALLOC_OBJ. * src/s/gnu.h (REL_ALLOC) [DOUG_LEA_MALLOC]: * src/s/gnu-linux.h (REL_ALLOC) [DOUG_LEA_MALLOC]: Move undef to configure. * msdos/sed1v2.inp (RALLOC_OBJ): Edit to ralloc.o. Glenn Morris2010-05-171-2/+3
* | Define some malloc objects with configure, not cpp....* configure.in (GMALLOC_OBJ, VMLIMIT_OBJ): New output variables. * config.bat (GMALLOC_OBJ, VMLIMIT_OBJ): Edit to empty if sys_malloc. * src/Makefile.in (GMALLOC_OBJ, VMLIMIT_OBJ): New, set by configure. (gmallocobj, vmlimitobj): Replace with previous two variables. (otherobj): Use $GMALLOC_OBJ, $VMLIMIT_OBJ. * msdos/sed1v2.inp (GMALLOC_OBJ): Edit to gmalloc.o. (VMLIMIT_OBJ): Edit to vm-limit.o. Glenn Morris2010-05-171-0/+6
* | config.bat: Remove support for DJGPP v1.x.Eli Zaretskii2010-05-151-23/+4
* | Do not preprocess lib-src/Makefile.in...* configure.in: Generate lib-src/Makefile directly, do not run cpp. * config.bat: Do not run cpp on lib-src/Makefile.in. * lib-src/Makefile.in: Convert comments to makefile format. * admin/notes/cpp: lib-src/Makefile not preprocessed. Glenn Morris2010-05-101-6/+2
* | On msdos, set LIBS_SYSTEM with config.bat, not cpp....* config.bat [HAVE_X11]: Run sed3x.inp on lib-src/Makefile. * src/Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset. * src/s/msdos.h (MSDOS_LIBS_SYSTEM): Remove. * msdos/sed1x.inp (LIBS_SYSTEM): Edit to -lxext -lsys. * msdos/sed3x.inp: New file. * lib-src/Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset. (config.h) [MSDOS]: Do not include. Glenn Morris2010-05-101-0/+5
* | Fix the "config msdos" step of MS-DOS build (due to removal of some cpp stuff...... config.bat: Allow for 2 leading `#'s in comments in src/Makefile.in. src/Makefile.in: Don't use Make-style comments past the "start of cpp stuff" line. Eli Zaretskii2010-05-071-1/+1
* | Fix the MSDOS build as fallout from the latest Makefile.in changes.... config.bat <lib-src>: Edit out lines that begin with several # characters. msdos/sedlisp.inp (VPATH): Don't edit, no longer needed. (lisp, srcdir): Adapt to lisp/Makefile.in changes. (abs_top_builddir): New edit. msdos/sed3v2.inp (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB) (LIBHESIOD, LIBRESOLV, LIBS_MAIL): Edit to empty values. msdos/sed3.inp (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB) (LIBHESIOD, LIBRESOLV, LIBS_MAIL): Edit to empty values. msdos/sed1v2.inp (abs_builddir): Edit into "../src". Eli Zaretskii2010-03-271-1/+1
|/
* Add 2010 to copyright years.Glenn Morris2010-01-131-1/+1
* Copy .dbxinit to _dbxinit.Eli Zaretskii2009-02-281-0/+1
* Add 2009 to copyright years.Glenn Morris2009-01-081-1/+1
* Produce _dir-locals.el from .dir-locals.el.Eli Zaretskii2008-12-261-0/+1
* (--with-system-malloc): New option; see msdos/INSTALL for rationale.Eli Zaretskii2008-12-191-3/+19
* Tell user to expect one "File not found" message while the `doc' directory...is being configured. Eli Zaretskii2008-10-311-1/+1
* Fix last change: don't use < and > in "rem" lines, they are interpreted...as redirection by DOS shells. Eli Zaretskii2008-05-071-1/+1
* Switch to recommended form of GPLv3 permissions notice.Glenn Morris2008-05-071-6/+5
* Merge from emacs--rel--22...Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987 Miles Bader2008-01-081-1/+1
|\
| * Add 2008 to copyright years.Glenn Morris2008-01-071-1/+1