changeset 897:7da79fbe37bb

[xemacs-hg @ 2002-07-02 19:09:22 by stephent] Omitted credit to ville. <873cv26jdv.fsf@tleepslib.sk.tsukuba.ac.jp> Fix up includes. <20020627160318.A30273@nemesis.ncsl.nist.gov> Untrigger assert. <20020627164659.A31430@nemesis.ncsl.nist.gov>
author stephent
date Tue, 02 Jul 2002 19:09:31 +0000
parents 04749aeb5414
children b0c24ea6a2a8
files CHANGES-beta lisp/ChangeLog lisp/behavior.el src/ChangeLog src/input-method-motif.c
diffstat 5 files changed, 15 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGES-beta	Tue Jul 02 16:05:01 2002 +0000
+++ b/CHANGES-beta	Tue Jul 02 19:09:31 2002 +0000
@@ -82,9 +82,8 @@
    bound-and-true-p, propertize, delete-and-extract-region, add-to-list,
    string-to-char-list, find-non-ascii-charset-region,
    find-non-ascii-charset-string, truncate-string-to-width, plist-to-alist,
-   kill-ring-max, kill-new
-   -- John Paul Wallington, youngs, ben, james
-   set-frame-pixel-width, set-frame-pixel-size -- andy
+   kill-ring-max, kill-new -- John Paul Wallington, youngs, ben, james, ville
+-- Add: set-frame-pixel-width, set-frame-pixel-size -- andy
 -- Add: args to map-specifier, various "heuristic" specifier functions -- ben
 -- Fix: call-process moves to Lisp -- ben
    -- allows a buffer to be specified for input and stderr output
--- a/lisp/ChangeLog	Tue Jul 02 16:05:01 2002 +0000
+++ b/lisp/ChangeLog	Tue Jul 02 19:09:31 2002 +0000
@@ -1,3 +1,8 @@
+2002-06-27  Olivier Galibert  <galibert@pobox.com>
+
+	* behavior.el (enabled-behavior-list): Sort the lists for the
+	assert comparison.
+
 2002-07-02  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.7 "broccoflower" is released.
--- a/lisp/behavior.el	Tue Jul 02 16:05:01 2002 +0000
+++ b/lisp/behavior.el	Tue Jul 02 19:09:31 2002 +0000
@@ -59,7 +59,8 @@
 		 (disable-behavior b t))
 	       (dolist (b enable-list)
 		 (enable-behavior b t))
-	       (assert (equal enabled-behavior-list val)))))
+	       (assert (equal (sort (copy-sequence enabled-behavior-list) 'string-lessp)
+			      (sort (copy-sequence val) 'string-lessp))))))
   :type '(repeat (symbol :tag "Behavior"))
   :group 'behaviors)
 
--- a/src/ChangeLog	Tue Jul 02 16:05:01 2002 +0000
+++ b/src/ChangeLog	Tue Jul 02 19:09:31 2002 +0000
@@ -1,3 +1,7 @@
+2002-06-27  Olivier Galibert  <galibert@pobox.com>
+
+	* input-method-motif.c: Fix the #includes.
+
 2002-07-02  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.7 "broccoflower" is released.
--- a/src/input-method-motif.c	Tue Jul 02 16:05:01 2002 +0000
+++ b/src/input-method-motif.c	Tue Jul 02 19:09:31 2002 +0000
@@ -26,7 +26,8 @@
 #include <config.h>
 #include <X11/Xlocale.h>        /* More portable than <locale.h> ? */
 #include "lisp.h"
-#include "console-x.h"
+#include "frame-impl.h"
+#include "console-x-impl.h"
 #include "device.h"
 #include "frame.h"
 #include "EmacsFrame.h"