Mercurial > hg > xemacs-beta

changeset 5439:771bf922ab2b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged with trunk.
author Mats Lidell <matsl@xemacs.org>
date Mon, 06 Dec 2010 22:59:26 +0100
parents 8d29f1c4bb98 (current diff) 317ebaee6e4f (diff)
children 24c67faf4be6
files src/fns.c
diffstat 3 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGES-beta	Fri Nov 26 06:43:36 2010 +0100
+++ b/CHANGES-beta	Mon Dec 06 22:59:26 2010 +0100
@@ -1,4 +1,4 @@
-to XEmacs 21.5.30 "harblegarble"
+# DO NOT PUT A VERSION MARKER HERE, AUTOMATICALLY ADDED AT RELEASE
 
 by Ben Wing:
 
--- a/src/ChangeLog	Fri Nov 26 06:43:36 2010 +0100
+++ b/src/ChangeLog	Mon Dec 06 22:59:26 2010 +0100
@@ -1,3 +1,9 @@
+2010-11-30  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* fns.c (Ffill):
+	Move all declarations before statements, for the sake of the
+	Visual Studio build. Thank you Vin!
+
 2010-11-24  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* font-mgr.c (Ffc_pattern_get): Fix my last change when both
--- a/src/fns.c	Fri Nov 26 06:43:36 2010 +0100
+++ b/src/fns.c	Mon Dec 06 22:59:26 2010 +0100
@@ -4171,11 +4171,13 @@
 {
   Lisp_Object sequence = args[0];
   Lisp_Object item = args[1];
-  Elemcount starting = 0, ending = EMACS_INT_MAX + 1, ii, len;
+  Elemcount starting, ending = EMACS_INT_MAX + 1, ii, len;
 
   PARSE_KEYWORDS (Ffill, nargs, args, 2, (start, end), (start = Qzero));
 
   CHECK_NATNUM (start);
+  starting = BIGNUMP (start) ? EMACS_INT_MAX + 1 : XINT (start);
+
   if (!NILP (end))
     {
       CHECK_NATNUM (end);
@@ -4199,7 +4201,6 @@
 
       check_sequence_range (sequence, start, end, make_int (len));
       ending = min (ending, len);
-      starting = XINT (start);
 
       for (ii = starting; ii < ending; ++ii)
         {
@@ -4218,7 +4219,6 @@
 
       check_sequence_range (sequence, start, end, make_int (len));
       ending = min (ending, len);
-      starting = XINT (start);
 
       for (ii = starting; ii < ending; ++ii)
         {
@@ -4228,7 +4228,6 @@
   else if (LISTP (sequence))
     {
       Elemcount counting = 0;
-      starting = BIGNUMP (start) ? EMACS_INT_MAX + 1 : XINT (start);
 
       EXTERNAL_LIST_LOOP_3 (elt, sequence, tail)
         {