Mercurial > hg > xemacs-beta

changeset 4740:ff037e1dc33c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
automatic merge
author Stephen J. Turnbull <stephen@xemacs.org>
date Thu, 12 Nov 2009 00:00:11 +0900
parents 679041362cd4 (current diff) dce479915b74 (diff)
children e14f9fdd5096
files src/ChangeLog
diffstat 9 files changed, 46 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/modules/ChangeLog	Wed Nov 11 23:52:58 2009 +0900
+++ b/modules/ChangeLog	Thu Nov 12 00:00:11 2009 +0900
@@ -1,3 +1,10 @@
+2009-11-09  Jerry James  <james@xemacs.org>
+
+	* sample/external/Makefile.in.in: Clarify GPL status.
+	* sample/external/configure.ac: Ditto.
+	* sample/external/sample.c: Ditto.
+	* sample/internal/sample.c: Ditto.
+
 2009-10-05  Jerry James  <james@xemacs.org>
 
 	* ldap/eldap.c (Fldap_search_basic): quiet gcc warnings due to
--- a/modules/sample/external/Makefile.in.in	Wed Nov 11 23:52:58 2009 +0900
+++ b/modules/sample/external/Makefile.in.in	Thu Nov 12 00:00:11 2009 +0900
@@ -1,5 +1,10 @@
 ##   Makefile for the sample module in XEmacs.
 ##   Copyright (C) 2002 Jerry James.
+##
+##   This sample Makefile is free; 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 file is not part of XEmacs.
 
--- a/modules/sample/external/configure.ac	Wed Nov 11 23:52:58 2009 +0900
+++ b/modules/sample/external/configure.ac	Thu Nov 12 00:00:11 2009 +0900
@@ -1,4 +1,8 @@
 # Process this file with autoconf to produce a configure script.
+# This sample autoconf input script is free; 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.
 AC_INIT([Sample module], [1.0], [xemacs-beta@xemacs.org])
 AC_PREREQ(2.53)
 AC_REVISION($Revision: 1.1 $)
--- a/modules/sample/external/sample.c	Wed Nov 11 23:52:58 2009 +0900
+++ b/modules/sample/external/sample.c	Thu Nov 12 00:00:11 2009 +0900
@@ -3,6 +3,11 @@
  * of Emacs dynamic modules.
  * (C) Copyright 1998, 1999 J. Kean Johnston. All rights reserved.
  * (C) Copyright 2002 Jerry James.
+ *
+ * This sample module code 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.
  */
 
 #include <config.h>
--- a/modules/sample/internal/sample.c	Wed Nov 11 23:52:58 2009 +0900
+++ b/modules/sample/internal/sample.c	Thu Nov 12 00:00:11 2009 +0900
@@ -3,6 +3,11 @@
  * of Emacs dynamic modules.
  * (C) Copyright 1998, 1999 J. Kean Johnston. All rights reserved.
  * (C) Copyright 2002 Jerry James.
+ *
+ * This sample module code 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.
  */
 
 #include <config.h>
--- a/src/ChangeLog	Wed Nov 11 23:52:58 2009 +0900
+++ b/src/ChangeLog	Thu Nov 12 00:00:11 2009 +0900
@@ -1,9 +1,21 @@
 2009-11-11  Stephen Turnbull  <stephen@xemacs.org>
 
 	* darwin.h: Remove.  Functionality implemented in configure.ac.
-
 	* config.h.in (USE_PARAM_H): New.  Used by Darwin to #define BSD.
 
+2009-11-09  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* sysfile.h (DEFAULT_DIRECTORY_FALLBACK): 
+	Move the WIN32_NATIVE definition inside the #ifdef emacs
+	conditional, clear up the comment after #else; thanks for the
+	build failure report, Vin!
+	Cast DEFAULT_DIRECTORY_FALLBACK to (const CIbyte *) by default,
+	which better reflects its contents.
+	* editfns.c (get_home_directory): 
+	* buffer.c (init_initial_directory): 
+	Cast DEFAULT_DIRECTORY_FALLBACK to (Ibyte *) with functions that
+	take that type, now that is necessary. 
+
 2009-11-09  Jerry James  <james@xemacs.org>
 
 	* Makefile.in.in: Remove support for malloc.c ("old" GNU malloc).  Do
--- a/src/buffer.c	Wed Nov 11 23:52:58 2009 +0900
+++ b/src/buffer.c	Thu Nov 12 00:00:11 2009 +0900
@@ -2929,7 +2929,7 @@
 	stderr_out ("`getcwd' failed: %s: changing default directory to %s\n",
                     errmess, DEFAULT_DIRECTORY_FALLBACK);
 
-        if (qxe_chdir (DEFAULT_DIRECTORY_FALLBACK) < 0)
+        if (qxe_chdir ((Ibyte *)DEFAULT_DIRECTORY_FALLBACK) < 0)
           {
             GET_STRERROR (errmess, errno);
 
--- a/src/editfns.c	Wed Nov 11 23:52:58 2009 +0900
+++ b/src/editfns.c	Thu Nov 12 00:00:11 2009 +0900
@@ -868,7 +868,8 @@
                  Using "/" isn't quite right, but what should we do?
                  We probably should try to extract pw_dir from /etc/passwd,
                  before falling back to this. */
-	      cached_home_directory = qxestrdup (DEFAULT_DIRECTORY_FALLBACK);
+	      cached_home_directory
+                = qxestrdup ((const Ibyte *)DEFAULT_DIRECTORY_FALLBACK);
 	      output_home_warning = 1;
 	    }
 	}
--- a/src/sysfile.h	Wed Nov 11 23:52:58 2009 +0900
+++ b/src/sysfile.h	Thu Nov 12 00:00:11 2009 +0900
@@ -485,13 +485,13 @@
 }
 #define DIRECTORY_SEP sysfile_get_directory_sep()
 
-#else /* emacs */
+#define DEFAULT_DIRECTORY_FALLBACK ((const CIbyte *)"C:\\")
+
+#else /* not emacs */
 
 /* The above Lisp variables are not available to make-docfile, etc. */
 #define DIRECTORY_SEP DEFAULT_DIRECTORY_SEP
 
-#define DEFAULT_DIRECTORY_FALLBACK ((Ibyte *)"C:\\")
-
 #endif /* emacs */
 
 #else /* not WIN32_NATIVE */
@@ -499,7 +499,7 @@
 #define SEPCHAR ':'
 #define DEFAULT_DIRECTORY_SEP '/'
 #define DIRECTORY_SEP '/'
-#define DEFAULT_DIRECTORY_FALLBACK ((Ibyte *)"/")
+#define DEFAULT_DIRECTORY_FALLBACK ((const CIbyte *)"/")
 
 #endif /* WIN32_NATIVE */