[C] xemacs-21.5-clean: Update mirror sites
16 years, 8 months
Adrian Aichner
COMMIT
These are not coming back short-term.
Adrian
xemacs-21.5-clean ChangeLog patch:
Diff command: cvs -q diff -U 0
Files affected: lisp/ChangeLog
Index: lisp/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.827
diff -u -U0 -r1.827 ChangeLog
--- lisp/ChangeLog 15 Aug 2007 23:23:30 -0000 1.827
+++ lisp/ChangeLog 18 Aug 2007 13:36:56 -0000
＠＠ -0,0 +1,5 ＠＠
+2007-08-18 Adrian Aichner <adrian(a)xemacs.org>
+
+ * package-get.el (package-get-download-sites): Update mirror sites.
+ * package-get.el (package-get-pre-release-download-sites): Ditto.
+
xemacs-21.5-clean source patch:
Diff command: cvs -f -z3 -q diff -u -w -N
Files affected: lisp/package-get.el
===================================================================
RCS
Index: lisp/package-get.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/package-get.el,v
retrieving revision 1.80
diff -u -w -r1.80 package-get.el
--- lisp/package-get.el 15 Aug 2007 23:23:32 -0000 1.80
+++ lisp/package-get.el 18 Aug 2007 13:36:13 -0000
＠＠ -245,18 +245,15 ＠＠
; ("Japan (nucba.ac.jp)" "mirror.nucba.ac.jp" "mirror/xemacs/packages")
("Korea (kr.xemacs.org)" "ftp.kr.xemacs.org" "pub/tools/emacs/xemacs/packages")
("Netherlands (nl.xemacs.org)" "ftp.nl.xemacs.org" "pub/xemacs/ftp/packages")
- ("New Zealand (nz.xemacs.org)" "ftp.nz.xemacs.org" "mirror/ftp.xemacs.org/packages")
("Norway (no.xemacs.org)" "ftp.no.xemacs.org" "pub/xemacs/packages")
("Portugal (pt.xemacs.org)" "ftp.pt.xemacs.org" "pub/MIRRORS/ftp.xemacs.org/packages")
("Russia (ru.xemacs.org)" "ftp.ru.xemacs.org" "pub/emacs/xemacs/packages")
("Saudi Arabia (sa.xemacs.org)" "ftp.sa.xemacs.org" "pub/xemacs.org/packages")
-; ("South Africa (za.xemacs.org)" "ftp.za.xemacs.org" "mirrorsites/ftp.xemacs.org/packages")
("Sweden (se.xemacs.org)" "ftp.se.xemacs.org" "pub/gnu/xemacs/packages")
("Switzerland (ch.xemacs.org)" "ftp.ch.xemacs.org" "mirror/xemacs/packages")
("Taiwan (ftp.tw.xemacs.org)" "ftp.tw.xemacs.org" "Unix/Editors/XEmacs/packages")
("UK (uk.xemacs.org)" "ftp.uk.xemacs.org" "sites/ftp.xemacs.org/pub/xemacs/packages")
("US (ibiblio.org)" "mirrors.ibiblio.org" "pub/mirrors/xemacs/packages")
- ("US (stealth.net)" "ftp.stealth.net" "pub/mirrors/ftp.xemacs.org/pub/xemacs/packages")
("US (us.xemacs.org)" "ftp.us.xemacs.org" "pub/mirrors/xemacs/packages")
)
"*List of remote sites available for downloading packages.
＠＠ -336,8 +333,6 ＠＠
"pub/tools/emacs/xemacs/beta/experimental/packages")
("Netherlands (nl.xemacs.org)" "ftp.nl.xemacs.org"
"pub/xemacs/ftp/beta/experimental/packages")
- ("New Zealand Pre-Releases (nz.xemacs.org)" "ftp.nz.xemacs.org"
- "mirror/ftp.xemacs.org/packages")
("Norway Pre-Releases (no.xemacs.org)" "ftp.no.xemacs.org"
"pub/xemacs/beta/experimental/packages")
("Portugal Pre-Releases (pt.xemacs.org)" "ftp.pt.xemacs.org"
＠＠ -346,8 +341,6 ＠＠
"pub/emacs/xemacs/beta/experimental/packages")
("Saudi Arabia (sa.xemacs.org)" "ftp.sa.xemacs.org"
"pub/xemacs.org/beta/experimental/packages")
-; ("South Africa Pre-Releases (za.xemacs.org)" "ftp.za.xemacs.org"
-; "mirrorsites/ftp.xemacs.org/beta/experimental/packages")
("Sweden Pre-Releases (se.xemacs.org)" "ftp.se.xemacs.org"
"pub/gnu/xemacs/beta/experimental/packages")
("Switzerland Pre-Releases (ch.xemacs.org)" "ftp.ch.xemacs.org"
＠＠ -358,8 +351,6 ＠＠
"sites/ftp.xemacs.org/pub/xemacs/beta/experimental/packages")
("US Pre-Releases (ibiblio.org)" "mirrors.ibiblio.org"
"pub/mirrors/xemacs/beta/experimental/packages")
- ("US Pre-Releases (stealth.net)" "ftp.stealth.net"
- "pub/mirrors/ftp.xemacs.org/pub/xemacs/beta/experimental/packages")
("US Pre-Releases (us.xemacs.org)" "ftp.us.xemacs.org"
"pub/mirrors/xemacs/beta/experimental/packages")
)
--
Adrian Aichner
mailto:adrian＠xemacs.org
http://www.xemacs.org/
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[P21.5R21.4] Fix build on SunOS 5.10
16 years, 8 months
Marcus Crestani
PATCH 21.5, RECOMMEND 21.4
This patch fixes the build on recent intel-based Solaris 10
(SunOS 5.10 Generic_118855-36 i86pc i386 i86pc Solaris).
I'll apply on Friday if nobody objects.
src/ChangeLog addition:
2007-08-14 Marcus Crestani <crestani(a)xemacs.org>
* s/sol2.h: Fix for GCC lossage not needed with SunOS 5.10.
sunos-xemacs-21.5 source patch:
Diff command: cvs -q diff -u
Files affected: src/s/sol2.h
===================================================================
RCS
Index: src/s/sol2.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/s/sol2.h,v
retrieving revision 1.12
diff -u -r1.12 sol2.h
--- src/s/sol2.h 18 Sep 2003 05:14:00 -0000 1.12
+++ src/s/sol2.h 14 Aug 2007 18:19:41 -0000
＠＠ -11,7 +11,7 ＠＠
#endif
/* Fix understandable GCC lossage on Solaris 2.6 */
-#if defined(__GNUC__) && OS_RELEASE >= 506 && !defined(NOT_C_CODE)
+#if defined(__GNUC__) && OS_RELEASE >= 506 && OS_RELEASE < 510 && !defined(NOT_C_CODE)
/* GCC va_list munging is a little messed up */
#define __GNUC_VA_LIST
--
Marcus
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[AC21.5] font-lock-warning-face undefined
16 years, 8 months
Vin Shelton
APPROVE COMMIT 21.5
---------- Forwarded message ----------
From: Hans de Graaff <graaff(a)gentoo.org>
Date: Jun 23, 2007 6:42 AM
Subject: font-lock-warning-face undefined
To: xemacs-beta(a)xemacs.org
Hi,
I just found out that font-lock-warning-face is defined in list/font-
lock.el, but in such a way that code can't make use of it, as there seems
to be one part missing. The following patch fixes things (needs to be
applied to both 21.4 and 21.5).
And yes, I do need this for horrid FSF compatibility reasons. :-)
Kind regards,
Hans
Index: font-lock.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/font-lock.el,v
retrieving revision 1.31
diff -u -B -r1.31 font-lock.el
--- lisp/font-lock.el 2006/11/01 23:14:33 1.31
+++ lisp/font-lock.el 2007/06/23 07:14:17
＠＠ -721,6 +721,11 ＠＠
It is present only for horrid FSF compatibility reasons.
The corresponding face should be set using `edit-faces' or the
`set-face-*' functions.")
+(defvar font-lock-warning-face 'font-lock-warning-face
+ "This variable should not be set.
+It is present only for horrid FSF compatibility reasons.
+The corresponding face should be set using `edit-faces' or the
+`set-face-*' functions.")
(defconst font-lock-face-list
'(font-lock-comment-face
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta
--
The Journey by Mary Oliver
http://www.poemhunter.com/p/m/poem.asp?poet=6771&poem=30506
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[AC21.5R21.4] Workaround for LDAP API lag
16 years, 8 months
Stephen J. Turnbull
APPROVE COMMIT 21.5 RECOMMEND 21.4
Vin, AFAIK 21.5's LDAP support is the same as 21.4's so you'll
probably run into the same problem.
Index: modules/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/ChangeLog,v
retrieving revision 1.62
diff -u -r1.62 ChangeLog
--- modules/ChangeLog 21 May 2007 05:01:52 -0000 1.62
+++ modules/ChangeLog 22 Jun 2007 16:52:51 -0000
＠＠ -0,0 +1,6 ＠＠
+2007-06-23 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * ldap/eldap.h: Declare that we use deprecated API.
+ Thanks to Mats Lidell <matsl(a)xemacs.org> for the report & patch:
+ <871wgnqunm.fsf(a)spencer.lidell.homelinux.net>.
+
Index: modules/ldap/eldap.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/ldap/eldap.h,v
retrieving revision 1.4
diff -u -r1.4 eldap.h
--- modules/ldap/eldap.h 25 Oct 2005 08:32:42 -0000 1.4
+++ modules/ldap/eldap.h 22 Jun 2007 16:52:51 -0000
＠＠ -22,6 +22,13 ＠＠
#define INCLUDED_eldap_h_
#include <lber.h>
+/* #### NEEDS REWRITE!
+ Thanks to Mats Lidell <matsl(a)xemacs.org> for the report & patch:
+ <871wgnqunm.fsf(a)spencer.lidell.homelinux.net>
+ "See http://www.openldap.org/faq/data/cache/1278.html.
+ Temporary workaround would be use the deprecated interface. Long term
+ solution is a rewrite." */
+#define LDAP_DEPRECATED 1
#include <ldap.h>
/*
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[AC21.5] Test for 'revert-buffer doesn't reset modiff' bug
16 years, 8 months
Stephen J. Turnbull
APPROVE COMMIT 21.5 RECOMMEND 21.4
Vin -- consider this for 21.4. I haven't tested in 21.4, will do so
on request. Should work, though. The bug it's testing for was never
in 21.4, but considering the delicacy of revert-buffer, it's
imaginable that a regression could occur.
This test fails on XEmacs 21.5 before Aidan's patch of yesterday,
passes post patch. So I'm pretty sure the bug Ville and I reported is
fixed. Thanks Aidan!
Index: tests/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/ChangeLog,v
retrieving revision 1.93
diff -u -r1.93 ChangeLog
--- tests/ChangeLog 21 Jun 2007 13:39:32 -0000 1.93
+++ tests/ChangeLog 22 Jun 2007 16:31:15 -0000
＠＠ -0,0 +1,4 ＠＠
+2007-06-22 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * automated/mule-tests.el (buffer-modified-p): Test after revert.
+
Index: tests/automated/mule-tests.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/automated/mule-tests.el,v
retrieving revision 1.18
diff -u -r1.18 mule-tests.el
--- tests/automated/mule-tests.el 21 May 2007 08:11:37 -0000 1.18
+++ tests/automated/mule-tests.el 22 Jun 2007 16:31:15 -0000
＠＠ -112,6 +112,35 ＠＠
;; ochars[3] = 0x80 | input & ~(0xFFFFFFC0);
(logior #x80 (logand code-point #x3f))))))))
+;;----------------------------------------------------------------
+;; Test that revert-buffer resets the modiff
+;; Bug reported 2007-06-20 <200706201902.32191.scop(a)xemacs.org>.
+;; Fixed 2007-06-22 <18043.2793.611745.734215(a)parhasard.net>.
+;;----------------------------------------------------------------
+
+;; #### need a temp file name but this will do for now
+(let ((test-file-name (expand-file-name "~/test-revert-buffer-resets-modiff"))
+ revert-buffer-function
+ kill-buffer-hook) ; paranoia
+ (find-file test-file-name)
+ (erase-buffer)
+ (insert "a string\n")
+ (save-buffer 0)
+ (insert "more text\n")
+ (revert-buffer t t)
+ ;; Just "find-file" with autodetect coding didn't fail for me, but it does
+ ;; fail under test harness. Still we'll redo the test with an explicit
+ ;; coding system just in case.
+ (Assert (not (buffer-modified-p)))
+ (kill-buffer nil)
+ (when (find-coding-system 'utf-8)
+ (find-file test-file-name 'utf-8)
+ (insert "more text\n")
+ (revert-buffer t t)
+ (Assert (not (buffer-modified-p)))
+ (kill-buffer nil))
+ (delete-file test-file-name))
+
;;-----------------------------------------------------------------
;; Test string modification functions that modify the length of a char.
;;-----------------------------------------------------------------
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[AC21.5R21.4] Sync etags to v. 17.33
16 years, 8 months
Stephen J. Turnbull
APPROVE COMMIT 21.5 RECOMMEND 21.4
Vin, to sync 21.4 you should just copy lib-src/etags.c and
etc/ETAGS.README to the appropriate places. The latter is a
permissions file that Francesco says is required by other authors'
licenses. (Even though it's duplicated in the header of etags.c.)
Basically untested; the patch looks OK, and I trust Francesco.
This patch updates etags.c to pot revision 17.33, and syncs it 100%
with upstream. Only the version information (which by Francesco's
design is tied to the XEmacs release) will vary from a standalone
build.
At Francesco's request, I am reverting the change that Steve Youngs
contributed to include the "pot revision" in the version output, but I
have already changed the Makefile so that the +CVS-`date` string will
appear for beta versions. That should be precise enough. (Vin: the
Makefile change is irrelevant to 21.4, as the complete 21.4.x version
is already included AFAIK. Only 21.5 CVS has the extra_name stuff.)
Index: lib-src/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/ChangeLog,v
retrieving revision 1.219
diff -u -r1.219 ChangeLog
--- lib-src/ChangeLog 24 May 2007 20:18:50 -0000 1.219
+++ lib-src/ChangeLog 29 May 2007 14:00:33 -0000
＠＠ -0,0 +1,6 ＠＠
+2007-05-29 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * etags.c: Sync to pot_etags_version 17.26.
+ Reverts part of 2007-03-24 patch: no longer displays
+ pot_etags_version in usage message.
+
Index: lib-src/etags.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/etags.c,v
retrieving revision 1.39
diff -u -r1.39 etags.c
--- lib-src/etags.c 21 May 2007 03:50:19 -0000 1.39
+++ lib-src/etags.c 29 May 2007 14:00:33 -0000
＠＠ -80,7 +80,7 ＠＠
* configuration file containing regexp definitions for etags.
*/
-char pot_etags_version[] = "＠(#) pot revision number is 17.32";
+char pot_etags_version[] = "＠(#) pot revision number is 17.33";
#define TRUE 1
#define FALSE 0
＠＠ -882,7 +882,7 ＠＠
# define EMACS_NAME "standalone"
#endif
#ifndef VERSION
-# define VERSION "17.32"
+# define VERSION "17.33"
#endif
static void
print_version ()
＠＠ -894,6 +894,10 ＠＠
exit (EXIT_SUCCESS);
}
+#ifndef PRINT_UNDOCUMENTED_OPTIONS_HELP
+# define PRINT_UNDOCUMENTED_OPTIONS_HELP FALSE
+#endif
+
static void
print_help (argbuffer)
argument *argbuffer;
＠＠ -976,6 +980,11 ＠＠
puts ("--no-globals\n\
Do not create tag entries for global variables in some\n\
languages. This makes the tags file smaller.");
+
+ if (PRINT_UNDOCUMENTED_OPTIONS_HELP)
+ puts ("--no-line-directive\n\
+ Ignore #line preprocessor directives in C and derived languages.");
+
if (CTAGS)
puts ("--members\n\
Create tag entries for members of structures in some languages.");
＠＠ -996,13 +1005,17 ＠＠
MODS are optional one-letter modifiers: `i' means to ignore case,\n\
`m' means to allow multi-line matches, `s' implies `m' and\n\
causes dot to match any character, including newline.");
+
puts ("-R, --no-regex\n\
Don't create tags from regexps for the following files.");
+
puts ("-I, --ignore-indentation\n\
In C and C++ do not assume that a closing brace in the first\n\
column is the final brace of a function or structure definition.");
+
puts ("-o FILE, --output=FILE\n\
Write the tags to FILE.");
+
puts ("--parse-stdin=NAME\n\
Read from standard input and record tags as belonging to file NAME.");
＠＠ -1030,13 +1043,16 ＠＠
Print on the standard output an index of items intended for\n\
human consumption, similar to the output of vgrind. The index\n\
is sorted, and gives the page number of each item.");
-# if PRINT_UNDOCUMENTED_OPTIONS_HELP
- puts ("-w, --no-duplicates\n\
+
+ if (PRINT_UNDOCUMENTED_OPTIONS_HELP)
+ puts ("-w, --no-duplicates\n\
Do not create duplicate tag entries, for compatibility with\n\
traditional ctags.");
- puts ("-w, --no-warn\n\
+
+ if (PRINT_UNDOCUMENTED_OPTIONS_HELP)
+ puts ("-w, --no-warn\n\
Suppress warning messages about duplicate tag entries.");
-# endif /* PRINT_UNDOCUMENTED_OPTIONS_HELP */
+
puts ("-x, --cxref\n\
Like --vgrind, but in the style of cxref, rather than vgrind.\n\
The output uses line numbers instead of page numbers, but\n\
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[AC21.4] Fix potential progress gauge problems
16 years, 8 months
Vin Shelton
APPROVE COMMIT 21.4
Thanks for the patch, Stephen.
It has been committed to the 21.4 branch and will appear
in the 21.4.21 release.
- Vin
On 5/20/07, Stephen J. Turnbull <stephen(a)xemacs.org> wrote:
> APPROVE COMMIT 21.5 RECOMMEND 21.4
>
> I decided to see if I could do something about the perennial progress
> bar crash. I'm unable to reproduce at the moment and haven't found a
> report that localizes it very well, but based on one report that has a
> backtrace with XFillRectangle crashing, I'm guessing that it has to do
> with the function GaugeMercury (which won't appear in most backtraces
> because it's static).
>
> The attached patch fixes a genuine bug, which has some chance of being
> related to the crash. All of the callers of GaugeMercury pass it ints
> in the val0 and val1 arguments, but they are declared Cardinal, which
> is X-ese for "unsigned". Having done a bunch of fontlocking with it,
> as least I can say it doesn't cause a new crach for me. However, I
> can't say for sure it will help.
>
> And as usual there's a gratuitous (but related) doc change. I never
> saw a docstring that didn't need fussing with. :-)
>
> Index: lisp/ChangeLog
> ===================================================================
> RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
> retrieving revision 1.795
> diff -u -r1.795 ChangeLog
> --- lisp/ChangeLog 12 May 2007 13:12:26 -0000 1.795
> +++ lisp/ChangeLog 20 May 2007 14:32:02 -0000
> ＠＠ -0,0 +1,4 ＠＠
> +2007-05-20 Stephen J. Turnbull <stephen(a)xemacs.org>
> +
> + * gutter-items.el (progress-feedback-with-label): Clarify docstring.
> +
> Index: lwlib/ChangeLog
> ===================================================================
> RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/ChangeLog,v
> retrieving revision 1.91
> diff -u -r1.91 ChangeLog
> --- lwlib/ChangeLog 17 May 2007 15:06:04 -0000 1.91
> +++ lwlib/ChangeLog 20 May 2007 14:32:02 -0000
> ＠＠ -0,0 +1,13 ＠＠
> +2007-05-20 Stephen J. Turnbull <stephen(a)xemacs.org>
> +
> + Gauge values are signed integers (ints).
> + (XawGaugeGetValue): Declare return value as int.
> + (XawGaugeSetValue): Declare value as int.
> +
> + * xlwgauge.h: Get rid of references to Cardinal in comment.
> +
> + * xlwgauge.c (GaugeGetValue): Declare value as int.
> + (GaugeMercury): Declare val0 and val1 as int. Remove redundant casts.
> + (XawGaugeGetValue): Declare return value as int.
> + (XawGaugeSetValue): Declare value as int.
> +
>
> Index: lisp/gutter-items.el
> ===================================================================
> RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/gutter-items.el,v
> retrieving revision 1.8
> diff -u -r1.8 gutter-items.el
> --- lisp/gutter-items.el 18 Mar 2003 06:58:20 -0000 1.8
> +++ lisp/gutter-items.el 20 May 2007 14:32:02 -0000
> ＠＠ -679,8 +679,10 ＠＠
>
> (defun progress-feedback-with-label (label fmt &optional value &rest args)
> "Print a progress gauge and message in the bottom gutter area of the frame.
> -First argument LABEL is an identifier for this progress gauge. The rest of the
> -arguments are the same as to `format'."
> +LABEL is an identifier for this progress gauge.
> +FMT is a format string to be passed to `format' along with ARGS.
> +Optional VALUE is the current degree of progress, an integer 0-100.
> +The remaining ARGS are passed with FMT `(apply #'format FMT ARGS)'."
> ;; #### sometimes the buffer gets changed temporarily. I don't know
> ;; why this is, so protect against it.
> (save-excursion
> Index: lwlib/xlwgauge.c
> ===================================================================
> RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwgauge.c,v
> retrieving revision 1.7
> diff -u -r1.7 xlwgauge.c
> --- lwlib/xlwgauge.c 2 May 2006 15:30:32 -0000 1.7
> +++ lwlib/xlwgauge.c 20 May 2007 14:32:02 -0000
> ＠＠ -132,7 +132,7 ＠＠
> static void DisableUpdate (GaugeWidget);
>
> static void GaugeGetValue (XtPointer, XtIntervalId *);
> -static void GaugeMercury (Display *, Window, GC, GaugeWidget, Cardinal, Cardinal);
> +static void GaugeMercury (Display *, Window, GC, GaugeWidget, int, int);
>
> static Boolean GaugeConvert (Widget, Atom *, Atom *, Atom *,
> XtPointer *, unsigned long *, int *);
> ＠＠ -817,8 +817,7 ＠＠
> */
>
> void
> -XawGaugeSetValue (Widget w,
> - Cardinal value)
> +XawGaugeSetValue (Widget w, int value)
> {
> GaugeWidget gw = (GaugeWidget)w ;
> int oldvalue ;
> ＠＠ -850,7 +849,7 ＠＠
> }
>
>
> -Cardinal
> +int
> XawGaugeGetValue (Widget w)
> {
> GaugeWidget gw = (GaugeWidget)w ;
> ＠＠ -873,8 +872,8 ＠＠
> Window win,
> GC gc,
> GaugeWidget gw,
> - Cardinal val0,
> - Cardinal val1)
> + int val0,
> + int val1)
> {
> int v0 = gw->gauge.v0 ;
> int v1 = gw->gauge.v1 ;
> ＠＠ -893,10 +892,10 ＠＠
>
> if( vd <= 0 ) vd = 1 ;
>
> - if( (int) val0 < v0 ) val0 = v0 ;
> - else if( (int) val0 > v1 ) val0 = v1 ;
> - if( (int) val1 < v0 ) val1 = v0 ;
> - else if( (int) val1 > v1 ) val1 = v1 ;
> + if( val0 < v0 ) val0 = v0 ;
> + else if( val0 > v1 ) val0 = v1 ;
> + if( val1 < v0 ) val1 = v0 ;
> + else if( val1 > v1 ) val1 = v1 ;
>
> p0 = (val0-v0)*(e1-e0-1)/vd ;
> p1 = (val1-v0)*(e1-e0-1)/vd ;
> ＠＠ -1108,7 +1107,7 ＠＠
> XtIntervalId *UNUSED (intervalId))
> {
> GaugeWidget gw = (GaugeWidget)clientData ;
> - Cardinal value ;
> + int value ;
>
> if( gw->gauge.update > 0 )
> EnableUpdate(gw) ;
> Index: lwlib/xlwgauge.h
> ===================================================================
> RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwgauge.h,v
> retrieving revision 1.2
> diff -u -r1.2 xlwgauge.h
> --- lwlib/xlwgauge.h 12 Apr 2001 18:21:53 -0000 1.2
> +++ lwlib/xlwgauge.h 20 May 2007 14:32:02 -0000
> ＠＠ -48,9 +48,9 ＠＠
>
> Name Class RepType Default Value
> ---- ----- ------- -------------
> - value Value Cardinal 0
> - minValue MinValue Cardinal 0
> - maxValue MaxValue Cardinal 100
> + value Value Int 0
> + minValue Int Cardinal 0
> + maxValue Int Cardinal 100
> ntics NTics Cardinal 0 +
> nlabels NLabels Cardinal 0 ++
> labels Labels String * NULL +++
> ＠＠ -100,7 +100,7 ＠＠
> XtPointer client ;
> XtPointer rval ;
> {
> - *(Cardinal *)rval = value ;
> + *(int *)rval = value ;
> }
>
> */
> ＠＠ -169,11 +169,11 ＠＠
> extern void XawGaugeSetValue(
> #if NeedFunctionPrototypes
> Widget gauge,
> - Cardinal value
> + int value
> #endif
> );
>
> -extern Cardinal XawGaugeGetValue(
> +extern int XawGaugeGetValue(
> #if NeedFunctionPrototypes
> Widget gauge
> #endif
>
> _______________________________________________
> XEmacs-Patches mailing list
> XEmacs-Patches(a)xemacs.org
> http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
>
--
The Journey by Mary Oliver
http://www.poemhunter.com/p/m/poem.asp?poet=6771&poem=30506
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[21.5] Fix crash in PNG initialiation [was: can't move cursor ...]
16 years, 8 months
Stephen J. Turnbull
21.5
Vin, this presumably affects 21.4 too. If you don't recall any
related reports (probably only comes up if PNG lib that gets found at
runtime differs from build-time link lib), I'll take my time....
Stephen J. Turnbull writes:
> Does `configure --with-cppflags="-newflag $CPPFLAGS" ...' work in your
> application? I think that having the `--with-whateverflags' options
> override the corresponding environment variables is easier to
> explain. It's certainly easier to code!
[[ This is in my queue but I am working on other stuff. ]]
> Ron Isaacson writes:
> > #2 is definitely not our problem. :-) I think you need to ensure that
> > png_err_stct.setjmp_buffer is set to a valid address BEFORE passing
> > png_error_func as a parameter to anything. Otherwise, any runtime
> > error from png_create_read_struct will get you into the same boat.
OK, yes, this is really ugly. (But then, when isn't a setjmp/longjmp
ugly?) I think the attached patch should fix the problem, but I don't
yet have a test case and I've never patched code involving setjmp/
longjmp before so a second opinion would be welcome (and a third...).
(I think the relevant test case for the original bug can be easily
constructed by substituting "You're going down, sucker!" for
PNG_LIBPNG_VER_STRING, but I haven't done that yet.)
The first hunk is a little suspicious; for some reason
png_destroy_read_struct() wants access to the pointer variable
containing png_ptr, not just the pointer itself. The only reason I
can think why it would want that is to NULL it, and I've done that, so
passing &tmp to png_destroy_read_struct() should be OK, I think.
The other changes are to first NULL out any unwind pointers to
structures that are being destroyed in case the libpng code longjmps,
then call libpng's finalizer; to move the setjmp call much earlier;
and to stuff the unwind structure with the the necessary data as soon
as we get it.
I guess I have to assume that none of the libpng functions will
implicitly call a finalizer....
I'll run with it a while before committing, but would really
appreciate comments.
2007-02-17 Stephen J. Turnbull <stephen(a)xemacs.org>
* glyphs-eimage.c (png_instantiate_unwind): Avoid recursion.
(png_instantiate): Initialize setjmp_buffer early, and avoid
recursive entry to error handler.
diff --git a/src/glyphs-eimage.c b/src/glyphs-eimage.c
index 49364ca..5184e2c 100644
--- a/src/glyphs-eimage.c
+++ b/src/glyphs-eimage.c
＠＠ -849,7 +849,13 ＠＠ png_instantiate_unwind (Lisp_Object unwind_obj)
free_opaque_ptr (unwind_obj);
if (data->png_ptr)
- png_destroy_read_struct (&(data->png_ptr), &(data->info_ptr), (png_infopp)NULL);
+ {
+ /* ensure we can't get here again */
+ png_structp tmp = data->png_ptr;
+ data->png_ptr = NULL;
+ png_destroy_read_struct (&tmp, &(data->info_ptr), (png_infopp)NULL);
+ }
+
if (data->instream)
retry_fclose (data->instream);
＠＠ -874,24 +880,36 ＠＠ png_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
png_structp png_ptr;
png_infop info_ptr;
+ xzero (unwind);
+ record_unwind_protect (png_instantiate_unwind, make_opaque_ptr (&unwind));
+
+ if (setjmp (png_err_stct.setjmp_buffer))
+ {
+ /* Something blew up:
+ just display the error (cleanup happens in the unwind) */
+ signal_image_error_2 ("Error decoding PNG",
+ build_string(png_err_stct.err_str),
+ instantiator);
+ }
+
/* Initialize all PNG structures */
- png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, (void*)&png_err_stct,
+ png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING,
+ (void *) &png_err_stct,
png_error_func, png_warning_func);
if (!png_ptr)
signal_image_error ("Error obtaining memory for png_read", instantiator);
+ unwind.png_ptr = png_ptr;
+
info_ptr = png_create_info_struct (png_ptr);
if (!info_ptr)
{
+ unwind.png_ptr = NULL; /* avoid re-calling png_destroy_read_struct
+ when unwinding */
png_destroy_read_struct (&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
signal_image_error ("Error obtaining memory for png_read", instantiator);
}
-
- xzero (unwind);
- unwind.png_ptr = png_ptr;
unwind.info_ptr = info_ptr;
- record_unwind_protect (png_instantiate_unwind, make_opaque_ptr (&unwind));
-
/* This code is a mixture of stuff from Ben's GIF/JPEG stuff from
this file, example.c from the libpng 0.81 distribution, and the
pngtopnm sources. -WMP-
＠＠ -900,16 +918,6 ＠＠ png_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
and is no longer usable for previous versions. jh
*/
- /* Set the jmp_buf return context for png_error ... if this returns !0, then
- we ran into a problem somewhere, and need to clean up after ourselves. */
- if (setjmp (png_err_stct.setjmp_buffer))
- {
- /* Something blew up: just display the error (cleanup happens in the unwind) */
- signal_image_error_2 ("Error decoding PNG",
- build_string(png_err_stct.err_str),
- instantiator);
- }
-
/* Initialize the IO layer and read in header information */
{
Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[C] cmuscheme fix
16 years, 8 months
Michael Sperber
2007-08-23 Mike Sperber <mike(a)xemacs.org>
* cmuscheme.el (run-scheme): Fix argument-processing bug from
2007-03-27 patch.
--
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla
Index: cmuscheme.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/scheme/cmuscheme.el,v
retrieving revision 1.4
diff -u -r1.4 cmuscheme.el
--- cmuscheme.el 27 Mar 2007 10:03:40 -0000 1.4
+++ cmuscheme.el 23 Aug 2007 07:02:22 -0000
＠＠ -210,11 +210,11 ＠＠
(interactive (list (if current-prefix-arg
(read-string "Run Scheme: " scheme-program-name)
scheme-program-name)
- (scheme-args-to-list
(if current-prefix-arg
- (read-string "Command-line arguments: "
- (scheme-list-to-args scheme-program-args))
- scheme-program-args))))
+ (scheme-args-to-list
+ (read-string "Command-line arguments: "
+ (scheme-list-to-args scheme-program-args)))
+ scheme-program-args)))
(if (not (comint-check-proc "*scheme*"))
(progn
(set-buffer (apply 'make-comint "scheme" cmd
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
