commit: Use Mercurial changeset hash to identify build version.
16 years, 10 months
Michael Sperber
changeset: 4419:eb82fbb675eaf416e276645ef7842240473d6cbe
tag: tip
user: Mike Sperber <sperber(a)deinprogramm.de>
date: Thu Feb 07 10:03:49 2008 +0100
files: .hgignore ChangeLog Makefile.in.in configure configure.ac lisp/ChangeLog lisp/build-report.el nt/ChangeLog nt/xemacs.mak src/ChangeLog src/emacs.c version.sh version.sh.in
description:
Use Mercurial changeset hash to identify build version.
2008-01-25 Michael Sperber <mike(a)xemacs.org>
* Makefile.in.in:
* configure.ac:
* version.sh.in: Use Mercurial tip hash to identify version
instead of old CVS method.
2008-01-25 Michael Sperber <mike(a)xemacs.org>
* build-report.el (build-report-version-file-regexp): Adjust to
handle Mercurial hash.
2008-01-25 Michael Sperber <mike(a)xemacs.org>
* xemacs.mak (version.sh): Generate version.sh via Mercurial.
2008-01-25 Michael Sperber <mike(a)xemacs.org>
* emacs.c (vars_of_emacs): Zap mention of CVS.
diff -r 9bcdf9a3a783dd60aa09e1aadce72cca9d534e58 -r eb82fbb675eaf416e276645ef7842240473d6cbe .hgignore
--- a/.hgignore Mon Feb 04 21:41:27 2008 -0700
+++ b/.hgignore Thu Feb 07 10:03:49 2008 +0100
@@ -52,3 +52,4 @@ info/.*\.info(-[0-9]+)?$
^src/REBUILD_AUTOLOADS$
^src/(temacs|xemacs)\.(exe|exe\.manifest|pdb|map|bsc)$
^TAGS$
+^version\.sh$
\ No newline at end of file
diff -r 9bcdf9a3a783dd60aa09e1aadce72cca9d534e58 -r eb82fbb675eaf416e276645ef7842240473d6cbe ChangeLog
--- a/ChangeLog Mon Feb 04 21:41:27 2008 -0700
+++ b/ChangeLog Thu Feb 07 10:03:49 2008 +0100
@@ -1,6 +1,13 @@ 2008-01-25 Stephen J. Turnbull <stephe
2008-01-25 Stephen J. Turnbull <stephen(a)xemacs.org>
* configure.ac (--with-database): 'gnudbm' -> 'gdbm' in docstrings.
+
+2008-01-25 Michael Sperber <mike(a)xemacs.org>
+
+ * Makefile.in.in:
+ * configure.ac:
+ * version.sh.in: Use Mercurial tip hash to identify version
+ instead of old CVS method.
2008-01-17 Aidan Kehoe <kehoea(a)parhasard.net>
diff -r 9bcdf9a3a783dd60aa09e1aadce72cca9d534e58 -r eb82fbb675eaf416e276645ef7842240473d6cbe Makefile.in.in
--- a/Makefile.in.in Mon Feb 04 21:41:27 2008 -0700
+++ b/Makefile.in.in Thu Feb 07 10:03:49 2008 +0100
@@ -256,7 +256,7 @@ all: Makefile ${GENERATED_HEADERS} ${MAK
.PHONY: ${SUBDIR} all beta
## Convenience target for XEmacs beta testers
-beta: elcclean all
+beta: elcclean update-version all
## Convenience target for XEmacs maintainers
## This would run `make-xemacsdist' if I were really confident that everything
@@ -315,6 +315,13 @@ FRC.lisp.finder-inf.el:
${SUBDIR}: ${SUBDIR_MAKEFILES} ${GENERATED_HEADERS} FRC
cd ./$@ && $(MAKE) $(RECURSIVE_MAKE_ARGS) all
+
+## This should be the same code as in configure.ac.
+update-version:
+ cp ${srcdir}/version.sh.in ${srcdir}/version.sh
+ if test -d ${srcdir}/.hg; then \
+ (cd ${srcdir}; hg identify | cut -d " " -f 1 >> version.sh); \
+ fi
## Building modules depends on ellcc, found in lib-src.
modules/sample modules/ldap modules/zlib modules/base64: lib-src
diff -r 9bcdf9a3a783dd60aa09e1aadce72cca9d534e58 -r eb82fbb675eaf416e276645ef7842240473d6cbe configure
--- a/configure Mon Feb 04 21:41:27 2008 -0700
+++ b/configure Thu Feb 07 10:03:49 2008 +0100
@@ -4779,6 +4779,10 @@ case $build_os in *\ *) build_os=`echo "
+cp "$srcdir/version.sh.in" "$srcdir/version.sh"
+if test -d "$srcdir/.hg"; then
+ (cd "$srcdir"; hg identify | cut -d " " -f 1 >> version.sh)
+fi
. "$srcdir/version.sh" || exit 1;
if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi
: "${verbose=$beta}"
diff -r 9bcdf9a3a783dd60aa09e1aadce72cca9d534e58 -r eb82fbb675eaf416e276645ef7842240473d6cbe configure.ac
--- a/configure.ac Mon Feb 04 21:41:27 2008 -0700
+++ b/configure.ac Thu Feb 07 10:03:49 2008 +0100
@@ -1176,6 +1176,11 @@ dnl ------------------------------------
dnl ----------------------------------------
dnl Find out which version of XEmacs this is
dnl ----------------------------------------
+dnl This should be the same code as in Makefile.in.in
+cp "$srcdir/version.sh.in" "$srcdir/version.sh"
+if test -d "$srcdir/.hg"; then
+ (cd "$srcdir"; hg identify | cut -d " " -f 1 >> version.sh)
+fi
. "$srcdir/version.sh" || exit 1;
dnl Must do the following first to determine verbosity for AC_DEFINE
if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi
diff -r 9bcdf9a3a783dd60aa09e1aadce72cca9d534e58 -r eb82fbb675eaf416e276645ef7842240473d6cbe lisp/ChangeLog
--- a/lisp/ChangeLog Mon Feb 04 21:41:27 2008 -0700
+++ b/lisp/ChangeLog Thu Feb 07 10:03:49 2008 +0100
@@ -2,6 +2,11 @@ 2008-02-03 Aidan Kehoe <kehoea@parhasa
* iso8859-1.el (ascii-case-table):
Correct the order of the arguments to #'put-case-table-pair.
+
+2008-01-25 Michael Sperber <mike(a)xemacs.org>
+
+ * build-report.el (build-report-version-file-regexp): Adjust to
+ handle Mercurial hash.
2008-01-21 Aidan Kehoe <kehoea(a)parhasard.net>
diff -r 9bcdf9a3a783dd60aa09e1aadce72cca9d534e58 -r eb82fbb675eaf416e276645ef7842240473d6cbe lisp/build-report.el
--- a/lisp/build-report.el Mon Feb 04 21:41:27 2008 -0700
+++ b/lisp/build-report.el Thu Feb 07 10:03:49 2008 +0100
@@ -69,7 +69,7 @@ emacs_minor_version\\s-*=\\s-*\\([0-9]+\
emacs_minor_version\\s-*=\\s-*\\([0-9]+\\)
emacs_beta_version\\s-*=\\s-*\\([0-9]+\\)?
xemacs_codename\\s-*=\\s-*\"\\([^\"]+\\)\"\\(
-xemacs_extra_name\\s-*=\\s-*\"\\([^\"]+\\)\"\\)?"
+xemacs_extra_name\\s-*=\\s-*\"?\\([^\"]+\\)\"?\\)?"
"*REGEXP matching XEmacs Beta Version variable assignments in
`build-report-version-file' file. This variable is used by
`build-report-version-file-data'.")
diff -r 9bcdf9a3a783dd60aa09e1aadce72cca9d534e58 -r eb82fbb675eaf416e276645ef7842240473d6cbe nt/ChangeLog
--- a/nt/ChangeLog Mon Feb 04 21:41:27 2008 -0700
+++ b/nt/ChangeLog Thu Feb 07 10:03:49 2008 +0100
@@ -1,3 +1,7 @@ 2008-01-24 Mike Sperber <mike(a)xemacs.o
+2008-01-25 Michael Sperber <mike(a)xemacs.org>
+
+ * xemacs.mak (version.sh): Generate version.sh via Mercurial.
+
2008-01-24 Mike Sperber <mike(a)xemacs.org>
* config.inc.samp: Fix URL for optional libraries.
diff -r 9bcdf9a3a783dd60aa09e1aadce72cca9d534e58 -r eb82fbb675eaf416e276645ef7842240473d6cbe nt/xemacs.mak
--- a/nt/xemacs.mak Mon Feb 04 21:41:27 2008 -0700
+++ b/nt/xemacs.mak Thu Feb 07 10:03:49 2008 +0100
@@ -74,6 +74,13 @@ BLDROOT=$(MAKEROOT)
!endif
!endif
+!if [copy $(SRCROOT)\version.sh.in $(SRCROOT)\version.sh]
+!endif
+!if exist($(SRCROOT)\.hg)
+!if [hg identify >> $(SRCROOT)\version.sh]
+!endif
+!endif
+
# Program name and version
!include "$(SRCROOT)\version.sh"
@@ -816,7 +823,7 @@ TEMACS_CPP_FLAGS_NO_CFLAGS=-c $(CPLUSPLU
$(EMACS_BETA_VERSION) $(EMACS_PATCH_LEVEL) \
-DXEMACS_CODENAME=\"$(xemacs_codename:&=and)\" \
!if defined(xemacs_extra_name)
- -DXEMACS_EXTRA_NAME=\"$(xemacs_extra_name:"=)\" \
+ -DXEMACS_EXTRA_NAME=\""$(xemacs_extra_name:"=)"\" \
!endif
!if defined(PATH_LATE_PACKAGE_DIRECTORIES)
-DPATH_LATE_PACKAGE_DIRECTORIES=\"$(PATH_LATE_PACKAGE_DIRECTORIES)\" \
diff -r 9bcdf9a3a783dd60aa09e1aadce72cca9d534e58 -r eb82fbb675eaf416e276645ef7842240473d6cbe src/ChangeLog
--- a/src/ChangeLog Mon Feb 04 21:41:27 2008 -0700
+++ b/src/ChangeLog Thu Feb 07 10:03:49 2008 +0100
@@ -23,6 +23,10 @@ 2008-01-30 Aidan Kehoe <kehoea@parhasa
documentation. Correct an assertion dealing with equivalence
tables; we may end up looking through the equivalence table if a
non-ASCII non-case character was searched for.
+
+2008-01-25 Michael Sperber <mike(a)xemacs.org>
+
+ * emacs.c (vars_of_emacs): Zap mention of CVS.
2008-01-24 Mike Sperber <mike(a)xemacs.org>
diff -r 9bcdf9a3a783dd60aa09e1aadce72cca9d534e58 -r eb82fbb675eaf416e276645ef7842240473d6cbe src/emacs.c
--- a/src/emacs.c Mon Feb 04 21:41:27 2008 -0700
+++ b/src/emacs.c Thu Feb 07 10:03:49 2008 +0100
@@ -4246,10 +4246,9 @@ Appropriate surrounding whitespace will
Appropriate surrounding whitespace will be added, but typically looks best
if enclosed in parentheses.
-A standard use is to indicate the date version.sh was last updated from
-the CVS mainline, where it is automatically given a value similar to
-\"(+CVS-20050221)\". Developers may also use it to indicate particular
-branches, etc.
+A standard use is to indicate the topmost hash id of the Mercurial
+changeset from which XEmacs was compiled. Developers may also use it
+to indicate particular branches, etc.
*/ );
#ifdef XEMACS_EXTRA_NAME
Vxemacs_extra_name = build_string (XEMACS_EXTRA_NAME);
diff -r 9bcdf9a3a783dd60aa09e1aadce72cca9d534e58 -r eb82fbb675eaf416e276645ef7842240473d6cbe version.sh.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/version.sh.in Thu Feb 07 10:03:49 2008 +0100
@@ -0,0 +1,12 @@
+#!/bin/sh
+emacs_is_beta=t
+emacs_major_version=21
+emacs_minor_version=5
+emacs_beta_version=28
+xemacs_codename="fuki"
+emacs_kit_version=
+infodock_major_version=4
+infodock_minor_version=0
+infodock_build_version=8
+xemacs_release_date="2007-05-21"
+xemacs_extra_name=
\ No newline at end of file
diff -r 9bcdf9a3a783dd60aa09e1aadce72cca9d534e58 -r eb82fbb675eaf416e276645ef7842240473d6cbe version.sh
--- a/version.sh Mon Feb 04 21:41:27 2008 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-#!/bin/sh
-emacs_is_beta=t
-emacs_major_version=21
-emacs_minor_version=5
-emacs_beta_version=28
-xemacs_codename="fuki"
-emacs_kit_version=
-infodock_major_version=4
-infodock_minor_version=0
-infodock_build_version=8
-xemacs_extra_name="(+CVS-20071205)"
-xemacs_release_date="2007-05-21"
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
Identify XEmacs build from Mercurial changeset
16 years, 10 months
Michael Sperber
This is something of a kludge because of Windows. Suggestions for
improvement welcome. Intend to apply on Sunday.
2008-01-25 Michael Sperber <mike(a)xemacs.org>
* Makefile.in.in:
* configure.ac:
* version.sh.in: Use Mercurial tip hash to identify version
instead of old CVS method.
2008-01-25 Michael Sperber <mike(a)xemacs.org>
* build-report.el (build-report-version-file-regexp): Adjust to
handle Mercurial hash.
2008-01-25 Michael Sperber <mike(a)xemacs.org>
* xemacs.mak (version.sh): Generate version.sh via Mercurial.
2008-01-25 Michael Sperber <mike(a)xemacs.org>
* emacs.c (vars_of_emacs): Zap mention of CVS.
--
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla
--- a/Makefile.in.in
+++ b/Makefile.in.in
@@ -256,7 +256,7 @@ all: Makefile ${GENERATED_HEADERS} ${MAK
.PHONY: ${SUBDIR} all beta
## Convenience target for XEmacs beta testers
-beta: elcclean all
+beta: elcclean update-version all
## Convenience target for XEmacs maintainers
## This would run `make-xemacsdist' if I were really confident that everything
@@ -315,6 +315,15 @@ FRC.lisp.finder-inf.el:
${SUBDIR}: ${SUBDIR_MAKEFILES} ${GENERATED_HEADERS} FRC
cd ./$@ && $(MAKE) $(RECURSIVE_MAKE_ARGS) all
+
+## This should be the same code as in configure.ac.
+update-version:
+ cp ${srcdir}/version.sh.in ${srcdir}/version.sh
+ if test -d ${srcdir}/.hg; then \
+ (cd ${srcdir}; hg identify | cut -d " " -f 1 >> version.sh); \
+ else \
+ cat ${srcdir}/extra-name >> ${srcdir}/version.sh; \
+ fi
## Building modules depends on ellcc, found in lib-src.
modules/sample modules/ldap modules/zlib modules/base64: lib-src
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -4779,6 +4779,12 @@ case $build_os in *\ *) build_os=`echo "
+cp "$srcdir/version.sh.in" "$srcdir/version.sh"
+if test -d "$srcdir/.hg"; then
+ (cd "$srcdir"; hg identify | cut -d " " -f 1 >> version.sh)
+else
+ cat "$srcdir/extra-name" >> "$srcdir/version.sh"
+fi
. "$srcdir/version.sh" || exit 1;
if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi
: "${verbose=$beta}"
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1176,6 +1176,13 @@ dnl ------------------------------------
dnl ----------------------------------------
dnl Find out which version of XEmacs this is
dnl ----------------------------------------
+dnl This should be the same code as in Makefile.in.in
+cp "$srcdir/version.sh.in" "$srcdir/version.sh"
+if test -d "$srcdir/.hg"; then
+ (cd "$srcdir"; hg identify | cut -d " " -f 1 >> version.sh)
+else
+ cat "$srcdir/extra-name" >> "$srcdir/version.sh"
+fi
. "$srcdir/version.sh" || exit 1;
dnl Must do the following first to determine verbosity for AC_DEFINE
if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi
diff --git a/lisp/build-report.el b/lisp/build-report.el
--- a/lisp/build-report.el
+++ b/lisp/build-report.el
@@ -69,7 +69,7 @@ emacs_minor_version\\s-*=\\s-*\\([0-9]+\
emacs_minor_version\\s-*=\\s-*\\([0-9]+\\)
emacs_beta_version\\s-*=\\s-*\\([0-9]+\\)?
xemacs_codename\\s-*=\\s-*\"\\([^\"]+\\)\"\\(
-xemacs_extra_name\\s-*=\\s-*\"\\([^\"]+\\)\"\\)?"
+xemacs_extra_name\\s-*=\\s-*\"?\\([^\"]+\\)\"?\\)?"
"*REGEXP matching XEmacs Beta Version variable assignments in
`build-report-version-file' file. This variable is used by
`build-report-version-file-data'.")
diff --git a/nt/xemacs.mak b/nt/xemacs.mak
--- a/nt/xemacs.mak
+++ b/nt/xemacs.mak
@@ -71,6 +71,16 @@ SEPARATE_BUILD=0
SEPARATE_BUILD=0
SRCROOT=$(MAKEROOT)
BLDROOT=$(MAKEROOT)
+!endif
+!endif
+
+!if [copy $(SRCROOT)\version.sh.in $(SRCROOT)\version.sh]
+!endif
+!if exist($(SRCROOT)\.hg)
+!if [hg identify >> $(SRCROOT)\version.sh]
+!endif
+!else
+!if [type $(SRCDIR)\extra-name >> $(SRCDIR)\version.sh]
!endif
!endif
@@ -816,7 +826,7 @@ TEMACS_CPP_FLAGS_NO_CFLAGS=-c $(CPLUSPLU
$(EMACS_BETA_VERSION) $(EMACS_PATCH_LEVEL) \
-DXEMACS_CODENAME=\"$(xemacs_codename:&=and)\" \
!if defined(xemacs_extra_name)
- -DXEMACS_EXTRA_NAME=\"$(xemacs_extra_name:"=)\" \
+ -DXEMACS_EXTRA_NAME=\""$(xemacs_extra_name:"=)"\" \
!endif
!if defined(PATH_LATE_PACKAGE_DIRECTORIES)
-DPATH_LATE_PACKAGE_DIRECTORIES=\"$(PATH_LATE_PACKAGE_DIRECTORIES)\" \
diff --git a/src/emacs.c b/src/emacs.c
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -4246,10 +4246,9 @@ Appropriate surrounding whitespace will
Appropriate surrounding whitespace will be added, but typically looks best
if enclosed in parentheses.
-A standard use is to indicate the date version.sh was last updated from
-the CVS mainline, where it is automatically given a value similar to
-\"(+CVS-20050221)\". Developers may also use it to indicate particular
-branches, etc.
+A standard use is to indicate the topmost hash id of the Mercurial
+changeset from which XEmacs was compiled. Developers may also use it
+to indicate particular branches, etc.
*/ );
#ifdef XEMACS_EXTRA_NAME
Vxemacs_extra_name = build_string (XEMACS_EXTRA_NAME);
diff --git a/version.sh b/version.sh.in
rename from version.sh
rename to version.sh.in
--- a/version.sh.in
+++ b/version.sh.in
@@ -8,5 +8,5 @@ infodock_major_version=4
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20071205)"
xemacs_release_date="2007-05-21"
+xemacs_extra_name=
\ No newline at end of file
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[COMMIT] Fix the last synch of easypg
16 years, 10 months
Daiki Ueno
NOTE: This patch has been committed.
Sorry, I forgot to update the author version.
xemacs-packages source patch:
Diff command: cvs -q diff -u
Files affected: xemacs-packages/easypg/version.texi xemacs-packages/easypg/stamp-vti xemacs-packages/easypg/epg-package-info.el xemacs-packages/easypg/configure xemacs-packages/easypg/Makefile
Index: xemacs-packages/easypg/Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/easypg/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- xemacs-packages/easypg/Makefile 16 Sep 2007 13:16:06 -0000 1.1.1.1
+++ xemacs-packages/easypg/Makefile 7 Feb 2008 03:02:13 -0000
@@ -20,7 +20,7 @@
# This XEmacs package contains the EasyPG package
VERSION = 1.01
-AUTHOR_VERSION = 0.0.15
+AUTHOR_VERSION = 0.0.16
MAINTAINER = Daiki Ueno <ueno(a)unixuser.org>
PACKAGE = easypg
PKG_TYPE = regular
Index: xemacs-packages/easypg/configure
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/easypg/configure,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 configure
--- xemacs-packages/easypg/configure 16 Sep 2007 13:16:09 -0000 1.1.1.1
+++ xemacs-packages/easypg/configure 7 Feb 2008 03:02:13 -0000
@@ -1,6 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61.
+# Generated by GNU Autoconf 2.61 for epg 0.0.16.
+#
+# Report bugs to <ueno(a)unixuser.org>.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -570,11 +572,11 @@
SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
+PACKAGE_NAME='epg'
+PACKAGE_TARNAME='epg'
+PACKAGE_VERSION='0.0.16'
+PACKAGE_STRING='epg 0.0.16'
+PACKAGE_BUGREPORT='ueno(a)unixuser.org'
ac_unique_file="configure.ac"
ac_subst_vars='SHELL
@@ -689,7 +691,7 @@
localstatedir='${prefix}/var'
includedir='${prefix}/include'
oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
infodir='${datarootdir}/info'
htmldir='${docdir}'
dvidir='${docdir}'
@@ -1153,7 +1155,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures epg 0.0.16 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1201,7 +1203,7 @@
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/epg]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
@@ -1218,7 +1220,9 @@
fi
if test -n "$ac_init_help"; then
-
+ case $ac_init_help in
+ short | recursive ) echo "Configuration of epg 0.0.16:";;
+ esac
cat <<\_ACEOF
Optional Features:
@@ -1236,6 +1240,7 @@
--with-packagedir=DIR package DIR for XEmacs
--with-gpg=PATH use GnuPG binary at PATH
+Report bugs to <ueno(a)unixuser.org>.
_ACEOF
ac_status=$?
fi
@@ -1296,7 +1301,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-configure
+epg configure 0.0.16
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1310,7 +1315,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by $as_me, which was
+It was created by epg $as_me 0.0.16, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -1648,6 +1653,14 @@
+
+
+
+
+
+
+
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -1656,7 +1669,6 @@
-
am__api_version="1.9"
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -1973,8 +1985,8 @@
# Define the identity of the package.
- PACKAGE=epg
- VERSION=0.0.15
+ PACKAGE='epg'
+ VERSION='0.0.16'
cat >>confdefs.h <<_ACEOF
@@ -3143,7 +3155,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by $as_me, which was
+This file was extended by epg $as_me 0.0.16, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3186,7 +3198,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-config.status
+epg config.status 0.0.16
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Index: xemacs-packages/easypg/epg-package-info.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/easypg/epg-package-info.el,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 epg-package-info.el
--- xemacs-packages/easypg/epg-package-info.el 16 Sep 2007 13:16:10 -0000 1.1.1.1
+++ xemacs-packages/easypg/epg-package-info.el 7 Feb 2008 03:02:13 -0000
@@ -13,7 +13,7 @@
;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
@@ -26,8 +26,11 @@
(defconst epg-package-name "epg"
"Name of this package.")
-(defconst epg-version-number "0.0.15"
+(defconst epg-version-number "0.0.16"
"Version number of this package.")
+
+(defconst epg-bug-report-address "ueno(a)unixuser.org"
+ "Report bugs to this address.")
(provide 'epg-package-info)
Index: xemacs-packages/easypg/stamp-vti
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/easypg/stamp-vti,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 stamp-vti
--- xemacs-packages/easypg/stamp-vti 16 Sep 2007 13:16:12 -0000 1.1.1.1
+++ xemacs-packages/easypg/stamp-vti 7 Feb 2008 03:02:13 -0000
@@ -1,4 +1,4 @@
-@set UPDATED 27 March 2007
-@set UPDATED-MONTH March 2007
-@set EDITION 0.0.15
-@set VERSION 0.0.15
+@set UPDATED 16 September 2007
+@set UPDATED-MONTH September 2007
+@set EDITION 0.0.16
+@set VERSION 0.0.16
Index: xemacs-packages/easypg/version.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/easypg/version.texi,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 version.texi
--- xemacs-packages/easypg/version.texi 16 Sep 2007 13:16:17 -0000 1.1.1.1
+++ xemacs-packages/easypg/version.texi 7 Feb 2008 03:02:13 -0000
@@ -1,4 +1,4 @@
-@set UPDATED 27 March 2007
-@set UPDATED-MONTH March 2007
-@set EDITION 0.0.15
-@set VERSION 0.0.15
+@set UPDATED 16 September 2007
+@set UPDATED-MONTH September 2007
+@set EDITION 0.0.16
+@set VERSION 0.0.16
--
Daiki Ueno
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[COMMIT] Synch easypg to upstream 0.0.16
16 years, 10 months
Daiki Ueno
NOTE: This patch has been committed.
Hello,
This patch synchs easypg package to the latest upstream version.
xemacs-packages source patch:
Diff command: cvs -q diff -u
Files affected: xemacs-packages/easypg/epg.el xemacs-packages/easypg/epg-package-info.el.in xemacs-packages/easypg/epg-config.el xemacs-packages/easypg/epa.el xemacs-packages/easypg/epa-setup.el xemacs-packages/easypg/epa-mail.el xemacs-packages/easypg/epa-file.el xemacs-packages/easypg/epa-dired.el xemacs-packages/easypg/configure.ac xemacs-packages/easypg/NEWS
Index: xemacs-packages/easypg/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/easypg/ChangeLog,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ChangeLog
--- xemacs-packages/easypg/ChangeLog 16 Sep 2007 13:16:05 -0000 1.1.1.1
+++ xemacs-packages/easypg/ChangeLog 7 Feb 2008 02:54:30 -0000
@@ -1,3 +1,25 @@
+2008-02-07 Daiki Ueno <ueno(a)unixuser.org>
+
+ * EasyPG: Version 0.0.16 released.
+ * configure.ac: Bump up version.
+
+2008-02-06 Daiki Ueno <ueno(a)unixuser.org>
+
+ * epa-file.el (epa-file-passphrase-callback-function): Use
+ canonical file names as keys for cache.
+
+2008-01-22 Daiki Ueno <ueno(a)unixuser.org>
+
+ * epa-mail.el (epa-mail--find-usable-key): New function.
+ (epa-mail-encrypt): Use it.
+ Reported by intrigeri <intrigeri(a)boum.org>.
+
+2007-11-26 Daiki Ueno <ueno(a)unixuser.org>
+
+ * epg-package-info.el.in (epg-bug-report-address): New constant.
+
+ * configure.ac: Use modern AC_INIT.
+
2007-09-06 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.01 released.
Index: xemacs-packages/easypg/NEWS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/easypg/NEWS,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 NEWS
--- xemacs-packages/easypg/NEWS 16 Sep 2007 13:16:06 -0000 1.1.1.1
+++ xemacs-packages/easypg/NEWS 7 Feb 2008 02:54:30 -0000
@@ -1,3 +1,12 @@
+* Major changes in 0.0.16
+
+** This will be the final version released under GPL2+. Subsequent
+ versions will be released under GPL3+.
+
+** epa-mail-encrypt now skips unusable keys.
+
+** epa-file now uses canonical file names as keys for passphrase cache.
+
* Major changes in 0.0.15
** Fixed a load-error of epa on XEmacs.
Index: xemacs-packages/easypg/configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/easypg/configure.ac,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 configure.ac
--- xemacs-packages/easypg/configure.ac 16 Sep 2007 13:16:09 -0000 1.1.1.1
+++ xemacs-packages/easypg/configure.ac 7 Feb 2008 02:54:30 -0000
@@ -1,7 +1,7 @@
-AC_INIT
+AC_PREREQ(2.61)
+AC_INIT([epg], [0.0.16], [ueno(a)unixuser.org])
AC_CONFIG_SRCDIR([configure.ac])
-AC_PREREQ(2.59)
-AM_INIT_AUTOMAKE(epg, 0.0.15)
+AM_INIT_AUTOMAKE
AC_CHECK_EMACS
AC_PATH_LISPDIR
Index: xemacs-packages/easypg/epa-dired.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/easypg/epa-dired.el,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 epa-dired.el
--- xemacs-packages/easypg/epa-dired.el 16 Sep 2007 13:16:09 -0000 1.1.1.1
+++ xemacs-packages/easypg/epa-dired.el 7 Feb 2008 02:54:30 -0000
@@ -13,7 +13,7 @@
;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
Index: xemacs-packages/easypg/epa-file.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/easypg/epa-file.el,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 epa-file.el
--- xemacs-packages/easypg/epa-file.el 16 Sep 2007 13:16:09 -0000 1.1.1.1
+++ xemacs-packages/easypg/epa-file.el 7 Feb 2008 02:54:30 -0000
@@ -13,7 +13,7 @@
;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
@@ -105,18 +105,21 @@
(defun epa-file-passphrase-callback-function (context key-id file)
(if (and epa-file-cache-passphrase-for-symmetric-encryption
(eq key-id 'SYM))
- (let ((entry (assoc file epa-file-passphrase-alist))
- passphrase)
- (or (copy-sequence (cdr entry))
- (progn
- (unless entry
- (setq entry (list file)
- epa-file-passphrase-alist (cons entry
- epa-file-passphrase-alist)))
- (setq passphrase (epa-passphrase-callback-function context
- key-id nil))
- (setcdr entry (copy-sequence passphrase))
- passphrase)))
+ (progn
+ (setq file (file-truename file))
+ (let ((entry (assoc file epa-file-passphrase-alist))
+ passphrase)
+ (or (copy-sequence (cdr entry))
+ (progn
+ (unless entry
+ (setq entry (list file)
+ epa-file-passphrase-alist
+ (cons entry
+ epa-file-passphrase-alist)))
+ (setq passphrase (epa-passphrase-callback-function context
+ key-id nil))
+ (setcdr entry (copy-sequence passphrase))
+ passphrase))))
(epa-passphrase-callback-function context key-id nil)))
(defun epa-file-handler (operation &rest args)
Index: xemacs-packages/easypg/epa-mail.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/easypg/epa-mail.el,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 epa-mail.el
--- xemacs-packages/easypg/epa-mail.el 16 Sep 2007 13:16:09 -0000 1.1.1.1
+++ xemacs-packages/easypg/epa-mail.el 7 Feb 2008 02:54:30 -0000
@@ -13,7 +13,7 @@
;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
@@ -44,6 +44,19 @@
"A minor-mode for composing encrypted/clearsigned mails."
nil " epa-mail" epa-mail-mode-map)
+(defun epa-mail--find-usable-key (keys usage)
+ "Find a usable key from KEYS for USAGE."
+ (catch 'found
+ (while keys
+ (let ((pointer (epg-key-sub-key-list (car keys))))
+ (while pointer
+ (if (and (memq usage (epg-sub-key-capability (car pointer)))
+ (not (memq (epg-sub-key-validity (car pointer))
+ '(revoked expired))))
+ (throw 'found (car keys)))
+ (setq pointer (cdr pointer))))
+ (setq keys (cdr keys)))))
+
;;;###autoload
(defun epa-mail-decrypt ()
"Decrypt OpenPGP armors in the current buffer.
@@ -98,7 +111,7 @@
(save-excursion
(let ((verbose current-prefix-arg)
(context (epg-make-context epa-protocol))
- recipients recipient-keys)
+ recipients recipient-key)
(goto-char (point-min))
(save-restriction
(narrow-to-region (point)
@@ -129,21 +142,22 @@
If no one is selected, symmetric encryption will be performed. "
recipients)
(if recipients
- (apply #'nconc
- (mapcar
- (lambda (recipient)
- (setq recipient-keys
- (epg-list-keys
- (epg-make-context epa-protocol)
- (concat "<" recipient ">")))
- (unless (or recipient-keys
- (y-or-n-p
- (format
- "No public key for %s; skip it? "
- recipient)))
- (error "No public key for %s" recipient))
- recipient-keys)
- recipients))))
+ (mapcar
+ (lambda (recipient)
+ (setq recipient-key
+ (epa-mail--find-usable-key
+ (epg-list-keys
+ (epg-make-context epa-protocol)
+ (concat "<" recipient ">"))
+ 'encrypt))
+ (unless (or recipient-key
+ (y-or-n-p
+ (format
+ "No public key for %s; skip it? "
+ recipient)))
+ (error "No public key for %s" recipient))
+ recipient-key)
+ recipients)))
(setq sign (if verbose (y-or-n-p "Sign? ")))
(if sign
(epa-select-keys context
Index: xemacs-packages/easypg/epa-setup.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/easypg/epa-setup.el,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 epa-setup.el
--- xemacs-packages/easypg/epa-setup.el 16 Sep 2007 13:16:09 -0000 1.1.1.1
+++ xemacs-packages/easypg/epa-setup.el 7 Feb 2008 02:54:30 -0000
@@ -1,3 +1,28 @@
+;;; epa-setup.el --- setup routine for the EasyPG Assistant.
+;; Copyright (C) 2006,2007,2008 Daiki Ueno
+
+;; Author: Daiki Ueno <ueno(a)unixuser.org>
+;; Keywords: PGP, GnuPG
+
+;; This file is part of EasyPG.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING. If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Code:
+
(autoload 'epa-list-keys "epa")
(autoload 'epa-dired-mode-hook "epa-dired")
Index: xemacs-packages/easypg/epa.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/easypg/epa.el,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 epa.el
--- xemacs-packages/easypg/epa.el 16 Sep 2007 13:16:10 -0000 1.1.1.1
+++ xemacs-packages/easypg/epa.el 7 Feb 2008 02:54:30 -0000
@@ -13,7 +13,7 @@
;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
Index: xemacs-packages/easypg/epg-config.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/easypg/epg-config.el,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 epg-config.el
--- xemacs-packages/easypg/epg-config.el 16 Sep 2007 13:16:10 -0000 1.1.1.1
+++ xemacs-packages/easypg/epg-config.el 7 Feb 2008 02:54:30 -0000
@@ -13,7 +13,7 @@
;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
Index: xemacs-packages/easypg/epg-package-info.el.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/easypg/epg-package-info.el.in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 epg-package-info.el.in
--- xemacs-packages/easypg/epg-package-info.el.in 16 Sep 2007 13:16:10 -0000 1.1.1.1
+++ xemacs-packages/easypg/epg-package-info.el.in 7 Feb 2008 02:54:30 -0000
@@ -13,7 +13,7 @@
;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
@@ -28,6 +28,9 @@
(defconst epg-version-number "@VERSION@"
"Version number of this package.")
+
+(defconst epg-bug-report-address "@PACKAGE_BUGREPORT@"
+ "Report bugs to this address.")
(provide 'epg-package-info)
Index: xemacs-packages/easypg/epg.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/easypg/epg.el,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 epg.el
--- xemacs-packages/easypg/epg.el 16 Sep 2007 13:16:11 -0000 1.1.1.1
+++ xemacs-packages/easypg/epg.el 7 Feb 2008 02:54:30 -0000
@@ -15,7 +15,7 @@
;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
@@ -330,7 +330,7 @@
(defun epg-context-set-passphrase-callback (context passphrase-callback
&optional handback)
"Set the function used to query passphrase.
-If optional argument HANDBACK is specified, it is passed to CALLBACK."
+If optional argument HANDBACK is specified, it is passed to PASSPHRASE-CALLBACK."
(unless (eq (car-safe context) 'epg-context)
(signal 'wrong-type-argument (list 'epg-context-p context)))
(aset (cdr context) 7 (if handback
@@ -340,7 +340,7 @@
(defun epg-context-set-progress-callback (context progress-callback
&optional handback)
"Set the function which handles progress update.
-If optional argument HANDBACK is specified, it is passed to CALLBACK."
+If optional argument HANDBACK is specified, it is passed to PROGRESS-CALLBACK."
(unless (eq (car-safe context) 'epg-context)
(signal 'wrong-type-argument (list 'epg-context-p context)))
(aset (cdr context) 8 (if handback
@@ -2477,7 +2477,7 @@
;;;###autoload
(defun epg-start-sign-keys (context keys &optional local)
- "Initiate an sign keys operation.
+ "Initiate a sign keys operation.
If you use this function, you will need to wait for the completion of
`epg-gpg-program' by using `epg-wait-for-completion' and call
Regards,
--
Daiki Ueno
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
commit: Use Dynarr_increment instead of Dynarr_add when building a line in place.
16 years, 10 months
Jerry James
changeset: 4418:9bcdf9a3a783dd60aa09e1aadce72cca9d534e58
tag: tip
user: Jerry James <james(a)xemacs.org>
date: Mon Feb 04 21:41:27 2008 -0700
files: src/ChangeLog src/redisplay.c
description:
Use Dynarr_increment instead of Dynarr_add when building a line in place.
2008-02-03 Jerry James <james(a)xemacs.org>
* redisplay.c (generate_displayable_area): If a line has been
generated in place in the dynarray, use Dynarr_increment instead
of Dynarr_add.
* redisplay.c (regenerate_window): Ditto.
diff -r 0cee1ff42db4e80491b04d36066f37ff9794aff2 -r 9bcdf9a3a783dd60aa09e1aadce72cca9d534e58 src/ChangeLog
--- a/src/ChangeLog Sun Feb 03 10:35:25 2008 +0100
+++ b/src/ChangeLog Mon Feb 04 21:41:27 2008 -0700
@@ -1,3 +1,10 @@ 2008-02-01 Jerry James <james(a)xemacs.o
+2008-02-03 Jerry James <james(a)xemacs.org>
+
+ * redisplay.c (generate_displayable_area): If a line has been
+ generated in place in the dynarray, use Dynarr_increment instead
+ of Dynarr_add.
+ * redisplay.c (regenerate_window): Ditto.
+
2008-02-01 Jerry James <james(a)xemacs.org>
* event-Xt.c (emacs_Xt_event_handler): Remove unnecessary call to
diff -r 0cee1ff42db4e80491b04d36066f37ff9794aff2 -r 9bcdf9a3a783dd60aa09e1aadce72cca9d534e58 src/redisplay.c
--- a/src/redisplay.c Sun Feb 03 10:35:25 2008 +0100
+++ b/src/redisplay.c Mon Feb 04 21:41:27 2008 -0700
@@ -5395,8 +5395,12 @@ generate_displayable_area (struct window
else
dlp->clip = 0;
- assert (pos_of_dlp < 0 || pos_of_dlp == Dynarr_length (dla));
- Dynarr_add (dla, *dlp);
+ if (pos_of_dlp < 0)
+ Dynarr_add (dla, *dlp);
+ else if (pos_of_dlp == Dynarr_length (dla))
+ Dynarr_increment (dla);
+ else
+ ABORT ();
/* #### This type of check needs to be done down in the
generate_display_line call. */
@@ -5602,8 +5606,12 @@ Info on Re-entrancy crashes, with backtr
if (dlp->num_chars > w->max_line_len)
w->max_line_len = dlp->num_chars;
- assert (pos_of_dlp < 0 || pos_of_dlp == Dynarr_length (dla));
- Dynarr_add (dla, *dlp);
+ if (pos_of_dlp < 0)
+ Dynarr_add (dla, *dlp);
+ else if (pos_of_dlp == Dynarr_length (dla))
+ Dynarr_increment (dla);
+ else
+ ABORT ();
/* #### This isn't right, but it is close enough for now. */
w->window_end_pos[type] = start_pos;
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[PATCH 21.5] Another valgrind complaint about memcpy
16 years, 10 months
Jerry James
PATCH 21.5
This fixes the only other complaint I'm getting from valgrind about
something of the form memcpy(&x, &x, sizeof(x));. Twice in the
redisplay code, we try to optimize by building a dynarray entry in
place, then throw it all away by doing Dynarr_add, which copies the
bytes from where they are to ... um, where they are. The fix is to
use Dynarr_increment in that case instead to bump up the size of the
dynarray to include the new entry. I have run with this for a couple
of hours today, but have not given it extensive testing.
--
Jerry James
http://loganjerry.googlepages.com/
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
Re: commit: Correct case-insensitive search for non-case, non-ASCII chars. Add tests.
16 years, 10 months
Aidan Kehoe
Ar an triú lá de mí Feabhra, scríobh Michael Sperber:
> Aidan Kehoe <kehoea(a)parhasard.net> writes:
>
> > Ar an t-aonú lá is triochad de mí Eanair, scríobh Michael Sperber:
> >
> > > Let me know if you need more info---I couldn't convince gdb on my
> > > Mac OS X box to produce a backtrace right away, but I'll have more
> > > time tomorrow.
> >
> > Ideally, I’d like the entire buffer being searched, together with the output
> > of M-: (current-case-table) RET, both saved using escape-quoted. I can’t
> > provoke an assertion failure with
> >
> > (search-forward "Patrick Mézard <pmezard(a)gmail.com>" nil t)
> >
> > on its own, so I need more context.
>
> The buffer is empty. I can reproduce the problem by creating a vanilla
> empty buffer, and then doing M-: (search-forward ...).
Probably because GNUS’ modifications have affected the global case table.
What does M-: (current-case-table) RET give?
--
¿Dónde estará ahora mi sobrino Yoghurtu Nghé, que tuvo que huir
precipitadamente de la aldea por culpa de la escasez de rinocerontes?
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
commit: Correct the initialisation of ascii-case-table.
16 years, 10 months
Aidan Kehoe
changeset: 4417:0cee1ff42db4e80491b04d36066f37ff9794aff2
tag: tip
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Sun Feb 03 10:35:25 2008 +0100
files: lisp/ChangeLog lisp/iso8859-1.el
description:
Correct the initialisation of ascii-case-table.
2008-02-03 Aidan Kehoe <kehoea(a)parhasard.net>
* iso8859-1.el (ascii-case-table):
Correct the order of the arguments to #'put-case-table-pair.
diff -r 930bb9cba65a668a939d8d4369f4d1db1b33f156 -r 0cee1ff42db4e80491b04d36066f37ff9794aff2 lisp/ChangeLog
--- a/lisp/ChangeLog Fri Feb 01 09:36:51 2008 -0700
+++ b/lisp/ChangeLog Sun Feb 03 10:35:25 2008 +0100
@@ -1,3 +1,8 @@ 2008-01-21 Aidan Kehoe <kehoea@parhasa
+2008-02-03 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * iso8859-1.el (ascii-case-table):
+ Correct the order of the arguments to #'put-case-table-pair.
+
2008-01-21 Aidan Kehoe <kehoea(a)parhasard.net>
* info.el (Info-suffix-list):
diff -r 930bb9cba65a668a939d8d4369f4d1db1b33f156 -r 0cee1ff42db4e80491b04d36066f37ff9794aff2 lisp/iso8859-1.el
--- a/lisp/iso8859-1.el Fri Feb 01 09:36:51 2008 -0700
+++ b/lisp/iso8859-1.el Sun Feb 03 10:35:25 2008 +0100
@@ -39,8 +39,8 @@
for lower from (char-int ?a) to (char-int ?z)
and upper from (char-int ?A) to (char-int ?Z)
with table = (make-case-table)
- do (put-case-table-pair (coerce lower 'character)
- (coerce upper 'character)
+ do (put-case-table-pair (coerce upper 'character)
+ (coerce lower 'character)
table)
finally return table)
"Case table for the ASCII character set.")
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
Fwd: Mail delivery failed: returning message to sender
16 years, 10 months
Stephen J. Turnbull
Got hung up in a recent changeover of XEmacs secondary MXs, it seems.
---------- Forwarded message ----------
From: Mail Delivery System <Mailer-Daemon(a)mejsel.josefsson.org>
Date: Feb 1, 2008 6:19 PM
Subject: Mail delivery failed: returning message to sender
To: unwelcome-guest(a)alioth.debian.org
This message was created automatically by mail delivery software.
A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:
xemacs-patches(a)xemacs.org
SMTP error from remote mail server after RCPT TO:<
xemacs-patches(a)xemacs.org>:
host mail.xemacs.org [207.172.156.133]: 451 4.7.1 Greylisting in action,
please come back later:
retry timeout exceeded
------ This is a copy of the message, including all the headers. ------
Re: commit: Correct case-insensitive search for non-case, non-ASCII chars. Add tests.
16 years, 10 months
Aidan Kehoe
Ar an t-aonú lá is triochad de mí Eanair, scríobh Michael Sperber:
> Let me know if you need more info---I couldn't convince gdb on my Mac OS
> X box to produce a backtrace right away, but I'll have more time
> tomorrow.
Ideally, I’d like the entire buffer being searched, together with the output
of M-: (current-case-table) RET, both saved using escape-quoted. I can’t
provoke an assertion failure with
(search-forward "Patrick Mézard <pmezard(a)gmail.com>" nil t)
on its own, so I need more context.
--
¿Dónde estará ahora mi sobrino Yoghurtu Nghé, que tuvo que huir
precipitadamente de la aldea por culpa de la escasez de rinocerontes?
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches