changeset 1242:f0af455e89d9

[xemacs-hg @ 2003-01-31 12:02:30 by stephent] bogus C++ comments <87d6mdzgcq.fsf_-_@tleepslib.sk.tsukuba.ac.jp> macro syntax typo <878yx1zg9q.fsf_-_@tleepslib.sk.tsukuba.ac.jp> move Fprovide from syms_of to vars_of <874r7pzg0x.fsf_-_@tleepslib.sk.tsukuba.ac.jp>
author stephent
date Fri, 31 Jan 2003 12:02:38 +0000
parents 4c5e93b9ffa9
children 5063044cc37f
files src/ChangeLog src/alloc.c src/event-msw.c src/file-coding.c src/menubar-gtk.c src/nt.c src/toolbar-msw.c
diffstat 7 files changed, 38 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Thu Jan 30 22:52:32 2003 +0000
+++ b/src/ChangeLog	Fri Jan 31 12:02:38 2003 +0000
@@ -1,3 +1,25 @@
+2003-01-31  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* alloc.c (mark_object_maybe_checking_free): C macro syntax
+	requires paren to immediately follow definiendum.
+
+2003-01-30  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* file-coding.c (vars_of_file_coding): Fprovide here ...
+	(syms_of_file_coding): ... not here.  Dem's da rules.
+
+2003-01-23  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* toolbar-msw.c:
+	* menubar-gtk.c (menu_descriptor_to_widget_1):
+	* nt.c (mswindows_link):
+	* event-msw.c (output_alt_keyboard_state):
+	Change C++ style comments to C style.
+
+2003-01-09  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* config.h.in: Restore USE_XFONTSET.
+
 2003-01-22  Vin Shelton  <acs@xemacs.org>
 
 	* events.h: Change illegal (for C) // comment to /* */
--- a/src/alloc.c	Thu Jan 30 22:52:32 2003 +0000
+++ b/src/alloc.c	Fri Jan 31 12:02:38 2003 +0000
@@ -3149,7 +3149,7 @@
   mark_object (obj);
 }
 #else
-#define mark_object_maybe_checking_free (obj, allow_free) mark_object (obj)
+#define mark_object_maybe_checking_free(obj, allow_free) mark_object (obj)
 #endif /* ERROR_CHECK_GC */
 
 /* This function is called to mark the elements of an object. It processes
--- a/src/event-msw.c	Thu Jan 30 22:52:32 2003 +0000
+++ b/src/event-msw.c	Fri Jan 31 12:02:38 2003 +0000
@@ -2477,7 +2477,7 @@
 {
   BYTE keymap[256];
   SHORT keystate[3];
-  // SHORT asyncstate[3];
+  /* SHORT asyncstate[3]; */
 
   GetKeyboardState (keymap);
   keystate[0] = GetKeyState (VK_MENU);
@@ -2587,8 +2587,8 @@
 	  }
 
 	if (should_set_keymap)
-	  //	    && (message_ != WM_SYSKEYUP
-	  //	|| NILP (Vmenu_accelerator_enabled)))
+	  /*	    && (message_ != WM_SYSKEYUP	      */
+	  /*	|| NILP (Vmenu_accelerator_enabled))) */
 	  SetKeyboardState (keymap);
 
       }
--- a/src/file-coding.c	Thu Jan 30 22:52:32 2003 +0000
+++ b/src/file-coding.c	Fri Jan 31 12:02:38 2003 +0000
@@ -4608,14 +4608,6 @@
   DEFSYMBOL (Qgzip);
 #endif
 
-  /* WARNING: The existing categories are intimately tied to the function
-     `coding-system-category' in coding.el.  If you change a category, or
-     change the layout of any coding system associated with a category, you
-     need to check that function and make sure it's written properly. */
-
-#ifdef HAVE_DEFAULT_EOL_DETECTION
-  Fprovide (intern ("unix-default-eol-detection"));
-#endif
 }
 
 void
@@ -4764,6 +4756,15 @@
   /* We always have file-coding support */
   Fprovide (intern ("file-coding"));
 
+#ifdef HAVE_DEFAULT_EOL_DETECTION
+  /* WARNING: The existing categories are intimately tied to the function
+     `coding-system-category' in coding.el.  If you change a category, or
+     change the layout of any coding system associated with a category, you
+     need to check that function and make sure it's written properly. */
+
+  Fprovide (intern ("unix-default-eol-detection"));
+#endif
+
   DEFVAR_LISP ("keyboard-coding-system", &Vkeyboard_coding_system /*
 Coding system used for TTY keyboard input.
 Not used under a windowing system.
--- a/src/menubar-gtk.c	Thu Jan 30 22:52:32 2003 +0000
+++ b/src/menubar-gtk.c	Fri Jan 31 12:02:38 2003 +0000
@@ -869,7 +869,7 @@
 	    }
 	  else
 	    {
-	      // l->accel_string = "";
+	      /* l->accel_string = ""; */
 	    }
 	}
 
--- a/src/nt.c	Thu Jan 30 22:52:32 2003 +0000
+++ b/src/nt.c	Fri Jan 31 12:02:38 2003 +0000
@@ -1115,7 +1115,7 @@
 	    {
 	      /* Should try mapping GetLastError to errno; for now just
 		 indicate a general error (eg. links not supported).  */
-	      errno = EINVAL;  // perhaps EMLINK?
+	      errno = EINVAL;  /* perhaps EMLINK? */
 	    }
 	}
 
--- a/src/toolbar-msw.c	Thu Jan 30 22:52:32 2003 +0000
+++ b/src/toolbar-msw.c	Fri Jan 31 12:02:38 2003 +0000
@@ -45,7 +45,7 @@
 
 #include "console-msw-impl.h"
 #include "glyphs-msw.h"
-// #include "objects-msw.h"
+/* #include "objects-msw.h" */
 
 #define TOOLBAR_ITEM_ID_MIN 0x4000
 #define TOOLBAR_ITEM_ID_MAX 0x7FFF