(union Lisp_Object): Give a more precise type for `type'.

Remove unused `gu' alternative.

3 files changed, 36 insertions, 31 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5376d1bb2ba..bf4e852c494 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -13,8 +13,8 @@
 
         * calendar/calendar.el (calendar-holidays): Doc fix.
 
-        * calendar/cal-coptic.el (coptic-prompt-for-date): Use
-        assoc-string instead of assoc-ignore-case.
+        * calendar/cal-coptic.el (coptic-prompt-for-date):
+        Use assoc-string instead of assoc-ignore-case.
         * calendar/cal-french.el (calendar-goto-french-date): Ditto.
         * calendar/cal-hebrew.el (calendar-goto-hebrew-date)
         (mark-hebrew-diary-entries, list-yahrzeit-dates): Ditto.
@@ -28,8 +28,8 @@
 
 2004-02-18  Markus Rost  <rost@mathematik.uni-bielefeld.de>
 
-        * progmodes/executable.el (executable-command-find-posix-p):  Fix
-        choice of the directory.
+        * progmodes/executable.el (executable-command-find-posix-p):
+        Fix choice of the directory.
 
 2004-02-17  Luc Teirlinck  <teirllm@auburn.edu>
 
@@ -83,11 +83,11 @@
 
         * rmail-spam-filter.el: (vm-use-spam-filter)
         (rsf-min-region-length-added-to-spam-list): New variables.
-        (rsf-bbdb-auto-delete-spam-bbdb-entries): Renamed from
+        (rsf-bbdb-auto-delete-spam-bbdb-entries): Rename from
         rmail-bbdb-auto-delete-spam-entries.  Added cc: to recipients for
         spam testing.  Don't delete spam message if automatic deletion
         after output via variable rmail-delete-after-output is turned on.
-        (rsf-bbdb-dont-create-entries-for-deleted-messages): Renamed from
+        (rsf-bbdb-dont-create-entries-for-deleted-messages): Rename from
         rsf-bbdb-dont-create-entries-for-spam.
         (check-field): New function, extracted from code in
         rmail-spam-filter to ease addition of header fields like
@@ -97,11 +97,10 @@
         (rmail-spam-filter): Replace repeated test code for header fields
         by calls to check-field; change the call to
         rmail-output-to-rmail-file such that rmail-current-message stays
-        the same to avoid wrong deletion of unseen
-        flags.
+        the same to avoid wrong deletion of unseen flags.
         (rsf-add-contents-type): New function to convert old format
         of rmail-spam-definitions-alist into new one.
-        Changed prefixes of all variables and functions from
+        Change prefixes of all variables and functions from
         rmail-spam-filter- or spam-filter- or rmail-spam- to rsf-.
 
 2004-02-16  Eli Zaretskii  <eliz@elta.co.il>
@@ -125,8 +124,8 @@
 2004-02-16  Eli Zaretskii  <eliz@elta.co.il>
 
         * emacs-lisp/rx.el (rx-check, rx-check-any, rx-check-not)
-        (rx-repeat, rx-check-backref, rx-syntax, rx-to-string): Use
-        lower-case "rx" in all error message.
+        (rx-repeat, rx-check-backref, rx-syntax, rx-to-string):
+        Use lower-case "rx" in all error message.
 
 2004-02-16  Dave Love  <fx@gnu.org>
 
@@ -153,7 +152,7 @@
         * autorevert.el (auto-revert-active-p, auto-revert-list-diff)
         (auto-revert-dired-file-list, auto-revert-dired-changed-p)
         (auto-revert-handler, auto-revert-active-p): New functions.
-        (auto-revert-buffers): Moved revert logic to `auto-revert-handler'
+        (auto-revert-buffers): Move revert logic to `auto-revert-handler'
         and `auto-revert-active-p'.
         (eval-when-compile): Defvar dired-directory and vc-mode.
         (auto-revert-vc-cvs-file-version, auto-revert-vc-buffer-p)
@@ -216,7 +215,7 @@
 
 2004-02-14  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * Makefile.in: Fixed the CC Mode recompile kludge so it works
+        * Makefile.in: Fix the CC Mode recompile kludge so it works
         when building in a different directory.
 
 2004-02-13  Luc Teirlinck  <teirllm@auburn.edu>
@@ -225,6 +224,17 @@
 
 2004-02-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * diff.el: Don't use compile any more, use diff-mode instead.
+        (diff-regexp-alist, diff-old-file, diff-new-file)
+        (diff-parse-differences, diff-process-setup): Remove.
+        (diff-sentinel): New fun.
+        (diff): Use it.  Run the process ourselves.
+        Use diff-mode for the rest of the processing.
+
+        * diff.el (diff): Simplify code handling `switch'.
+
+2004-02-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
         * pcvs-defs.el (cvs-menu): Add `tag'.
 
 2004-02-11  Luc Teirlinck  <teirllm@auburn.edu>
diff --git a/src/ChangeLog b/src/ChangeLog
index 9d2a88c1dfe..508da2fe482 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lisp.h (union Lisp_Object): Give a more precise type for `type'.
+        Remove unused `gu' alternative.
+
 2004-02-19  Andreas Schwab  <schwab@suse.de>
 
         * fringe.c (Fdefine_fringe_bitmap): Use && instead of & to avoid
@@ -49,9 +54,9 @@
 
 2004-02-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-        * data.c (Fbyteorder): 
-        * fringe.c (Fdefine_fringe_bitmap): 
-        * xdisp.c (handle_single_display_prop): 
+        * data.c (Fbyteorder):
+        * fringe.c (Fdefine_fringe_bitmap):
+        * xdisp.c (handle_single_display_prop):
         * xselect.c (x_handle_dnd_message): Lisp_Object/int mixup.
 
 2004-02-16  Jason Rumney  <jasonr@gnu.org>
@@ -64,7 +69,7 @@
         controlling emulation of a three button mouse with option and
         command keys.
         (Qreverse, mac_get_enumlated_btn): Handle the emulation
-        (mac_event_to_emacs_modifiers, XTread_socket): Ditto
+        (mac_event_to_emacs_modifiers, XTread_socket): Ditto.
 
 2004-02-15  Kim F. Storm  <storm@cua.dk>
 
diff --git a/src/lisp.h b/src/lisp.h
index 6137182847f..c9eb714be18 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -178,18 +178,13 @@ union Lisp_Object
     struct
       {
         EMACS_INT val  : VALBITS;
-        EMACS_UINT type : GCTYPEBITS;
+        enum Lisp_Type type : GCTYPEBITS;
       } s;
     struct
       {
         EMACS_UINT val : VALBITS;
-        EMACS_UINT type : GCTYPEBITS;
+        enum Lisp_Type type : GCTYPEBITS;
       } u;
-    struct
-      {
-        EMACS_UINT val          : VALBITS;
-        enum Lisp_Type type     : GCTYPEBITS;
-      } gu;
   }
 Lisp_Object;
 
@@ -204,19 +199,14 @@ union Lisp_Object
 
     struct
       {
-        EMACS_UINT type : GCTYPEBITS;
+        enum Lisp_Type type : GCTYPEBITS;
         EMACS_INT val  : VALBITS;
       } s;
     struct
       {
-        EMACS_UINT type : GCTYPEBITS;
+        enum Lisp_Type type : GCTYPEBITS;
         EMACS_UINT val : VALBITS;
       } u;
-    struct
-      {
-        enum Lisp_Type type     : GCTYPEBITS;
-        EMACS_UINT val          : VALBITS;
-      } gu;
   }
 Lisp_Object;