Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 102986. ------------------------------------------------------------ revno: 102986 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-01-26 23:54:04 -0800 message: msb.el trivia. * lisp/msb.el (msb-after-load-hooks): Make it an obsolete alias. (msb-after-load-hook): Remove eval-after-load wackiness. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-01-27 07:19:26 +0000 +++ lisp/ChangeLog 2011-01-27 07:54:04 +0000 @@ -1,3 +1,8 @@ +2011-01-27 Glenn Morris + + * msb.el (msb-after-load-hooks): Make it an obsolete alias. + (msb-after-load-hook): Remove eval-after-load wackiness. + 2011-01-25 Sam Steingold * vc/vc-svn.el (vc-svn-diff): Use `diff-command' instead of the === modified file 'lisp/msb.el' --- lisp/msb.el 2011-01-25 04:08:28 +0000 +++ lisp/msb.el 2011-01-27 07:54:04 +0000 @@ -364,6 +364,9 @@ :set 'msb-custom-set :group 'msb) +(define-obsolete-variable-alias 'msb-after-load-hooks + 'msb-after-load-hook "24.1") + (defcustom msb-after-load-hook nil "Hook run after the msb package has been loaded." :type 'hook @@ -1151,6 +1154,6 @@ nil) (provide 'msb) -(eval-after-load "msb" '(run-hooks 'msb-after-load-hook 'msb-after-load-hooks)) +(run-hooks 'msb-after-load-hook) ;;; msb.el ends here ------------------------------------------------------------ revno: 102985 [merge] committer: Paul Eggert branch nick: trunk timestamp: Wed 2011-01-26 23:27:41 -0800 message: Merge: fix two m4/gnulib-*.m4 file names that clashed under MS-DOS diff: === modified file 'ChangeLog' --- ChangeLog 2011-01-26 08:36:39 +0000 +++ ChangeLog 2011-01-27 07:24:57 +0000 @@ -1,3 +1,18 @@ +2011-01-27 Paul Eggert + + fix two m4/gnulib-*.m4 file names that clashed under MS-DOS + * Makefile.in (DOS-gnulib-comp.m4): New macro. + (sync-from-gnulib): Rename m4/gnulib-comp.m4 to m4/gl-comp.m4 to avoid + problems with MS-DOS 8+3 file name restrictions. + Remove m4/gnulib-cache.m4, as we can live without it. If we kept + it, it would also cause problems when extracting Emacs distribution + tarballs on MS-DOS hosts. + (ACLOCAL_INPUTS): Adjust to file renaming. + * aclocal.m4, configure, lib/Makefile.in, src/config.in: Regenerate. + * config.guess, config.sub: Sync from gnulib. + * m4/gnulib-cache.m4: Remove from repository. + * m4/gl-comp.m4: Rename from m4/gnulib-comp.m4. + 2011-01-25 Glenn Morris * README: Add a note about ranges in copyright years. === modified file 'Makefile.in' --- Makefile.in 2011-01-26 08:36:39 +0000 +++ Makefile.in 2011-01-27 07:24:57 +0000 @@ -324,6 +324,9 @@ $(gnulib_srcdir): git clone git://git.savannah.gnu.org/gnulib.git $@ +# A shorter name that satisfies MS-DOS 8+3 constraints. +DOS-gnulib-comp.m4 = gl-comp.m4 + # Update modules from gnulib, for maintainers, who should have it in # $(gnulib_srcdir) (relative to $(srcdir) and should have build tools # as per $(gnulib_srcdir)/DEPENDENCIES. @@ -333,7 +336,8 @@ sync-from-gnulib: $(gnulib_srcdir) cd $(srcdir) && \ $(gnulib_srcdir)/gnulib-tool $(GNULIB_TOOL_FLAGS) $(GNULIB_MODULES) - rm $(srcdir)/m4/warn-on-use.m4 + cd $(srcdir)/m4 && rm gnulib-cache.m4 warn-on-use.m4 + cd $(srcdir)/m4 && mv gnulib-comp.m4 $(DOS-gnulib-comp.m4) cp $(gnulib_srcdir)/build-aux/texinfo.tex $(srcdir)/doc/misc cp \ $(gnulib_srcdir)/build-aux/config.sub \ @@ -406,7 +410,7 @@ $(srcdir)/configure: $(AUTOCONF_INPUTS) cd ${srcdir} && autoconf -ACLOCAL_INPUTS = @MAINT@ $(srcdir)/m4/gnulib-comp.m4 +ACLOCAL_INPUTS = @MAINT@ $(srcdir)/m4/$(DOS-gnulib-comp.m4) $(srcdir)/aclocal.m4: $(ACLOCAL_INPUTS) cd $(srcdir) && aclocal -I m4 === modified file 'aclocal.m4' --- aclocal.m4 2011-01-24 04:53:39 +0000 +++ aclocal.m4 2011-01-27 07:24:57 +0000 @@ -988,8 +988,8 @@ m4_include([m4/c-strtod.m4]) m4_include([m4/extensions.m4]) m4_include([m4/getopt.m4]) +m4_include([m4/gl-comp.m4]) m4_include([m4/gnulib-common.m4]) -m4_include([m4/gnulib-comp.m4]) m4_include([m4/include_next.m4]) m4_include([m4/mktime.m4]) m4_include([m4/multiarch.m4]) === modified file 'config.guess' --- config.guess 2011-01-07 19:39:48 +0000 +++ config.guess 2011-01-27 07:24:57 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011 Free Software Foundation, Inc. -timestamp='2010-09-24' +timestamp='2011-01-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -57,7 +57,7 @@ Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -92,7 +92,7 @@ exit 1 fi -trap 'exit 1' HUP INT TERM +trap 'exit 1' 1 2 15 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires @@ -106,7 +106,7 @@ set_cc_for_build=' trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || @@ -270,7 +270,10 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead === modified file 'config.sub' --- config.sub 2011-01-07 19:39:48 +0000 +++ config.sub 2011-01-27 07:24:57 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011 Free Software Foundation, Inc. -timestamp='2010-12-11' +timestamp='2011-01-01' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software === modified file 'configure' --- configure 2011-01-25 03:47:47 +0000 +++ configure 2011-01-27 07:24:57 +0000 @@ -4007,6 +4007,17 @@ CFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CFLAGS" ;; + ia64*-hp-hpux1[1-9]* ) + machine=hp800 opsys=hpux11 + ## FIXME. Peter O'Gorman reports that dumping using unexelf.o doesn't + ## work either: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=6811 + CANNOT_DUMP=yes + ;; + + hppa*-*-linux-gnu* ) + machine=hp800 opsys=gnu-linux + ;; + ## IBM machines rs6000-ibm-aix4.[23]* ) machine=ibmrs6000 opsys=aix4-2 @@ -6552,15 +6563,16 @@ CPP=`eval "echo $CPP"` -CANNOT_DUMP=no +test "x$CANNOT_DUMP" = "x" && CANNOT_DUMP=no case "$opsys" in - your-opsys-here) - CANNOT_DUMP=yes + your-opsys-here) CANNOT_DUMP=yes ;; +esac + +test "$CANNOT_DUMP" = "yes" && \ $as_echo "#define CANNOT_DUMP 1" >>confdefs.h - ;; -esac + === modified file 'lib/Makefile.in' --- lib/Makefile.in 2011-01-24 04:53:39 +0000 +++ lib/Makefile.in 2011-01-27 07:24:57 +0000 @@ -51,8 +51,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/c-strtod.m4 $(top_srcdir)/m4/extensions.m4 \ - $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 \ + $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gl-comp.m4 \ + $(top_srcdir)/m4/gnulib-common.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/mktime.m4 \ $(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/stddef_h.m4 \ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ === added file 'm4/gl-comp.m4' --- m4/gl-comp.m4 1970-01-01 00:00:00 +0000 +++ m4/gl-comp.m4 2011-01-27 07:24:57 +0000 @@ -0,0 +1,266 @@ +# DO NOT EDIT! GENERATED AUTOMATICALLY! +# Copyright (C) 2002-2011 Free Software Foundation, Inc. +# +# This file is free software, distributed under the terms of the GNU +# General Public License. As a special exception to the GNU General +# Public License, this file may be distributed as part of a program +# that contains a configuration script generated by Autoconf, under +# the same distribution terms as the rest of that program. +# +# Generated by gnulib-tool. +# +# This file represents the compiled summary of the specification in +# gnulib-cache.m4. It lists the computed macro invocations that need +# to be invoked from configure.ac. +# In projects that use version control, this file can be treated like +# other built files. + + +# This macro should be invoked from ./configure.in, in the section +# "Checks for programs", right after AC_PROG_CC, and certainly before +# any checks for libraries, header files, types and library functions. +AC_DEFUN([gl_EARLY], +[ + m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace + m4_pattern_allow([^gl_ES$])dnl a valid locale name + m4_pattern_allow([^gl_LIBOBJS$])dnl a variable + m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable + AC_REQUIRE([AC_PROG_RANLIB]) + # Code from module arg-nonnull: + # Code from module c++defs: + # Code from module dtoastr: + # Code from module extensions: + AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + # Code from module getopt-gnu: + # Code from module getopt-posix: + # Code from module gettext-h: + # Code from module include_next: + # Code from module intprops: + # Code from module mktime: + # Code from module multiarch: + # Code from module stddef: + # Code from module time: + # Code from module time_r: + # Code from module unistd: + # Code from module warn-on-use: +]) + +# This macro should be invoked from ./configure.in, in the section +# "Check for header files, types and library functions". +AC_DEFUN([gl_INIT], +[ + AM_CONDITIONAL([GL_COND_LIBTOOL], [false]) + gl_cond_libtool=false + gl_libdeps= + gl_ltlibdeps= + gl_m4_base='m4' + m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ])) + m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS])) + m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES])) + m4_pushdef([gl_LIBSOURCES_LIST], []) + m4_pushdef([gl_LIBSOURCES_DIR], []) + gl_COMMON + gl_source_base='lib' + # Code from module arg-nonnull: + # Code from module c++defs: + # Code from module dtoastr: + AC_REQUIRE([gl_C99_STRTOLD]) + # Code from module extensions: + # Code from module getopt-gnu: + gl_FUNC_GETOPT_GNU + gl_MODULE_INDICATOR_FOR_TESTS([getopt-gnu]) + # Code from module getopt-posix: + gl_FUNC_GETOPT_POSIX + # Code from module gettext-h: + AC_SUBST([LIBINTL]) + AC_SUBST([LTLIBINTL]) + # Code from module include_next: + # Code from module intprops: + # Code from module mktime: + gl_FUNC_MKTIME + gl_TIME_MODULE_INDICATOR([mktime]) + # Code from module multiarch: + gl_MULTIARCH + # Code from module stddef: + gl_STDDEF_H + # Code from module time: + gl_HEADER_TIME_H + # Code from module time_r: + gl_TIME_R + gl_TIME_MODULE_INDICATOR([time_r]) + # Code from module unistd: + gl_UNISTD_H + # Code from module warn-on-use: + # End of code from modules + m4_ifval(gl_LIBSOURCES_LIST, [ + m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ || + for gl_file in ]gl_LIBSOURCES_LIST[ ; do + if test ! -r ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file ; then + echo "missing file ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file" >&2 + exit 1 + fi + done])dnl + m4_if(m4_sysval, [0], [], + [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) + ]) + m4_popdef([gl_LIBSOURCES_DIR]) + m4_popdef([gl_LIBSOURCES_LIST]) + m4_popdef([AC_LIBSOURCES]) + m4_popdef([AC_REPLACE_FUNCS]) + m4_popdef([AC_LIBOBJ]) + AC_CONFIG_COMMANDS_PRE([ + gl_libobjs= + gl_ltlibobjs= + if test -n "$gl_LIBOBJS"; then + # Remove the extension. + sed_drop_objext='s/\.o$//;s/\.obj$//' + for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do + gl_libobjs="$gl_libobjs $i.$ac_objext" + gl_ltlibobjs="$gl_ltlibobjs $i.lo" + done + fi + AC_SUBST([gl_LIBOBJS], [$gl_libobjs]) + AC_SUBST([gl_LTLIBOBJS], [$gl_ltlibobjs]) + ]) + gltests_libdeps= + gltests_ltlibdeps= + m4_pushdef([AC_LIBOBJ], m4_defn([gltests_LIBOBJ])) + m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gltests_REPLACE_FUNCS])) + m4_pushdef([AC_LIBSOURCES], m4_defn([gltests_LIBSOURCES])) + m4_pushdef([gltests_LIBSOURCES_LIST], []) + m4_pushdef([gltests_LIBSOURCES_DIR], []) + gl_COMMON + gl_source_base='tests' +changequote(,)dnl + gltests_WITNESS=IN_`echo "${PACKAGE-$PACKAGE_TARNAME}" | LC_ALL=C tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ | LC_ALL=C sed -e 's/[^A-Z0-9_]/_/g'`_GNULIB_TESTS +changequote([, ])dnl + AC_SUBST([gltests_WITNESS]) + gl_module_indicator_condition=$gltests_WITNESS + m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [$gl_module_indicator_condition]) + m4_popdef([gl_MODULE_INDICATOR_CONDITION]) + m4_ifval(gltests_LIBSOURCES_LIST, [ + m4_syscmd([test ! -d ]m4_defn([gltests_LIBSOURCES_DIR])[ || + for gl_file in ]gltests_LIBSOURCES_LIST[ ; do + if test ! -r ]m4_defn([gltests_LIBSOURCES_DIR])[/$gl_file ; then + echo "missing file ]m4_defn([gltests_LIBSOURCES_DIR])[/$gl_file" >&2 + exit 1 + fi + done])dnl + m4_if(m4_sysval, [0], [], + [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) + ]) + m4_popdef([gltests_LIBSOURCES_DIR]) + m4_popdef([gltests_LIBSOURCES_LIST]) + m4_popdef([AC_LIBSOURCES]) + m4_popdef([AC_REPLACE_FUNCS]) + m4_popdef([AC_LIBOBJ]) + AC_CONFIG_COMMANDS_PRE([ + gltests_libobjs= + gltests_ltlibobjs= + if test -n "$gltests_LIBOBJS"; then + # Remove the extension. + sed_drop_objext='s/\.o$//;s/\.obj$//' + for i in `for i in $gltests_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do + gltests_libobjs="$gltests_libobjs $i.$ac_objext" + gltests_ltlibobjs="$gltests_ltlibobjs $i.lo" + done + fi + AC_SUBST([gltests_LIBOBJS], [$gltests_libobjs]) + AC_SUBST([gltests_LTLIBOBJS], [$gltests_ltlibobjs]) + ]) + LIBGNU_LIBDEPS="$gl_libdeps" + AC_SUBST([LIBGNU_LIBDEPS]) + LIBGNU_LTLIBDEPS="$gl_ltlibdeps" + AC_SUBST([LIBGNU_LTLIBDEPS]) +]) + +# Like AC_LIBOBJ, except that the module name goes +# into gl_LIBOBJS instead of into LIBOBJS. +AC_DEFUN([gl_LIBOBJ], [ + AS_LITERAL_IF([$1], [gl_LIBSOURCES([$1.c])])dnl + gl_LIBOBJS="$gl_LIBOBJS $1.$ac_objext" +]) + +# Like AC_REPLACE_FUNCS, except that the module name goes +# into gl_LIBOBJS instead of into LIBOBJS. +AC_DEFUN([gl_REPLACE_FUNCS], [ + m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl + AC_CHECK_FUNCS([$1], , [gl_LIBOBJ($ac_func)]) +]) + +# Like AC_LIBSOURCES, except the directory where the source file is +# expected is derived from the gnulib-tool parameterization, +# and alloca is special cased (for the alloca-opt module). +# We could also entirely rely on EXTRA_lib..._SOURCES. +AC_DEFUN([gl_LIBSOURCES], [ + m4_foreach([_gl_NAME], [$1], [ + m4_if(_gl_NAME, [alloca.c], [], [ + m4_define([gl_LIBSOURCES_DIR], [lib]) + m4_append([gl_LIBSOURCES_LIST], _gl_NAME, [ ]) + ]) + ]) +]) + +# Like AC_LIBOBJ, except that the module name goes +# into gltests_LIBOBJS instead of into LIBOBJS. +AC_DEFUN([gltests_LIBOBJ], [ + AS_LITERAL_IF([$1], [gltests_LIBSOURCES([$1.c])])dnl + gltests_LIBOBJS="$gltests_LIBOBJS $1.$ac_objext" +]) + +# Like AC_REPLACE_FUNCS, except that the module name goes +# into gltests_LIBOBJS instead of into LIBOBJS. +AC_DEFUN([gltests_REPLACE_FUNCS], [ + m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl + AC_CHECK_FUNCS([$1], , [gltests_LIBOBJ($ac_func)]) +]) + +# Like AC_LIBSOURCES, except the directory where the source file is +# expected is derived from the gnulib-tool parameterization, +# and alloca is special cased (for the alloca-opt module). +# We could also entirely rely on EXTRA_lib..._SOURCES. +AC_DEFUN([gltests_LIBSOURCES], [ + m4_foreach([_gl_NAME], [$1], [ + m4_if(_gl_NAME, [alloca.c], [], [ + m4_define([gltests_LIBSOURCES_DIR], [tests]) + m4_append([gltests_LIBSOURCES_LIST], _gl_NAME, [ ]) + ]) + ]) +]) + +# This macro records the list of files which have been installed by +# gnulib-tool and may be removed by future gnulib-tool invocations. +AC_DEFUN([gl_FILE_LIST], [ + build-aux/arg-nonnull.h + build-aux/c++defs.h + build-aux/warn-on-use.h + lib/dtoastr.c + lib/ftoastr.c + lib/ftoastr.h + lib/getopt.c + lib/getopt.in.h + lib/getopt1.c + lib/getopt_int.h + lib/gettext.h + lib/intprops.h + lib/mktime-internal.h + lib/mktime.c + lib/stddef.in.h + lib/time.in.h + lib/time_r.c + lib/unistd.in.h + m4/00gnulib.m4 + m4/c-strtod.m4 + m4/extensions.m4 + m4/getopt.m4 + m4/gnulib-common.m4 + m4/include_next.m4 + m4/mktime.m4 + m4/multiarch.m4 + m4/stddef_h.m4 + m4/time_h.m4 + m4/time_r.m4 + m4/unistd_h.m4 + m4/warn-on-use.m4 + m4/wchar_t.m4 +]) === removed file 'm4/gnulib-cache.m4' --- m4/gnulib-cache.m4 2011-01-12 06:13:06 +0000 +++ m4/gnulib-cache.m4 1970-01-01 00:00:00 +0000 @@ -1,37 +0,0 @@ -# Copyright (C) 2002-2011 Free Software Foundation, Inc. -# -# This file is free software, distributed under the terms of the GNU -# General Public License. As a special exception to the GNU General -# Public License, this file may be distributed as part of a program -# that contains a configuration script generated by Autoconf, under -# the same distribution terms as the rest of that program. -# -# Generated by gnulib-tool. -# -# This file represents the specification of how gnulib-tool is used. -# It acts as a cache: It is written and read by gnulib-tool. -# In projects that use version control, this file is meant to be put under -# version control, like the configure.ac and various Makefile.am files. - - -# Specification in the form of a command-line invocation: -# gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files dtoastr getopt-gnu mktime - -# Specification in the form of a few gnulib-tool.m4 macro invocations: -gl_LOCAL_DIR([]) -gl_MODULES([ - dtoastr - getopt-gnu - mktime -]) -gl_AVOID([]) -gl_SOURCE_BASE([lib]) -gl_M4_BASE([m4]) -gl_PO_BASE([]) -gl_DOC_BASE([doc]) -gl_TESTS_BASE([tests]) -gl_LIB([libgnu]) -gl_MAKEFILE_NAME([gnulib.mk]) -gl_MACRO_PREFIX([gl]) -gl_PO_DOMAIN([]) -gl_VC_FILES([false]) === removed file 'm4/gnulib-comp.m4' --- m4/gnulib-comp.m4 2011-01-12 06:13:06 +0000 +++ m4/gnulib-comp.m4 1970-01-01 00:00:00 +0000 @@ -1,266 +0,0 @@ -# DO NOT EDIT! GENERATED AUTOMATICALLY! -# Copyright (C) 2002-2011 Free Software Foundation, Inc. -# -# This file is free software, distributed under the terms of the GNU -# General Public License. As a special exception to the GNU General -# Public License, this file may be distributed as part of a program -# that contains a configuration script generated by Autoconf, under -# the same distribution terms as the rest of that program. -# -# Generated by gnulib-tool. -# -# This file represents the compiled summary of the specification in -# gnulib-cache.m4. It lists the computed macro invocations that need -# to be invoked from configure.ac. -# In projects that use version control, this file can be treated like -# other built files. - - -# This macro should be invoked from ./configure.in, in the section -# "Checks for programs", right after AC_PROG_CC, and certainly before -# any checks for libraries, header files, types and library functions. -AC_DEFUN([gl_EARLY], -[ - m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace - m4_pattern_allow([^gl_ES$])dnl a valid locale name - m4_pattern_allow([^gl_LIBOBJS$])dnl a variable - m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable - AC_REQUIRE([AC_PROG_RANLIB]) - # Code from module arg-nonnull: - # Code from module c++defs: - # Code from module dtoastr: - # Code from module extensions: - AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - # Code from module getopt-gnu: - # Code from module getopt-posix: - # Code from module gettext-h: - # Code from module include_next: - # Code from module intprops: - # Code from module mktime: - # Code from module multiarch: - # Code from module stddef: - # Code from module time: - # Code from module time_r: - # Code from module unistd: - # Code from module warn-on-use: -]) - -# This macro should be invoked from ./configure.in, in the section -# "Check for header files, types and library functions". -AC_DEFUN([gl_INIT], -[ - AM_CONDITIONAL([GL_COND_LIBTOOL], [false]) - gl_cond_libtool=false - gl_libdeps= - gl_ltlibdeps= - gl_m4_base='m4' - m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ])) - m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS])) - m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES])) - m4_pushdef([gl_LIBSOURCES_LIST], []) - m4_pushdef([gl_LIBSOURCES_DIR], []) - gl_COMMON - gl_source_base='lib' - # Code from module arg-nonnull: - # Code from module c++defs: - # Code from module dtoastr: - AC_REQUIRE([gl_C99_STRTOLD]) - # Code from module extensions: - # Code from module getopt-gnu: - gl_FUNC_GETOPT_GNU - gl_MODULE_INDICATOR_FOR_TESTS([getopt-gnu]) - # Code from module getopt-posix: - gl_FUNC_GETOPT_POSIX - # Code from module gettext-h: - AC_SUBST([LIBINTL]) - AC_SUBST([LTLIBINTL]) - # Code from module include_next: - # Code from module intprops: - # Code from module mktime: - gl_FUNC_MKTIME - gl_TIME_MODULE_INDICATOR([mktime]) - # Code from module multiarch: - gl_MULTIARCH - # Code from module stddef: - gl_STDDEF_H - # Code from module time: - gl_HEADER_TIME_H - # Code from module time_r: - gl_TIME_R - gl_TIME_MODULE_INDICATOR([time_r]) - # Code from module unistd: - gl_UNISTD_H - # Code from module warn-on-use: - # End of code from modules - m4_ifval(gl_LIBSOURCES_LIST, [ - m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ || - for gl_file in ]gl_LIBSOURCES_LIST[ ; do - if test ! -r ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file ; then - echo "missing file ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file" >&2 - exit 1 - fi - done])dnl - m4_if(m4_sysval, [0], [], - [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) - ]) - m4_popdef([gl_LIBSOURCES_DIR]) - m4_popdef([gl_LIBSOURCES_LIST]) - m4_popdef([AC_LIBSOURCES]) - m4_popdef([AC_REPLACE_FUNCS]) - m4_popdef([AC_LIBOBJ]) - AC_CONFIG_COMMANDS_PRE([ - gl_libobjs= - gl_ltlibobjs= - if test -n "$gl_LIBOBJS"; then - # Remove the extension. - sed_drop_objext='s/\.o$//;s/\.obj$//' - for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do - gl_libobjs="$gl_libobjs $i.$ac_objext" - gl_ltlibobjs="$gl_ltlibobjs $i.lo" - done - fi - AC_SUBST([gl_LIBOBJS], [$gl_libobjs]) - AC_SUBST([gl_LTLIBOBJS], [$gl_ltlibobjs]) - ]) - gltests_libdeps= - gltests_ltlibdeps= - m4_pushdef([AC_LIBOBJ], m4_defn([gltests_LIBOBJ])) - m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gltests_REPLACE_FUNCS])) - m4_pushdef([AC_LIBSOURCES], m4_defn([gltests_LIBSOURCES])) - m4_pushdef([gltests_LIBSOURCES_LIST], []) - m4_pushdef([gltests_LIBSOURCES_DIR], []) - gl_COMMON - gl_source_base='tests' -changequote(,)dnl - gltests_WITNESS=IN_`echo "${PACKAGE-$PACKAGE_TARNAME}" | LC_ALL=C tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ | LC_ALL=C sed -e 's/[^A-Z0-9_]/_/g'`_GNULIB_TESTS -changequote([, ])dnl - AC_SUBST([gltests_WITNESS]) - gl_module_indicator_condition=$gltests_WITNESS - m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [$gl_module_indicator_condition]) - m4_popdef([gl_MODULE_INDICATOR_CONDITION]) - m4_ifval(gltests_LIBSOURCES_LIST, [ - m4_syscmd([test ! -d ]m4_defn([gltests_LIBSOURCES_DIR])[ || - for gl_file in ]gltests_LIBSOURCES_LIST[ ; do - if test ! -r ]m4_defn([gltests_LIBSOURCES_DIR])[/$gl_file ; then - echo "missing file ]m4_defn([gltests_LIBSOURCES_DIR])[/$gl_file" >&2 - exit 1 - fi - done])dnl - m4_if(m4_sysval, [0], [], - [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) - ]) - m4_popdef([gltests_LIBSOURCES_DIR]) - m4_popdef([gltests_LIBSOURCES_LIST]) - m4_popdef([AC_LIBSOURCES]) - m4_popdef([AC_REPLACE_FUNCS]) - m4_popdef([AC_LIBOBJ]) - AC_CONFIG_COMMANDS_PRE([ - gltests_libobjs= - gltests_ltlibobjs= - if test -n "$gltests_LIBOBJS"; then - # Remove the extension. - sed_drop_objext='s/\.o$//;s/\.obj$//' - for i in `for i in $gltests_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do - gltests_libobjs="$gltests_libobjs $i.$ac_objext" - gltests_ltlibobjs="$gltests_ltlibobjs $i.lo" - done - fi - AC_SUBST([gltests_LIBOBJS], [$gltests_libobjs]) - AC_SUBST([gltests_LTLIBOBJS], [$gltests_ltlibobjs]) - ]) - LIBGNU_LIBDEPS="$gl_libdeps" - AC_SUBST([LIBGNU_LIBDEPS]) - LIBGNU_LTLIBDEPS="$gl_ltlibdeps" - AC_SUBST([LIBGNU_LTLIBDEPS]) -]) - -# Like AC_LIBOBJ, except that the module name goes -# into gl_LIBOBJS instead of into LIBOBJS. -AC_DEFUN([gl_LIBOBJ], [ - AS_LITERAL_IF([$1], [gl_LIBSOURCES([$1.c])])dnl - gl_LIBOBJS="$gl_LIBOBJS $1.$ac_objext" -]) - -# Like AC_REPLACE_FUNCS, except that the module name goes -# into gl_LIBOBJS instead of into LIBOBJS. -AC_DEFUN([gl_REPLACE_FUNCS], [ - m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl - AC_CHECK_FUNCS([$1], , [gl_LIBOBJ($ac_func)]) -]) - -# Like AC_LIBSOURCES, except the directory where the source file is -# expected is derived from the gnulib-tool parameterization, -# and alloca is special cased (for the alloca-opt module). -# We could also entirely rely on EXTRA_lib..._SOURCES. -AC_DEFUN([gl_LIBSOURCES], [ - m4_foreach([_gl_NAME], [$1], [ - m4_if(_gl_NAME, [alloca.c], [], [ - m4_define([gl_LIBSOURCES_DIR], [lib]) - m4_append([gl_LIBSOURCES_LIST], _gl_NAME, [ ]) - ]) - ]) -]) - -# Like AC_LIBOBJ, except that the module name goes -# into gltests_LIBOBJS instead of into LIBOBJS. -AC_DEFUN([gltests_LIBOBJ], [ - AS_LITERAL_IF([$1], [gltests_LIBSOURCES([$1.c])])dnl - gltests_LIBOBJS="$gltests_LIBOBJS $1.$ac_objext" -]) - -# Like AC_REPLACE_FUNCS, except that the module name goes -# into gltests_LIBOBJS instead of into LIBOBJS. -AC_DEFUN([gltests_REPLACE_FUNCS], [ - m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl - AC_CHECK_FUNCS([$1], , [gltests_LIBOBJ($ac_func)]) -]) - -# Like AC_LIBSOURCES, except the directory where the source file is -# expected is derived from the gnulib-tool parameterization, -# and alloca is special cased (for the alloca-opt module). -# We could also entirely rely on EXTRA_lib..._SOURCES. -AC_DEFUN([gltests_LIBSOURCES], [ - m4_foreach([_gl_NAME], [$1], [ - m4_if(_gl_NAME, [alloca.c], [], [ - m4_define([gltests_LIBSOURCES_DIR], [tests]) - m4_append([gltests_LIBSOURCES_LIST], _gl_NAME, [ ]) - ]) - ]) -]) - -# This macro records the list of files which have been installed by -# gnulib-tool and may be removed by future gnulib-tool invocations. -AC_DEFUN([gl_FILE_LIST], [ - build-aux/arg-nonnull.h - build-aux/c++defs.h - build-aux/warn-on-use.h - lib/dtoastr.c - lib/ftoastr.c - lib/ftoastr.h - lib/getopt.c - lib/getopt.in.h - lib/getopt1.c - lib/getopt_int.h - lib/gettext.h - lib/intprops.h - lib/mktime-internal.h - lib/mktime.c - lib/stddef.in.h - lib/time.in.h - lib/time_r.c - lib/unistd.in.h - m4/00gnulib.m4 - m4/c-strtod.m4 - m4/extensions.m4 - m4/getopt.m4 - m4/gnulib-common.m4 - m4/include_next.m4 - m4/mktime.m4 - m4/multiarch.m4 - m4/stddef_h.m4 - m4/time_h.m4 - m4/time_r.m4 - m4/unistd_h.m4 - m4/warn-on-use.m4 - m4/wchar_t.m4 -]) === modified file 'src/config.in' --- src/config.in 2011-01-24 04:53:39 +0000 +++ src/config.in 2011-01-27 07:24:57 +0000 @@ -1,8 +1,9 @@ /* src/config.in. Generated from configure.in by autoheader. */ /* GNU Emacs site configuration template file. - Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005, - 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + +Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2011 + Free Software Foundation, Inc. This file is part of GNU Emacs. ------------------------------------------------------------ revno: 102984 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-01-26 23:19:26 -0800 message: Mark tiny change in ChangeLog. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-01-25 17:41:28 +0000 +++ lisp/ChangeLog 2011-01-27 07:19:26 +0000 @@ -76,10 +76,10 @@ * calc/calc-ext.el (calc-init-extensions): Autoload new units functions. Add keybindings for new units functions. -2011-01-22 Giorgos Keramidas +2011-01-22 Giorgos Keramidas (tiny change) * net/rcirc.el (rcirc-kill-buffer-hook): Flush logs when killing - rcirc buffers. + rcirc buffers. (Bug#4940) 2011-01-22 Glenn Morris ------------------------------------------------------------ revno: 102983 author: Lars Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2011-01-27 04:04:58 +0000 message: Merge changes made in Gnus trunk. gnus-art.el (gnus-article-next-page): Change last-line-displayed behaviour. (article-lapsed-string): Refactor out and allow specifying how many segments you want. (gnus-article-setup-buffer): Start updating the lapsed header directly. (gnus-article-update-lapsed-header): New variable. shr.el (shr-put-color): Don't do the box padding in tables, since they're already padded. gnus-util.el (float-time): If float-time is bound, always use it on all Emacsen. It's unclear why the subrp check was there. (time-date): Require to make some autoload issues on XEmacs go away. gnus-draft.el (gnus-draft-clear-marks): New function to be run as an exit hook to nix out all data on readedness on group exit. gnus-sum.el (gnus-auto-select-subject): Doc typo. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-01-26 10:25:18 +0000 +++ lisp/gnus/ChangeLog 2011-01-27 04:04:58 +0000 @@ -1,5 +1,25 @@ +2011-01-27 Lars Ingebrigtsen + + * gnus-draft.el (gnus-draft-clear-marks): New function to be run as an + exit hook to nix out all data on readedness on group exit. + + * gnus-util.el (float-time): If float-time is bound, always use it on + all Emacsen. It's unclear why the subrp check was there. + (time-date): Require to make some autoload issues on XEmacs go away. + + * shr.el (shr-put-color): Don't do the box padding in tables, since + they're already padded. + 2011-01-26 Lars Ingebrigtsen + * gnus-art.el (gnus-article-next-page): When the last line of the + article is displayed, scroll down once more instead of going to the + next article at once. + (article-lapsed-string): Refactor out and allow specifying how many + segments you want. + (gnus-article-setup-buffer): Start updating the lapsed header directly. + (gnus-article-update-lapsed-header): New variable. + * shr.el: Revert change that made headings use different-sized faces. The Emacs display engine isn't advanced enough that, for instance, tables can comfortably use differntly-sized faces. === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2011-01-25 04:08:28 +0000 +++ lisp/gnus/gnus-art.el 2011-01-27 04:04:58 +0000 @@ -1023,6 +1023,15 @@ :group 'gnus-article-headers :type 'boolean) +(defcustom gnus-article-update-lapsed-header 1 + "How often to update the lapsed date header. +If nil, don't update it at all." + :version "24.1" + :group 'gnus-article-headers + :type '(choice + (item :tag "Don't update" :value nil) + integer)) + (defcustom gnus-article-mime-match-handle-function 'undisplayed-alternative "Function called with a MIME handle as the argument. This is meant for people who want to view first matched part. @@ -1290,6 +1299,14 @@ :link '(custom-manual "(gnus)Customizing Articles") :type gnus-article-treat-head-custom) +(defcustom gnus-treat-date-combined-lapsed 'head + "Display the Date header in a way that says how much time has elapsed. +Valid values are nil, t, `head', `first', `last', an integer or a +predicate. See Info node `(gnus)Customizing Articles'." + :group 'gnus-article-treat + :link '(custom-manual "(gnus)Customizing Articles") + :type gnus-article-treat-head-custom) + (defcustom gnus-treat-date-original nil "Display the date in the original timezone. Valid values are nil, t, `head', `first', `last', an integer or a @@ -1680,6 +1697,7 @@ (gnus-treat-date-user-defined gnus-article-date-user) (gnus-treat-date-iso8601 gnus-article-date-iso8601) (gnus-treat-date-lapsed gnus-article-date-lapsed) + (gnus-treat-date-combined-lapsed gnus-article-date-combined-lapsed) (gnus-treat-display-x-face gnus-article-display-x-face) (gnus-treat-display-face gnus-article-display-face) (gnus-treat-hide-headers gnus-article-maybe-hide-headers) @@ -3500,7 +3518,8 @@ (defun article-make-date-line (date type) "Return a DATE line of TYPE." - (unless (memq type '(local ut original user iso8601 lapsed english)) + (unless (memq type '(local ut original user iso8601 lapsed english + combined-lapsed)) (error "Unknown conversion type: %s" type)) (condition-case () (let ((time (date-to-time date))) @@ -3548,47 +3567,11 @@ (/ (% (abs tz) 3600) 60))))) ;; Do an X-Sent lapsed format. ((eq type 'lapsed) - ;; If the date is seriously mangled, the timezone functions are - ;; liable to bug out, so we ignore all errors. - (let* ((now (current-time)) - (real-time (subtract-time now time)) - (real-sec (and real-time - (+ (* (float (car real-time)) 65536) - (cadr real-time)))) - (sec (and real-time (abs real-sec))) - num prev) - (cond - ((null real-time) - "X-Sent: Unknown") - ((zerop sec) - "X-Sent: Now") - (t - (concat - "X-Sent: " - ;; This is a bit convoluted, but basically we go - ;; through the time units for years, weeks, etc, - ;; and divide things to see whether that results - ;; in positive answers. - (mapconcat - (lambda (unit) - (if (zerop (setq num (ffloor (/ sec (cdr unit))))) - ;; The (remaining) seconds are too few to - ;; be divided into this time unit. - "" - ;; It's big enough, so we output it. - (setq sec (- sec (* num (cdr unit)))) - (prog1 - (concat (if prev ", " "") (int-to-string - (floor num)) - " " (symbol-name (car unit)) - (if (> num 1) "s" "")) - (setq prev t)))) - article-time-units "") - ;; If dates are odd, then it might appear like the - ;; article was sent in the future. - (if (> real-sec 0) - " ago" - " in the future")))))) + (concat "X-Sent: " (article-lapsed-string time))) + ;; A combined date/lapsed format. + ((eq type 'combined-lapsed) + (concat (article-make-date-line date 'original) + " (" (article-lapsed-string time 3) ")")) ;; Display the date in proper English ((eq type 'english) (let ((dtime (decode-time time))) @@ -3610,9 +3593,56 @@ (format "%02d" (nth 2 dtime)) ":" (format "%02d" (nth 1 dtime))))))) - (error + (foo (format "Date: %s (from Gnus)" date)))) +(defun article-lapsed-string (time &optional max-segments) + ;; If the date is seriously mangled, the timezone functions are + ;; liable to bug out, so we ignore all errors. + (let* ((now (current-time)) + (real-time (subtract-time now time)) + (real-sec (and real-time + (+ (* (float (car real-time)) 65536) + (cadr real-time)))) + (sec (and real-time (abs real-sec))) + (segments 0) + num prev) + (unless max-segments + (setq max-segments (length article-time-units))) + (cond + ((null real-time) + "Unknown") + ((zerop sec) + "Now") + (t + (concat + ;; This is a bit convoluted, but basically we go + ;; through the time units for years, weeks, etc, + ;; and divide things to see whether that results + ;; in positive answers. + (mapconcat + (lambda (unit) + (if (or (zerop (setq num (ffloor (/ sec (cdr unit))))) + (>= segments max-segments)) + ;; The (remaining) seconds are too few to + ;; be divided into this time unit. + "" + ;; It's big enough, so we output it. + (setq sec (- sec (* num (cdr unit)))) + (prog1 + (concat (if prev ", " "") (int-to-string + (floor num)) + " " (symbol-name (car unit)) + (if (> num 1) "s" "")) + (setq prev t + segments (1+ segments))))) + article-time-units "") + ;; If dates are odd, then it might appear like the + ;; article was sent in the future. + (if (> real-sec 0) + " ago" + " in the future")))))) + (defun article-date-local (&optional highlight) "Convert the current article date to the local timezone." (interactive (list t)) @@ -3635,6 +3665,11 @@ (interactive (list t)) (article-date-ut 'lapsed highlight)) +(defun article-date-combined-lapsed (&optional highlight) + "Convert the current article date to time lapsed since it was sent." + (interactive (list t)) + (article-date-ut 'combined-lapsed highlight)) + (defun article-update-date-lapsed () "Function to be run from a timer to update the lapsed time line." (save-match-data @@ -3647,8 +3682,10 @@ (when (eq major-mode 'gnus-article-mode) (let ((mark (point-marker))) (goto-char (point-min)) - (when (re-search-forward "^X-Sent:" nil t) - (article-date-lapsed t)) + (when (re-search-forward "^X-Sent:\\|^Date:" nil t) + (if gnus-treat-date-combined-lapsed + (article-date-combined-lapsed t) + (article-date-lapsed t))) (goto-char (marker-position mark)) (move-marker mark nil)))) nil 'visible)))))) @@ -4296,6 +4333,7 @@ article-decode-encoded-words article-date-user article-date-lapsed + article-date-combined-lapsed article-emphasize article-treat-dumbquotes article-treat-non-ascii @@ -4492,6 +4530,9 @@ (setq gnus-summary-buffer (gnus-summary-buffer-name gnus-newsgroup-name)) (gnus-summary-set-local-parameters gnus-newsgroup-name) + (when (and gnus-article-update-lapsed-header + (not article-lapsed-timer)) + (gnus-start-date-timer gnus-article-update-lapsed-header)) (current-buffer))))) ;; Set article window start at LINE, where LINE is the number of lines @@ -6267,7 +6308,7 @@ (save-excursion (end-of-line) (and (pos-visible-in-window-p) ;Not continuation line. - (>= (1+ (point)) (point-max))))) ;Allow for trailing newline. + (>= (point) (point-max))))) ;; Nothing in this page. (if (or (not gnus-page-broken) (save-excursion === modified file 'lisp/gnus/gnus-draft.el' --- lisp/gnus/gnus-draft.el 2011-01-25 04:08:28 +0000 +++ lisp/gnus/gnus-draft.el 2011-01-27 04:04:58 +0000 @@ -68,7 +68,8 @@ (gnus-draft-mode ;; Set up the menu. (when (gnus-visual-p 'draft-menu 'menu) - (gnus-draft-make-menu-bar))))) + (gnus-draft-make-menu-bar)) + (add-hook 'gnus-summary-prepare-exit-hook 'gnus-draft-clear-marks t t)))) ;;; Commands @@ -325,6 +326,12 @@ (pop-to-buffer buff t))) (error "The draft %s is under edit" file))))) +(defun gnus-draft-clear-marks () + (setq gnus-newsgroup-reads nil + gnus-newsgroup-marked nil + gnus-newsgroup-unreads + (gnus-uncompress-range (gnus-active gnus-newsgroup-name)))) + (provide 'gnus-draft) ;;; gnus-draft.el ends here === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2011-01-25 04:08:28 +0000 +++ lisp/gnus/gnus-sum.el 2011-01-27 04:04:58 +0000 @@ -359,7 +359,7 @@ unread article), `best' (place point on the subject line of the higest-scored article), `unseen' (place point on the subject line of the first unseen article), `unseen-or-unread' (place point on the subject -line of the first unseen article or, if all article have been seen, on the +line of the first unseen article or, if all articles have been seen, on the subject line of the first unread article), or a function to be called to place point on some subject line." :version "24.1" === modified file 'lisp/gnus/gnus-util.el' --- lisp/gnus/gnus-util.el 2011-01-25 04:08:28 +0000 +++ lisp/gnus/gnus-util.el 2011-01-27 04:04:58 +0000 @@ -38,6 +38,8 @@ (eval-when-compile (require 'cl)) +(require 'time-date) + (defcustom gnus-completing-read-function 'gnus-emacs-completing-read "Function use to do completing read." :version "24.1" @@ -332,9 +334,7 @@ (> (nth 1 fdate) (nth 1 date)))))) (eval-and-compile - (if (or (featurep 'emacs) - (and (fboundp 'float-time) - (subrp (symbol-function 'float-time)))) + (if (fboundp 'float-time) (defalias 'gnus-float-time 'float-time) (defun gnus-float-time (&optional time) "Convert time value TIME to a floating point number. === modified file 'lisp/gnus/shr.el' --- lisp/gnus/shr.el 2011-01-26 10:25:18 +0000 +++ lisp/gnus/shr.el 2011-01-27 04:04:58 +0000 @@ -619,7 +619,8 @@ (if (< (line-end-position) end) (forward-line 1) (goto-char end))) - (when (eq type :background) + (when (and (eq type :background) + (= shr-table-depth 0)) (shr-expand-newlines start end color)))) (defun shr-expand-newlines (start end color) ------------------------------------------------------------ revno: 102982 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2011-01-26 15:02:07 -0500 message: Let the debugger continue to the normal handler. * src/eval.c (maybe_call_debugger): Declare before new use. (find_handler_clause): Don't call debugger any more. Ignore Vstack_trace_on_error. Use XCAR/XCDR. (syms_of_eval): Remove Vstack_trace_on_error. (Fsignal): Only modify handlerlist when we know we need to do it. Call the debugger when necessary. * src/globals.h (Vstack_trace_on_error): Remove. diff: === modified file 'etc/NEWS' --- etc/NEWS 2011-01-25 08:36:34 +0000 +++ etc/NEWS 2011-01-26 20:02:07 +0000 @@ -692,6 +692,11 @@ * Lisp changes in Emacs 24.1 +** Removed the stack-trace-on-error variable. +Also the debugger can now "continue" from an error, which means it will jump +to the error handler as if the debugger had not been invoked instead of +jumping all the way to the top-level. + ** New function `read-char-choice' reads a restricted set of characters, discarding any inputs not inside the set. === modified file 'lisp/cus-start.el' --- lisp/cus-start.el 2011-01-25 04:08:28 +0000 +++ lisp/cus-start.el 2011-01-26 20:02:07 +0000 @@ -166,12 +166,6 @@ (max-mini-window-height limits (choice (const :tag "quarter screen" nil) number) "23.1") - (stack-trace-on-error debug - (choice (const :tag "off") - (repeat :menu-tag "When" - :value (nil) - (symbol :format "%v")) - (const :tag "always" t))) (debug-on-error debug (choice (const :tag "off") (repeat :menu-tag "When" === modified file 'src/ChangeLog' --- src/ChangeLog 2011-01-26 18:10:04 +0000 +++ src/ChangeLog 2011-01-26 20:02:07 +0000 @@ -1,3 +1,15 @@ +2011-01-26 Stefan Monnier + + Let the debugger continue to the normal handler (bug#7825). + * eval.c (maybe_call_debugger): Declare before new use. + (find_handler_clause): Don't call debugger any more. + Ignore Vstack_trace_on_error. + Use XCAR/XCDR. + (syms_of_eval): Remove Vstack_trace_on_error. + (Fsignal): Only modify handlerlist when we know we need to do it. + Call the debugger when necessary. + * globals.h (Vstack_trace_on_error): Remove. + 2011-01-26 Chong Yidong * font.c (font_parse_fcname): Rewrite GTK font name parser. === modified file 'src/eval.c' --- src/eval.c 2011-01-25 04:08:28 +0000 +++ src/eval.c 2011-01-26 20:02:07 +0000 @@ -1557,6 +1557,8 @@ static Lisp_Object find_handler_clause (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object); +static int maybe_call_debugger (Lisp_Object conditions, Lisp_Object sig, + Lisp_Object data); DEFUN ("signal", Fsignal, Ssignal, 2, 2, 0, doc: /* Signal an error. Args are ERROR-SYMBOL and associated DATA. @@ -1577,10 +1579,12 @@ /* When memory is full, ERROR-SYMBOL is nil, and DATA is (REAL-ERROR-SYMBOL . REAL-DATA). That is a special case--don't do this in other situations. */ - register struct handler *allhandlers = handlerlist; Lisp_Object conditions; Lisp_Object string; - Lisp_Object real_error_symbol; + Lisp_Object real_error_symbol + = (NILP (error_symbol) ? Fcar (data) : error_symbol); + register Lisp_Object clause = Qnil; + struct handler *h; struct backtrace *bp; immediate_quit = handling_signal = 0; @@ -1588,11 +1592,6 @@ if (gc_in_progress || waiting_for_input) abort (); - if (NILP (error_symbol)) - real_error_symbol = Fcar (data); - else - real_error_symbol = error_symbol; - #if 0 /* rms: I don't know why this was here, but it is surely wrong for an error that is handled. */ #ifdef HAVE_WINDOW_SYSTEM @@ -1631,49 +1630,49 @@ Vsignaling_function = *bp->function; } - for (; handlerlist; handlerlist = handlerlist->next) + for (h = handlerlist; h; h = h->next) { - register Lisp_Object clause; - - clause = find_handler_clause (handlerlist->handler, conditions, + clause = find_handler_clause (h->handler, conditions, error_symbol, data); - - if (EQ (clause, Qlambda)) - { - /* We can't return values to code which signaled an error, but we - can continue code which has signaled a quit. */ - if (EQ (real_error_symbol, Qquit)) - return Qnil; - else - error ("Cannot return from the debugger in an error"); - } - if (!NILP (clause)) - { - Lisp_Object unwind_data; - struct handler *h = handlerlist; - - handlerlist = allhandlers; - - if (NILP (error_symbol)) - unwind_data = data; - else - unwind_data = Fcons (error_symbol, data); - h->chosen_clause = clause; - unwind_to_catch (h->tag, unwind_data); - } - } - - handlerlist = allhandlers; - /* If no handler is present now, try to run the debugger, - and if that fails, throw to top level. */ - find_handler_clause (Qerror, conditions, error_symbol, data); - if (catchlist != 0) - Fthrow (Qtop_level, Qt); + break; + } + + if (/* Don't run the debugger for a memory-full error. + (There is no room in memory to do that!) */ + !NILP (error_symbol) + && (!NILP (Vdebug_on_signal) + /* If no handler is present now, try to run the debugger. */ + || NILP (clause) + /* Special handler that means "print a message and run debugger + if requested". */ + || EQ (h->handler, Qerror))) + { + int debugger_called + = maybe_call_debugger (conditions, error_symbol, data); + /* We can't return values to code which signaled an error, but we + can continue code which has signaled a quit. */ + if (debugger_called && EQ (real_error_symbol, Qquit)) + return Qnil; + } + + if (!NILP (clause)) + { + Lisp_Object unwind_data + = (NILP (error_symbol) ? data : Fcons (error_symbol, data)); + + h->chosen_clause = clause; + unwind_to_catch (h->tag, unwind_data); + } + else + { + if (catchlist != 0) + Fthrow (Qtop_level, Qt); + } if (! NILP (error_symbol)) data = Fcons (error_symbol, data); - + string = Ferror_message_string (data); fatal ("%s", SDATA (string), 0); } @@ -1848,63 +1847,24 @@ Lisp_Object sig, Lisp_Object data) { register Lisp_Object h; - register Lisp_Object tem; - int debugger_called = 0; - int debugger_considered = 0; /* t is used by handlers for all conditions, set up by C code. */ if (EQ (handlers, Qt)) return Qt; - /* Don't run the debugger for a memory-full error. - (There is no room in memory to do that!) */ - if (NILP (sig)) - debugger_considered = 1; - /* error is used similarly, but means print an error message and run the debugger if that is enabled. */ - if (EQ (handlers, Qerror) - || !NILP (Vdebug_on_signal)) /* This says call debugger even if - there is a handler. */ - { - if (!NILP (sig) && wants_debugger (Vstack_trace_on_error, conditions)) - { - max_lisp_eval_depth += 15; - max_specpdl_size++; - if (noninteractive) - Fbacktrace (); - else - internal_with_output_to_temp_buffer - ("*Backtrace*", - (Lisp_Object (*) (Lisp_Object)) Fbacktrace, - Qnil); - max_specpdl_size--; - max_lisp_eval_depth -= 15; - } - - if (!debugger_considered) - { - debugger_considered = 1; - debugger_called = maybe_call_debugger (conditions, sig, data); - } - - /* If there is no handler, return saying whether we ran the debugger. */ - if (EQ (handlers, Qerror)) - { - if (debugger_called) - return Qlambda; - return Qt; - } - } - - for (h = handlers; CONSP (h); h = Fcdr (h)) - { - Lisp_Object handler, condit; - - handler = Fcar (h); + if (EQ (handlers, Qerror)) + return Qt; + + for (h = handlers; CONSP (h); h = XCDR (h)) + { + Lisp_Object handler = XCAR (h); + Lisp_Object condit, tem; + if (!CONSP (handler)) continue; - condit = Fcar (handler); + condit = XCAR (handler); /* Handle a single condition name in handler HANDLER. */ if (SYMBOLP (condit)) { @@ -1918,15 +1878,9 @@ Lisp_Object tail; for (tail = condit; CONSP (tail); tail = XCDR (tail)) { - tem = Fmemq (Fcar (tail), conditions); + tem = Fmemq (XCAR (tail), conditions); if (!NILP (tem)) - { - /* This handler is going to apply. - Does it allow the debugger to run first? */ - if (! debugger_considered && !NILP (Fmemq (Qdebug, condit))) - maybe_call_debugger (conditions, sig, data); - return handler; - } + return handler; } } } @@ -1943,7 +1897,6 @@ EMACS_INT size = 200; int mlen; char *buffer = buf; - char *args[3]; int allocated = 0; Lisp_Object string; @@ -3523,14 +3476,6 @@ Qdebug = intern_c_string ("debug"); staticpro (&Qdebug); - DEFVAR_LISP ("stack-trace-on-error", Vstack_trace_on_error, - doc: /* *Non-nil means errors display a backtrace buffer. -More precisely, this happens for any error that is handled -by the editor command loop. -If the value is a list, an error only means to display a backtrace -if one of its condition symbols appears in the list. */); - Vstack_trace_on_error = Qnil; - DEFVAR_LISP ("debug-on-error", Vdebug_on_error, doc: /* *Non-nil means enter debugger if an error is signaled. Does not apply to errors handled by `condition-case' or those === modified file 'src/globals.h' --- src/globals.h 2011-01-20 06:40:36 +0000 +++ src/globals.h 2011-01-26 20:02:07 +0000 @@ -434,10 +434,6 @@ continue the interrupted redisplay. */ int f_debugger_may_continue; - /* List of conditions (non-nil atom means all) which cause a backtrace - if an error is handled by the command loop's error handler. */ - Lisp_Object f_Vstack_trace_on_error; - /* List of conditions (non-nil atom means all) which enter the debugger if an error is handled by the command loop's error handler. */ Lisp_Object f_Vdebug_on_error; @@ -2326,8 +2322,6 @@ globals.f_Vsource_directory #define Vspecial_event_map \ globals.f_Vspecial_event_map -#define Vstack_trace_on_error \ - globals.f_Vstack_trace_on_error #define Vstandard_display_table \ globals.f_Vstandard_display_table #define Vstandard_input \ ------------------------------------------------------------ revno: 102981 committer: Chong Yidong branch nick: trunk timestamp: Wed 2011-01-26 13:10:04 -0500 message: * src/font.c (font_parse_fcname): Rewrite GTK font name parser. * test/font-parse-testsuite.el (test-font-parse-data): New file. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-01-25 04:08:28 +0000 +++ src/ChangeLog 2011-01-26 18:10:04 +0000 @@ -1,3 +1,7 @@ +2011-01-26 Chong Yidong + + * font.c (font_parse_fcname): Rewrite GTK font name parser. + 2011-01-25 Stefan Monnier * xdisp.c (handle_fontified_prop): Be careful with font-lock changing === modified file 'src/font.c' --- src/font.c 2011-01-26 08:36:39 +0000 +++ src/font.c 2011-01-26 18:10:04 +0000 @@ -1448,109 +1448,83 @@ /* Either a fontconfig-style name with no size and property data, or a GTK-style name. */ Lisp_Object prop; - int word_len, prop_found = 0; - - for (p = name; *p; p = *q ? q + 1 : q) + Lisp_Object weight = Qnil, slant = Qnil; + Lisp_Object width = Qnil, size = Qnil; + char *word_start; + int word_len; + int size_found = 0; + + /* Scan backwards from the end, looking for a size. */ + for (p = name + len - 1; p >= name; p--) + if (!isdigit (*p)) + break; + + if ((p < name + len - 1) && ((p + 1 == name) || *p == ' ')) + /* Found a font size. */ + size = make_float (strtod (p + 1, NULL)); + else + p = name + len; + + /* Now P points to the termination of the string, sans size. + Scan backwards, looking for font properties. */ + for (; p > name; p = q) { - if (isdigit (*p)) + for (q = p - 1; q >= name; q--) { - int size_found = 1; - - for (q = p + 1; *q && *q != ' '; q++) - if (! isdigit (*q) && *q != '.') - { - size_found = 0; - break; - } - if (size_found) - { - double point_size = strtod (p, &q); - ASET (font, FONT_SIZE_INDEX, make_float (point_size)); - continue; - } + if (q > name && *(q-1) == '\\') + --q; /* Skip quoting backslashes. */ + else if (*q == ' ') + break; } - for (q = p + 1; *q && *q != ' '; q++) - if (*q == '\\' && q[1]) - q++; - word_len = q - p; + word_start = q + 1; + word_len = p - word_start; -#define PROP_MATCH(STR,N) ((word_len == N) && memcmp (p, STR, N) == 0) +#define PROP_MATCH(STR,N) \ + ((word_len == N) && memcmp (word_start, STR, N) == 0) +#define PROP_SAVE(VAR,STR,N) \ + (VAR = NILP (VAR) ? font_intern_prop (STR, N, 1) : VAR) if (PROP_MATCH ("Ultra-Light", 11)) - { - prop_found = 1; - prop = font_intern_prop ("ultra-light", 11, 1); - FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop); - } + PROP_SAVE (weight, "ultra-light", 11); else if (PROP_MATCH ("Light", 5)) - { - prop_found = 1; - prop = font_intern_prop ("light", 5, 1); - FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop); - } + PROP_SAVE (weight, "light", 5); else if (PROP_MATCH ("Book", 4)) - { - prop_found = 1; - prop = font_intern_prop ("book", 4, 1); - FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop); - } + PROP_SAVE (weight, "book", 4); else if (PROP_MATCH ("Medium", 6)) - { - prop_found = 1; - prop = font_intern_prop ("medium", 6, 1); - FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop); - } + PROP_SAVE (weight, "medium", 6); else if (PROP_MATCH ("Semi-Bold", 9)) - { - prop_found = 1; - prop = font_intern_prop ("semi-bold", 9, 1); - FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop); - } + PROP_SAVE (weight, "semi-bold", 9); else if (PROP_MATCH ("Bold", 4)) - { - prop_found = 1; - prop = font_intern_prop ("bold", 4, 1); - FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop); - } + PROP_SAVE (weight, "bold", 4); else if (PROP_MATCH ("Italic", 6)) - { - prop_found = 1; - prop = font_intern_prop ("italic", 4, 1); - FONT_SET_STYLE (font, FONT_SLANT_INDEX, prop); - } + PROP_SAVE (slant, "italic", 6); else if (PROP_MATCH ("Oblique", 7)) - { - prop_found = 1; - prop = font_intern_prop ("oblique", 7, 1); - FONT_SET_STYLE (font, FONT_SLANT_INDEX, prop); - } + PROP_SAVE (slant, "oblique", 7); else if (PROP_MATCH ("Semi-Condensed", 14)) - { - prop_found = 1; - prop = font_intern_prop ("semi-condensed", 14, 1); - FONT_SET_STYLE (font, FONT_WIDTH_INDEX, prop); - } + PROP_SAVE (width, "semi-condensed", 14); else if (PROP_MATCH ("Condensed", 9)) + PROP_SAVE (width, "condensed", 9); + /* An unknown word must be part of the font name. */ + else { - prop_found = 1; - prop = font_intern_prop ("condensed", 9, 1); - FONT_SET_STYLE (font, FONT_WIDTH_INDEX, prop); + family_end = p; + break; } - else { - if (prop_found) - return -1; /* Unknown property in GTK-style font name. */ - family_end = q; - } } #undef PROP_MATCH if (family_end) - { - Lisp_Object family; - family = font_intern_prop (name, family_end - name, 1); - ASET (font, FONT_FAMILY_INDEX, family); - } + ASET (font, FONT_FAMILY_INDEX, + font_intern_prop (name, family_end - name, 1)); + if (!NILP (size)) + ASET (font, FONT_SIZE_INDEX, size); + if (!NILP (weight)) + FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, weight); + if (!NILP (slant)) + FONT_SET_STYLE (font, FONT_SLANT_INDEX, slant); + if (!NILP (width)) + FONT_SET_STYLE (font, FONT_WIDTH_INDEX, width); } return 0; === modified file 'test/ChangeLog' --- test/ChangeLog 2011-01-25 04:08:28 +0000 +++ test/ChangeLog 2011-01-26 18:10:04 +0000 @@ -1,3 +1,7 @@ +2011-01-26 Chong Yidong + + * font-parse-testsuite.el (test-font-parse-data): New file. + 2011-01-13 Stefan Monnier * indent/prolog.prolog: Add tokenizing tests. === added file 'test/font-parse-testsuite.el' --- test/font-parse-testsuite.el 1970-01-01 00:00:00 +0000 +++ test/font-parse-testsuite.el 2011-01-26 18:10:04 +0000 @@ -0,0 +1,135 @@ +;;; redisplay-testsuite.el --- Test suite for redisplay. + +;; Copyright (C) 2011 Free Software Foundation, Inc. + +;; Author: Chong Yidong +;; Keywords: internal +;; Human-Keywords: internal + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Commentary: + +;; Type M-x test-font-parse RET to generate the test buffer. + +;; TODO: Convert to ERT format. + +;;; Code: + +(defvar test-font-parse-data + '((" " " " nil nil nil nil) + ("Monospace" "Monospace" nil nil nil nil) + ("Foo1" "Foo1" nil nil nil nil) + ("12" "nil" 12.0 nil nil nil) + ("12 " "12 " nil nil nil nil) + ;; Fontconfig format + ("Foo:" "Foo" nil nil nil nil) + ("Foo-8" "Foo" 8.0 nil nil nil) + ("Foo-18:" "Foo" 18.0 nil nil nil) + ("Foo-18:light" "Foo" 18.0 light nil nil) + ("Foo 10:weight=bold" "Foo 10" nil bold nil nil) + ("Foo-12:weight=bold" "Foo" 12.0 bold nil nil) + ("Foo 8-20:slant=oblique" "Foo 8" 20.0 nil oblique nil) + ("Foo:light:roman" "Foo" nil light roman nil) + ("Foo:italic:roman" "Foo" nil nil roman nil) + ("Foo 12:light:oblique" "Foo 12" nil light oblique nil) + ("Foo-12:demibold:oblique" "Foo" 12.0 demibold oblique nil) + ("Foo:black:proportional" "Foo" nil black nil 0) + ("Foo-10:black:proportional" "Foo" 10.0 black nil 0) + ("Foo:weight=normal" "Foo" nil normal nil nil) + ("Foo:weight=bold" "Foo" nil bold nil nil) + ("Foo:weight=bold:slant=italic" "Foo" nil bold italic) + ("Foo:weight=bold:slant=italic:mono" "Foo" nil bold italic 100) + ("Foo-10:demibold:slant=normal" "Foo" 10.0 demibold normal nil) + ("Foo 11-16:oblique:weight=bold" "Foo 11" 16.0 bold oblique nil) + ("Foo:oblique:randomprop=randomtag:weight=bold" + "Foo" nil bold oblique nil) + ("Foo:randomprop=randomtag:bar=baz" "Foo" nil nil nil nil) + ("Foo Book Light:bar=baz" "Foo Book Light" nil nil nil nil) + ("Foo Book Light 10:bar=baz" "Foo Book Light 10" nil nil nil nil) + ("Foo Book Light-10:bar=baz" "Foo Book Light" 10.0 nil nil nil) + ;; GTK format + ("Oblique" "nil" nil nil oblique nil) + ("Bold 17" "nil" 17.0 bold nil nil) + ("17 Bold" "17" nil bold nil nil) + ("Book Oblique 2" "nil" 2.0 book oblique nil) + ("Bar 7" "Bar" 7.0 nil nil nil) + ("Bar Ultra-Light" "Bar" nil ultra-light nil nil) + ("Bar Light 8" "Bar" 8.0 light nil nil) + ("Bar Book Medium 9" "Bar" 9.0 medium nil nil) + ("Bar Semi-Bold Italic 10" "Bar" 10.0 semi-bold italic nil) + ("Bar Semi-Condensed Bold Italic 11" "Bar" 11.0 bold italic nil) + ("Foo 10 11" "Foo 10" 11.0 nil nil nil) + ("Foo 1985 Book" "Foo 1985" nil book nil nil) + ("Foo 1985 A Book" "Foo 1985 A" nil book nil nil) + ("Foo A Book 12 A" "Foo A Book 12 A" nil nil nil nil) + ("Foo 1985 Book 12 Oblique" "Foo 1985 Book 12" nil nil oblique nil) + ("Foo 1985 Book 12 Italic 10" "Foo 1985 Book 12" 10.0 nil italic nil) + ("Foo Book Bar 6 Italic" "Foo Book Bar 6" nil nil italic nil) + ("Foo Book Bar Bold" "Foo Book Bar" nil bold nil nil)) + "List of font names parse data. +Each element should have the form + (NAME FAMILY SIZE WEIGHT SLANT SPACING) +where NAME is the name to parse, and the remainder are the +expected font properties from parsing NAME.") + +(defun test-font-parse () + "Test font name parsing." + (interactive) + (switch-to-buffer (generate-new-buffer "*Font Pase Test*")) + (setq show-trailing-whitespace nil) + (let ((pass-face '((t :foreground "green"))) + (fail-face '((t :foreground "red")))) + (dolist (test test-font-parse-data) + (let* ((name (nth 0 test)) + (fs (font-spec :name name)) + (family (symbol-name (font-get fs :family))) + (size (font-get fs :size)) + (weight (font-get fs :weight)) + (slant (font-get fs :slant)) + (spacing (font-get fs :spacing))) + (insert name) + (if (> (current-column) 20) + (insert "\n")) + (indent-to-column 21) + (insert (propertize family + 'face (if (equal family (nth 1 test)) + pass-face + fail-face))) + (indent-to-column 40) + (insert (propertize (format "%s" size) + 'face (if (equal size (nth 2 test)) + pass-face + fail-face))) + (indent-to-column 48) + (insert (propertize (format "%s" weight) + 'face (if (eq weight (nth 3 test)) + pass-face + fail-face))) + (indent-to-column 60) + (insert (propertize (format "%s" slant) + 'face (if (eq slant (nth 4 test)) + pass-face + fail-face))) + (indent-to-column 69) + (insert (propertize (format "%s" spacing) + 'face (if (eq spacing (nth 5 test)) + pass-face + fail-face))) + (insert "\n")))) + (goto-char (point-min))) + +;;; font-parse-testsuite.el ends here. ------------------------------------------------------------ revno: 102980 author: Lars Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2011-01-26 10:25:18 +0000 message: shr.el: Revert change that made headings use different-sized faces. The Emacs display engine isn't advanced enough that, for instance, tables can comfortably use differntly-sized faces. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-01-26 08:36:39 +0000 +++ lisp/gnus/ChangeLog 2011-01-26 10:25:18 +0000 @@ -1,3 +1,9 @@ +2011-01-26 Lars Ingebrigtsen + + * shr.el: Revert change that made headings use different-sized faces. + The Emacs display engine isn't advanced enough that, for instance, + tables can comfortably use differntly-sized faces. + 2011-01-25 Lars Ingebrigtsen * nnimap.el (nnimap-open-connection-1): Store the actual stream type === modified file 'lisp/gnus/shr.el' --- lisp/gnus/shr.el 2011-01-25 10:36:00 +0000 +++ lisp/gnus/shr.el 2011-01-26 10:25:18 +0000 @@ -82,30 +82,6 @@ (const :tag "Use the width of the window" nil)) :group 'shr) -(defface shr-tag-h1 '((t (:bold t :height 2.2))) - "Face used for H1 tags." - :group 'shr) - -(defface shr-tag-h2 '((t (:bold t :height 2.0))) - "Face used for H2 tags." - :group 'shr) - -(defface shr-tag-h3 '((t (:bold t :height 1.8))) - "Face used for H3 tags." - :group 'shr) - -(defface shr-tag-h4 '((t (:bold t :height 1.6))) - "Face used for H4 tags." - :group 'shr) - -(defface shr-tag-h5 '((t (:bold t :height 1.4))) - "Face used for H5 tags." - :group 'shr) - -(defface shr-tag-h6 '((t (:bold t :height 1.2))) - "Face used for H6 tags." - :group 'shr) - (defvar shr-content-function nil "If bound, this should be a function that will return the content. This is used for cid: URLs, and the function is called with the @@ -906,22 +882,22 @@ (shr-generic cont)) (defun shr-tag-h1 (cont) - (shr-heading cont 'shr-tag-h1)) + (shr-heading cont 'bold 'underline)) (defun shr-tag-h2 (cont) - (shr-heading cont 'shr-tag-h2)) + (shr-heading cont 'bold)) (defun shr-tag-h3 (cont) - (shr-heading cont 'shr-tag-h3)) + (shr-heading cont 'italic)) (defun shr-tag-h4 (cont) - (shr-heading cont 'shr-tag-h4)) + (shr-heading cont)) (defun shr-tag-h5 (cont) - (shr-heading cont 'shr-tag-h5)) + (shr-heading cont)) (defun shr-tag-h6 (cont) - (shr-heading cont 'shr-tag-h6)) + (shr-heading cont)) (defun shr-tag-hr (cont) (shr-ensure-newline) ------------------------------------------------------------ revno: 102979 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-01-26 00:36:39 -0800 message: Refill some long/short copyright headers. diff: === modified file 'ChangeLog' --- ChangeLog 2011-01-25 04:08:28 +0000 +++ ChangeLog 2011-01-26 08:36:39 +0000 @@ -8918,8 +8918,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993-1999, 2001-2011 - Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2001-2011 Free Software Foundation, Inc. This file is part of GNU Emacs. === modified file 'INSTALL.BZR' --- INSTALL.BZR 2011-01-25 04:08:28 +0000 +++ INSTALL.BZR 2011-01-26 08:36:39 +0000 @@ -1,5 +1,4 @@ -Copyright (C) 2002-2011 - Free Software Foundation, Inc. +Copyright (C) 2002-2011 Free Software Foundation, Inc. See the end of the file for license conditions. === modified file 'Makefile.in' --- Makefile.in 2011-01-25 04:08:28 +0000 +++ Makefile.in 2011-01-26 08:36:39 +0000 @@ -2,8 +2,7 @@ # DIST: make most of the changes to this file you might want, so try # DIST: that first. -# Copyright (C) 1992-2011 -# Free Software Foundation, Inc. +# Copyright (C) 1992-2011 Free Software Foundation, Inc. # This file is part of GNU Emacs. === modified file 'admin/alloc-colors.c' --- admin/alloc-colors.c 2011-01-25 04:08:28 +0000 +++ admin/alloc-colors.c 2011-01-26 08:36:39 +0000 @@ -1,6 +1,6 @@ /* Allocate X colors. Used for testing with dense colormaps. - Copyright (C) 2001-2011 - Free Software Foundation, Inc. + +Copyright (C) 2001-2011 Free Software Foundation, Inc. This file is part of GNU Emacs. === modified file 'admin/build-configs' --- admin/build-configs 2011-01-25 04:08:28 +0000 +++ admin/build-configs 2011-01-26 08:36:39 +0000 @@ -1,8 +1,7 @@ #! /usr/bin/perl # Build Emacs in several different configurations. -# Copyright (C) 2001-2011 -# Free Software Foundation, Inc. +# Copyright (C) 2001-2011 Free Software Foundation, Inc. # This file is part of GNU Emacs. === modified file 'admin/cus-test.el' --- admin/cus-test.el 2011-01-25 04:08:28 +0000 +++ admin/cus-test.el 2011-01-26 08:36:39 +0000 @@ -1,7 +1,6 @@ ;;; cus-test.el --- tests for custom types and load problems -;; Copyright (C) 1998, 2000, 2002-2011 -;; Free Software Foundation, Inc. +;; Copyright (C) 1998, 2000, 2002-2011 Free Software Foundation, Inc. ;; Author: Markus Rost ;; Maintainer: Markus Rost === modified file 'admin/diff-tar-files' --- admin/diff-tar-files 2011-01-25 04:08:28 +0000 +++ admin/diff-tar-files 2011-01-26 08:36:39 +0000 @@ -1,7 +1,6 @@ #! /bin/sh -# Copyright (C) 2001-2011 -# Free Software Foundation, Inc. +# Copyright (C) 2001-2011 Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -40,5 +39,3 @@ tar tzf $new_tar | sed -e 's,^[^/]*,,' | sort > $new_tmp diff -u $old_tmp $new_tmp rm -f $new_tmp $old_tmp - - === modified file 'admin/make-emacs' --- admin/make-emacs 2011-01-25 04:08:28 +0000 +++ admin/make-emacs 2011-01-26 08:36:39 +0000 @@ -2,8 +2,7 @@ # Build Emacs with various options for profiling, debugging, # with and without warnings enabled etc. -# Copyright (C) 2001-2011 -# Free Software Foundation, Inc. +# Copyright (C) 2001-2011 Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -184,4 +183,3 @@ # Local Variables: # mode: cperl # End: - === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-01-25 04:08:28 +0000 +++ doc/emacs/ChangeLog 2011-01-26 08:36:39 +0000 @@ -7568,8 +7568,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993-1999, 2001-2011 - Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2001-2011 Free Software Foundation, Inc. This file is part of GNU Emacs. === modified file 'doc/emacs/Makefile.in' --- doc/emacs/Makefile.in 2011-01-25 04:08:28 +0000 +++ doc/emacs/Makefile.in 2011-01-26 08:36:39 +0000 @@ -1,7 +1,6 @@ #### Makefile for the Emacs Manual -# Copyright (C) 1994, 1996-2011 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1996-2011 Free Software Foundation, Inc. # This file is part of GNU Emacs. === modified file 'doc/emacs/arevert-xtra.texi' --- doc/emacs/arevert-xtra.texi 2011-01-25 04:08:28 +0000 +++ doc/emacs/arevert-xtra.texi 2011-01-26 08:36:39 +0000 @@ -1,6 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004-2011 -@c Free Software Foundation, Inc. +@c Copyright (C) 2004-2011 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included either in emacs-xtra.texi (when producing the === modified file 'doc/emacs/cal-xtra.texi' --- doc/emacs/cal-xtra.texi 2011-01-25 04:08:28 +0000 +++ doc/emacs/cal-xtra.texi 2011-01-26 08:36:39 +0000 @@ -1,6 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004-2011 -@c Free Software Foundation, Inc. +@c Copyright (C) 2004-2011 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included either in emacs-xtra.texi (when producing the === modified file 'doc/emacs/dired-xtra.texi' --- doc/emacs/dired-xtra.texi 2011-01-25 04:08:28 +0000 +++ doc/emacs/dired-xtra.texi 2011-01-26 08:36:39 +0000 @@ -1,6 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004-2011 -@c Free Software Foundation, Inc. +@c Copyright (C) 2004-2011 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included either in emacs-xtra.texi (when producing the === modified file 'doc/emacs/emerge-xtra.texi' --- doc/emacs/emerge-xtra.texi 2011-01-25 04:08:28 +0000 +++ doc/emacs/emerge-xtra.texi 2011-01-26 08:36:39 +0000 @@ -1,6 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004-2011 -@c Free Software Foundation, Inc. +@c Copyright (C) 2004-2011 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included either in emacs-xtra.texi (when producing the === modified file 'doc/emacs/fortran-xtra.texi' --- doc/emacs/fortran-xtra.texi 2011-01-25 04:08:28 +0000 +++ doc/emacs/fortran-xtra.texi 2011-01-26 08:36:39 +0000 @@ -1,6 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004-2011 -@c Free Software Foundation, Inc. +@c Copyright (C) 2004-2011 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included either in emacs-xtra.texi (when producing the === modified file 'doc/emacs/makefile.w32-in' --- doc/emacs/makefile.w32-in 2011-01-25 04:08:28 +0000 +++ doc/emacs/makefile.w32-in 2011-01-26 08:36:39 +0000 @@ -1,7 +1,6 @@ #### -*- Makefile -*- for the Emacs Manual -# Copyright (C) 2003-2011 -# Free Software Foundation, Inc. +# Copyright (C) 2003-2011 Free Software Foundation, Inc. # This file is part of GNU Emacs. === modified file 'doc/emacs/vc-xtra.texi' --- doc/emacs/vc-xtra.texi 2011-01-25 04:08:28 +0000 +++ doc/emacs/vc-xtra.texi 2011-01-26 08:36:39 +0000 @@ -1,6 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004-2011 -@c Free Software Foundation, Inc. +@c Copyright (C) 2004-2011 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included in emacs-xtra.texi when producing the printed === modified file 'doc/emacs/vc1-xtra.texi' --- doc/emacs/vc1-xtra.texi 2011-01-25 04:08:28 +0000 +++ doc/emacs/vc1-xtra.texi 2011-01-26 08:36:39 +0000 @@ -1,6 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004-2011 -@c Free Software Foundation, Inc. +@c Copyright (C) 2004-2011 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included either in vc-xtra.texi (when producing the === modified file 'doc/lispintro/Makefile.in' --- doc/lispintro/Makefile.in 2011-01-25 04:08:28 +0000 +++ doc/lispintro/Makefile.in 2011-01-26 08:36:39 +0000 @@ -1,7 +1,6 @@ #### Makefile for the Emacs Lisp Introduction manual -# Copyright (C) 1994-1999, 2001-2011 -# Free Software Foundation, Inc. +# Copyright (C) 1994-1999, 2001-2011 Free Software Foundation, Inc. # This file is part of GNU Emacs. === modified file 'doc/lispintro/README' --- doc/lispintro/README 2011-01-25 04:08:28 +0000 +++ doc/lispintro/README 2011-01-26 08:36:39 +0000 @@ -1,5 +1,4 @@ -Copyright (C) 2001-2011 - Free Software Foundation, Inc. +Copyright (C) 2001-2011 Free Software Foundation, Inc. See the end of the file for license conditions. === modified file 'doc/lispintro/drawers.eps' --- doc/lispintro/drawers.eps 2011-01-25 04:08:28 +0000 +++ doc/lispintro/drawers.eps 2011-01-26 08:36:39 +0000 @@ -9,8 +9,7 @@ %%EndComments %%BeginProlog -% Copyright (C) 2001-2011 -% Free Software Foundation, Inc. +% Copyright (C) 2001-2011 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % === modified file 'doc/lispintro/makefile.w32-in' --- doc/lispintro/makefile.w32-in 2011-01-25 04:08:28 +0000 +++ doc/lispintro/makefile.w32-in 2011-01-26 08:36:39 +0000 @@ -1,7 +1,6 @@ #### -*- Makefile -*- for the Emacs Lisp Introduction manual. -# Copyright (C) 2003-2011 -# Free Software Foundation, Inc. +# Copyright (C) 2003-2011 Free Software Foundation, Inc. # This file is part of GNU Emacs. === modified file 'doc/lispref/Makefile.in' --- doc/lispref/Makefile.in 2011-01-25 04:08:28 +0000 +++ doc/lispref/Makefile.in 2011-01-26 08:36:39 +0000 @@ -1,7 +1,6 @@ # Makefile for the GNU Emacs Lisp Reference Manual. -# Copyright (C) 1990-1996, 1998-2011 -# Free Software Foundation, Inc. +# Copyright (C) 1990-1996, 1998-2011 Free Software Foundation, Inc. # This file is part of GNU Emacs. === modified file 'doc/lispref/README' --- doc/lispref/README 2011-01-25 04:08:28 +0000 +++ doc/lispref/README 2011-01-26 08:36:39 +0000 @@ -1,5 +1,4 @@ -Copyright (C) 2001-2011 - Free Software Foundation, Inc. +Copyright (C) 2001-2011 Free Software Foundation, Inc. See the end of the file for license conditions. === modified file 'doc/lispref/back.texi' --- doc/lispref/back.texi 2011-01-25 04:08:28 +0000 +++ doc/lispref/back.texi 2011-01-26 08:36:39 +0000 @@ -1,7 +1,6 @@ \input texinfo @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 2001-2011 -@c Free Software Foundation, Inc. +@c Copyright (C) 2001-2011 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @c @c %**start of header === modified file 'doc/lispref/elisp-covers.texi' --- doc/lispref/elisp-covers.texi 2011-01-25 04:08:28 +0000 +++ doc/lispref/elisp-covers.texi 2011-01-26 08:36:39 +0000 @@ -1,7 +1,6 @@ \input texinfo @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 2001-2011 -@c Free Software Foundation, Inc. +@c Copyright (C) 2001-2011 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @c @comment %**start of header === modified file 'doc/lispref/lay-flat.texi' --- doc/lispref/lay-flat.texi 2011-01-25 04:08:28 +0000 +++ doc/lispref/lay-flat.texi 2011-01-26 08:36:39 +0000 @@ -1,7 +1,6 @@ \input texinfo @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 2001-2011 -@c Free Software Foundation, Inc. +@c Copyright (C) 2001-2011 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @c @comment %**start of header === modified file 'doc/lispref/makefile.w32-in' --- doc/lispref/makefile.w32-in 2011-01-25 04:08:28 +0000 +++ doc/lispref/makefile.w32-in 2011-01-26 08:36:39 +0000 @@ -1,7 +1,6 @@ # -*- Makefile -*- for the GNU Emacs Lisp Reference Manual. -# Copyright (C) 2003-2011 -# Free Software Foundation, Inc. +# Copyright (C) 2003-2011 Free Software Foundation, Inc. # This file is part of GNU Emacs. === modified file 'doc/lispref/package.texi' --- doc/lispref/package.texi 2011-01-25 04:08:28 +0000 +++ doc/lispref/package.texi 2011-01-26 08:36:39 +0000 @@ -1,7 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 2010-2011 -@c Free Software Foundation, Inc. +@c Copyright (C) 2010-2011 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/package @node Packaging, Antinews, System Interface, Top === modified file 'doc/lispref/two-volume-cross-refs.txt' --- doc/lispref/two-volume-cross-refs.txt 2011-01-25 04:08:28 +0000 +++ doc/lispref/two-volume-cross-refs.txt 2011-01-26 08:36:39 +0000 @@ -1,6 +1,5 @@ -Copyright (C) 2001-2011 - Free Software Foundation, Inc. - See end for copying conditions. +Copyright (C) 2001-2011 Free Software Foundation, Inc. +See end for copying conditions. Two Volume Cross References =========================== === modified file 'doc/lispref/two.el' --- doc/lispref/two.el 2011-01-25 04:08:28 +0000 +++ doc/lispref/two.el 2011-01-26 08:36:39 +0000 @@ -1,7 +1,6 @@ ;; Auxiliary functions for preparing a two volume manual. -;; Copyright (C) 2001-2011 -;; Free Software Foundation, Inc. +;; Copyright (C) 2001-2011 Free Software Foundation, Inc. ;; --rjc 30mar92 === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-01-25 04:08:28 +0000 +++ doc/misc/ChangeLog 2011-01-26 08:36:39 +0000 @@ -7567,8 +7567,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993-1999, 2001-2011 - Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2001-2011 Free Software Foundation, Inc. This file is part of GNU Emacs. === modified file 'doc/misc/Makefile.in' --- doc/misc/Makefile.in 2011-01-25 04:08:28 +0000 +++ doc/misc/Makefile.in 2011-01-26 08:36:39 +0000 @@ -1,7 +1,6 @@ #### Makefile for documentation other than the Emacs manual. -# Copyright (C) 1994, 1996-2011 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1996-2011 Free Software Foundation, Inc. # This file is part of GNU Emacs. === modified file 'doc/misc/makefile.w32-in' --- doc/misc/makefile.w32-in 2011-01-25 04:08:28 +0000 +++ doc/misc/makefile.w32-in 2011-01-26 08:36:39 +0000 @@ -1,7 +1,6 @@ #### -*- Makefile -*- for documentation other than the Emacs manual. -# Copyright (C) 2003-2011 -# Free Software Foundation, Inc. +# Copyright (C) 2003-2011 Free Software Foundation, Inc. # This file is part of GNU Emacs. === modified file 'etc/CONTRIBUTE' --- etc/CONTRIBUTE 2011-01-25 04:08:28 +0000 +++ etc/CONTRIBUTE 2011-01-26 08:36:39 +0000 @@ -1,5 +1,4 @@ -Copyright (C) 2006-2011 - Free Software Foundation, Inc. +Copyright (C) 2006-2011 Free Software Foundation, Inc. See end for license conditions. === modified file 'etc/ChangeLog' --- etc/ChangeLog 2011-01-25 04:08:28 +0000 +++ etc/ChangeLog 2011-01-26 08:36:39 +0000 @@ -5194,8 +5194,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993-1999, 2001-2011 - Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2001-2011 Free Software Foundation, Inc. This file is part of GNU Emacs. === modified file 'etc/MACHINES' --- etc/MACHINES 2011-01-25 04:08:28 +0000 +++ etc/MACHINES 2011-01-26 08:36:39 +0000 @@ -1,6 +1,7 @@ Emacs machines list -Copyright (C) 1989-1990, 1992-1993, 1998, 2001-2011 Free Software Foundation, Inc. +Copyright (C) 1989-1990, 1992-1993, 1998, 2001-2011 + Free Software Foundation, Inc. See the end of the file for license conditions. This is a list of the status of GNU Emacs on various machines and systems. @@ -401,4 +402,3 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . - === modified file 'etc/NEWS.19' --- etc/NEWS.19 2011-01-25 04:08:28 +0000 +++ etc/NEWS.19 2011-01-26 08:36:39 +0000 @@ -1,7 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. 1992. -Copyright (C) 1993-1995, 2001, 2006-2011 - Free Software Foundation, Inc. +Copyright (C) 1993-1995, 2001, 2006-2011 Free Software Foundation, Inc. See the end of the file for license conditions. @@ -6541,4 +6540,3 @@ mode: outline paragraph-separate: "[ ]*$" end: - === modified file 'etc/NEWS.21' --- etc/NEWS.21 2011-01-25 04:08:28 +0000 +++ etc/NEWS.21 2011-01-26 08:36:39 +0000 @@ -1,7 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. 2006-05-31 -Copyright (C) 2000-2011 - Free Software Foundation, Inc. +Copyright (C) 2000-2011 Free Software Foundation, Inc. See the end of the file for license conditions. === modified file 'etc/NEWS.22' --- etc/NEWS.22 2011-01-25 04:08:28 +0000 +++ etc/NEWS.22 2011-01-26 08:36:39 +0000 @@ -1,7 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. -Copyright (C) 2001-2011 - Free Software Foundation, Inc. +Copyright (C) 2001-2011 Free Software Foundation, Inc. See the end of the file for license conditions. Please send Emacs bug reports to bug-gnu-emacs@gnu.org. @@ -5606,4 +5605,3 @@ mode: outline paragraph-separate: "[ ]*$" end: - === modified file 'etc/README' --- etc/README 2011-01-25 04:08:28 +0000 +++ etc/README 2011-01-26 08:36:39 +0000 @@ -9,6 +9,5 @@ File: emacs.icon Author: Sun Microsystems, Inc - Copyright (C) 1999, 2001-2011 - Free Software Foundation, Inc. + Copyright (C) 1999, 2001-2011 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) === modified file 'etc/TERMS' --- etc/TERMS 2011-01-25 04:08:28 +0000 +++ etc/TERMS 2011-01-26 08:36:39 +0000 @@ -1,5 +1,4 @@ -Copyright (C) 1999, 2001-2011 -Free Software Foundation, Inc. +Copyright (C) 1999, 2001-2011 Free Software Foundation, Inc. See the end of the file for copying permissions. This file describes what you must or might want to do to termcap entries === modified file 'etc/images/gnus/gnus.svg' --- etc/images/gnus/gnus.svg 2011-01-25 04:08:28 +0000 +++ etc/images/gnus/gnus.svg 2011-01-26 08:36:39 +0000 @@ -1,8 +1,7 @@