Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 615-621)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 197-199)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-166

12 files changed, 166 insertions, 651 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 208084ff12a..7b1ba672583 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,46 @@
+2007-01-29  Chong Yidong  <cyd@stupidchicken.com>
+
+        * m/hp800.h: Restore, removing HP-UX support.
+
+2007-01-29  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * Makefile.in: Use a variable, XFT_LIBS, instead #define LIB_X11_LIB.
+
+2007-01-28  Richard Stallman  <rms@gnu.org>
+
+        * minibuf.c (Ftry_completion, Fall_completions)
+        (Fcompleting_read, Ftest_completion):
+        Rename arg ALIST or TABLE to COLLECTION.
+
+2007-01-27  Chong Yidong  <cyd@stupidchicken.com>
+
+        * unexhp9k800.c: Remove due to lack of legal papers.
+
+        * m/sr2k.h, m/hp800.h: Remove due to dependence on above.
+
+2007-01-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * keyboard.c (Fthis_command_keys, Fthis_command_keys_vector): Doc fix.
+
+        * minibuf.c (Fcompleting_read): Doc fix.
+
+2007-01-26  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (xg_initialize): Call XftInit if HAVE_XFT.
+
+        * Makefile.in: Use XFT_LIBS if defined.
+
+2007-01-26  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * alloc.c (BLOCK_INPUT_ALLOC, UNBLOCK_INPUT_ALLOC): Use
+        BLOCK_INPUT/UNBLOCK_INPUT.
+
+        * blockinput.h (interrupt_input_blocked): Declare volatile.
+
+        * keyboard.c (interrupt_input_blocked): Declare volatile.
+
+        * syssignal.h (SIGNAL_THREAD_CHECK): Use pthread_equal.
+
 2007-01-24  Kim F. Storm  <storm@cua.dk>
 
         * keymap.c (describe_map): Don't consider prefix keys to be shadowed.
diff --git a/src/Makefile.in b/src/Makefile.in
index 3e6d39246f6..95de3fbd61f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -408,6 +408,12 @@ LIBXT=$(LIBW)
 #define LIB_X11_LIB @XFT_LIBS@
 #endif /* HAVE_XFT */
 
+#if HAVE_XFT
+#undef LIB_X11_LIB /* XFT_LIBS includes -lX11 */
+#define LIB_X11_LIB
+XFT_LIBS=@XFT_LIBS@
+#endif /* HAVE_XFT */
+
 #if HAVE_XPM
 #ifndef LIBXPM
 #define LIBXPM -lXpm
@@ -452,7 +458,7 @@ LIBXT=$(LIBW)
 /* LD_SWITCH_X_DEFAULT comes after everything else that specifies
    options for where to find X libraries, but before those libraries.  */
 X11_LDFLAGS = LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT
-LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIBTIFF LIBJPEG LIBPNG LIBGIF LIBXPM LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM
+LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIBTIFF LIBJPEG LIBPNG LIBGIF LIBXPM LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM $(XFT_LIBS)
 #else /* not HAVE_X11 */
 LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM
 #endif /* not HAVE_X11 */
diff --git a/src/alloc.c b/src/alloc.c
index b6ad5545f34..c8a5a38e592 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -131,7 +131,7 @@ static pthread_mutex_t alloc_mutex;
   do                                                    \
     {                                                   \
       if (pthread_equal (pthread_self (), main_thread)) \
-        sigblock (sigmask (SIGIO));                     \
+        BLOCK_INPUT;                                    \
       pthread_mutex_lock (&alloc_mutex);                \
     }                                                   \
   while (0)
@@ -140,7 +140,7 @@ static pthread_mutex_t alloc_mutex;
     {                                                   \
       pthread_mutex_unlock (&alloc_mutex);              \
       if (pthread_equal (pthread_self (), main_thread)) \
-        sigunblock (sigmask (SIGIO));                   \
+        UNBLOCK_INPUT;                                  \
     }                                                   \
   while (0)
 
diff --git a/src/blockinput.h b/src/blockinput.h
index fcaa64723bc..468f0e0c762 100644
--- a/src/blockinput.h
+++ b/src/blockinput.h
@@ -49,7 +49,7 @@ Boston, MA 02110-1301, USA.  */
    interrupt_input_pending to a non-zero value.  If that flag is set
    when input becomes unblocked, UNBLOCK_INPUT will send a new SIGIO.  */
 
-extern int interrupt_input_blocked;
+extern volatile int interrupt_input_blocked;
 
 /* Nonzero means an input interrupt has arrived
    during the current critical section.  */
diff --git a/src/config.in b/src/config.in
index 7c94952463b..e4535b605cd 100644
--- a/src/config.in
+++ b/src/config.in
@@ -722,6 +722,9 @@ Boston, MA 02110-1301, USA.  */
 /* Define to 1 if you have the Xft library. */
 #undef HAVE_XFT
 
+/* Define to 1 if you have the Xft library. */
+#undef HAVE_XFT
+
 /* Define to 1 if XIM is available */
 #undef HAVE_XIM
 
diff --git a/src/gtkutil.c b/src/gtkutil.c
index dc81f016509..fe1eb6cdfdb 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -3937,6 +3937,11 @@ xg_initialize ()
 {
   GtkBindingSet *binding_set;
 
+#if HAVE_XFT
+  /* Work around a bug with corrupted data if libXft gets unloaded.  This way
+     we keep it permanently linked in.  */
+  XftInit (0);
+#endif
   xg_ignore_gtk_scrollbar = 0;
   xg_detached_menus = 0;
   xg_menu_cb_list.prev = xg_menu_cb_list.next =
diff --git a/src/keyboard.c b/src/keyboard.c
index 572b3096c06..c7d25088313 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -90,7 +90,7 @@ extern int errno;
 /* Variables for blockinput.h: */
 
 /* Non-zero if interrupt input is blocked right now.  */
-int interrupt_input_blocked;
+volatile int interrupt_input_blocked;
 
 /* Nonzero means an input interrupt has arrived
    during the current critical section.  */
@@ -10296,7 +10296,9 @@ DEFUN ("this-command-keys", Fthis_command_keys, Sthis_command_keys, 0, 0, 0,
        doc: /* Return the key sequence that invoked this command.
 However, if the command has called `read-key-sequence', it returns
 the last key sequence that has been read.
-The value is a string or a vector.  */)
+The value is a string or a vector.
+
+See also `this-command-keys-vector'.  */)
      ()
 {
   return make_event_array (this_command_key_count,
@@ -10306,7 +10308,9 @@ The value is a string or a vector.  */)
 DEFUN ("this-command-keys-vector", Fthis_command_keys_vector, Sthis_command_keys_vector, 0, 0, 0,
        doc: /* Return the key sequence that invoked this command, as a vector.
 However, if the command has called `read-key-sequence', it returns
-the last key sequence that has been read.  */)
+the last key sequence that has been read.
+
+See also `this-command-keys'.  */)
      ()
 {
   return Fvector (this_command_key_count,
diff --git a/src/m/hp800.h b/src/m/hp800.h
index f48f4c8152e..eed53183569 100644
--- a/src/m/hp800.h
+++ b/src/m/hp800.h
@@ -69,9 +69,10 @@ Boston, MA 02110-1301, USA.  */
 #define XSET(var, type, ptr) \
    ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS))
 
-/* Common definitions for HPUX and GNU/Linux.  */
+/* Definitions for GNU/Linux.  (HP/UX is unsupported because of the
+   removal of unexhp9k800.c due to lack of legal papers.)  */
 
-#if defined (__hpux) || defined (GNU_LINUX)
+#ifdef GNU_LINUX
 /* Now define a symbol for the cpu type, if your compiler
    does not define it automatically:
    Ones defined so far include vax, m68000, ns16000, pyramid,
@@ -93,12 +94,6 @@ Boston, MA 02110-1301, USA.  */
 
 #define NO_REMAP
 
-#endif /* __hpux or GNU_LINUX */
-
-/* Stuff for just GNU/Linux.  */
-
-#ifdef GNU_LINUX
-
 /* Data type of load average, as read out of kmem.  */
 
 #define LOAD_AVE_TYPE long
@@ -109,72 +104,6 @@ Boston, MA 02110-1301, USA.  */
 
 #endif /* GNU_LINUX */
 
-/* Stuff for just HPUX.  */
-
-#ifdef __hpux
-
-/* Define VIRT_ADDR_VARIES if the virtual addresses of
-   pure and impure space as loaded can vary, and even their
-   relative order cannot be relied on.
-
-   Otherwise Emacs assumes that text space precedes data space,
-   numerically.  */
-
-#define VIRT_ADDR_VARIES
-
-/* the data segment on this machine always starts at address 0x40000000. */
-
-#define DATA_SEG_BITS 0x40000000
-
-#define DATA_START    0x40000000
-#define TEXT_START    0x00000000
-
-/* This machine requires completely different unexec code
-   which lives in a separate file.  Specify the file name.  */
-
-#define UNEXEC unexhp9k800.o
-
-#define LIBS_MACHINE
-#define LIBS_DEBUG
-
-/* Include the file bsdtty.h, since this machine has job control.  */
-#define NEED_BSDTTY
-
-/* Data type of load average, as read out of kmem.  */
-
-#define LOAD_AVE_TYPE double
-
-/* Convert that into an integer that is 100 for a load average of 1.0  */
-
-#define LOAD_AVE_CVT(x) ((int) (x * 100.0))
-
-/* The symbol in the kernel where the load average is found
-   is named _avenrun.  At this time there are two major flavors
-   of hp-ux (there is the s800 and s300 (s200) flavors).  The
-   differences are thusly moved to the corresponding machine description file.
-*/
-
-/* no underscore please */
-#define LDAV_SYMBOL "avenrun"
-
-#if 0   /* Supposedly no longer true.  */
-/* In hpux, for unknown reasons, S_IFLNK is defined even though
-   symbolic links do not exist.
-   Make sure our conditionals based on S_IFLNK are not confused.
-
-   Here we assume that stat.h is included before config.h
-   so that we can override it here.  */
-
-#undef S_IFLNK
-#endif
-
-/* On USG systems these have different names. */
-
-#define index strchr
-#define rindex strrchr
-
-#endif /* __hpux */
-
 /* Systems with GCC don't need to lose. */
 #ifdef __NetBSD__
 # ifdef __GNUC__
diff --git a/src/m/sr2k.h b/src/m/sr2k.h
deleted file mode 100644
index 2342bf8ef20..00000000000
--- a/src/m/sr2k.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/* machine description file for Hitachi SR2001/SR2201 machines.
-   Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs 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.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-
-
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="hpux"  */
-
-/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
-   is the most significant byte.  */
-
-#define WORDS_BIG_ENDIAN
-
-/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
- * group of arguments and treat it as an array of the arguments.  */
-
-#define NO_ARG_ARRAY
-
-/* Define WORD_MACHINE if addresses and such have
- * to be corrected before they can be used as byte counts.  */
-
-#undef WORD_MACHINE
-
-/* Now define a symbol for the cpu type, if your compiler
-   does not define it automatically:
-   Ones defined so far include vax, m68000, ns16000, pyramid,
-   orion, tahoe, APOLLO and many others */
-#ifndef hp9000s800
-#       define hp9000s800
-#endif
-
-/* Use type int rather than a union, to represent Lisp_Object */
-/* This is desirable for most machines.  */
-
-#define NO_UNION_TYPE
-
-/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-   the bit field into an int.  In other words, if bit fields
-   are always unsigned.
-
-   If you use NO_UNION_TYPE, this flag does not matter.  */
-
-#define EXPLICIT_SIGN_EXTEND
-
-/* The standard definitions of these macros would work ok,
-   but these are faster because the constants are short. */
-
-
-#define XUINT(a) (((unsigned)(a) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS)
-
-#define XSET(var, type, ptr) \
-   ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS))
-
-/* #ifdef __hpux */
-/* Now define a symbol for the cpu type, if your compiler
-   does not define it automatically:
-   Ones defined so far include vax, m68000, ns16000, pyramid,
-   orion, tahoe, APOLLO and many others */
-
-#ifndef hp9000s800
-#     define hp9000s800
-#endif
-
-
-/* Data type of load average, as read out of kmem.  */
-
-#define LOAD_AVE_TYPE double
-
-/* Convert that into an integer that is 100 for a load average of 1.0  */
-
-#define LOAD_AVE_CVT(x) ((int) (x * 100.0))
-
-
-/* Define CANNOT_DUMP on machines where unexec does not work.
-   Then the function dump-emacs will not be defined
-   and temacs will do (load "loadup") automatically unless told otherwise.  */
-
-#undef CANNOT_DUMP
-
-/* Define VIRT_ADDR_VARIES if the virtual addresses of
-   pure and impure space as loaded can vary, and even their
-   relative order cannot be relied on.
-
-   Otherwise Emacs assumes that text space precedes data space,
-   numerically.  */
-
-#define VIRT_ADDR_VARIES
-
-/* the data segment on this machine always starts at address 0x40000000. */
-
-#define DATA_SEG_BITS 0x40000000
-
-#define DATA_START    0x40000000
-#define TEXT_START    0x00000000
-
-/* Define NO_REMAP if memory segmentation makes it not work well
-   to change the boundary between the text section and data section
-   when Emacs is dumped.  If you define this, the preloaded Lisp
-   code will not be sharable; but that's better than failing completely.  */
-
-#define NO_REMAP
-
-/* This machine requires completely different unexec code
-   which lives in a separate file.  Specify the file name.  */
-
-#define UNEXEC unexhp9k800.o
-
-#define LIBS_MACHINE
-#define LIBS_DEBUG
-
-/* Include the file bsdtty.h, since this machine has job control.  */
-/* #define NEED_BSDTTY */
-
-/* The symbol in the kernel where the load average is found
-   is named _avenrun.  At this time there are two major flavors
-   of hp-ux (there is the s800 and s300 (s200) flavors).  The
-   differences are thusly moved to the corresponding machine description file.
-*/
-
-/* no underscore please */
-#define LDAV_SYMBOL "avenrun"
-
-#if 0   /* Supposedly no longer true.  */
-/* In hpux, for unknown reasons, S_IFLNK is defined even though
-   symbolic links do not exist.
-   Make sure our conditionals based on S_IFLNK are not confused.
-
-   Here we assume that stat.h is included before config.h
-   so that we can override it here.  */
-
-#undef S_IFLNK
-#endif
-
-/* On USG systems these have different names. */
-
-#define index strchr
-#define rindex strrchr
-
-/* #endif */
-
-/* arch-tag: 4ced5b51-ffe6-4be1-9954-eb40657023a5
-   (do not change this comment) */
diff --git a/src/minibuf.c b/src/minibuf.c
index 58bcf1ef1a4..874d3f24e0a 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1230,22 +1230,25 @@ minibuf_conform_representation (string, basis)
 }
 
 DEFUN ("try-completion", Ftry_completion, Stry_completion, 2, 3, 0,
-       doc: /* Return common substring of all completions of STRING in ALIST.
-Each car of each element of ALIST (or each element if it is not a cons cell)
-is tested to see if it begins with STRING.  The possible matches may be
+       doc: /* Return common substring of all completions of STRING in COLLECTION.
+Test each possible completion specified by COLLECTION
+to see if it begins with STRING.  The possible completions may be
 strings or symbols.  Symbols are converted to strings before testing,
 see `symbol-name'.
-All that match are compared together; the longest initial sequence
-common to all matches is returned as a string.
-If there is no match at all, nil is returned.
-For a unique match which is exact, t is returned.
-
-If ALIST is a hash-table, all the string and symbol keys are the
-possible matches.
-If ALIST is an obarray, the names of all symbols in the obarray
-are the possible matches.
-
-ALIST can also be a function to do the completion itself.
+All that match STRING are compared together; the longest initial sequence
+common to all these matches is the return value.
+If there is no match at all, the return value is nil.
+For a unique match which is exact, the return value is t.
+
+If COLLECTION is an alist, the keys (cars of elements) are the
+possible completions.  If an element is not a cons cell, then the
+element itself is the possible completion.
+If COLLECTION is a hash-table, all the keys that are strings or symbols
+are the possible completions.
+If COLLECTION is an obarray, the names of all symbols in the obarray
+are the possible completions.
+
+COLLECTION can also be a function to do the completion itself.
 It receives three arguments: the values STRING, PREDICATE and nil.
 Whatever it returns becomes the value of `try-completion'.
 
@@ -1253,23 +1256,23 @@ If optional third argument PREDICATE is non-nil,
 it is used to test each possible match.
 The match is a candidate only if PREDICATE returns non-nil.
 The argument given to PREDICATE is the alist element
-or the symbol from the obarray.  If ALIST is a hash-table,
+or the symbol from the obarray.  If COLLECTION is a hash-table,
 predicate is called with two arguments: the key and the value.
 Additionally to this predicate, `completion-regexp-list'
 is used to further constrain the set of candidates.  */)
-     (string, alist, predicate)
-     Lisp_Object string, alist, predicate;
+     (string, collection, predicate)
+     Lisp_Object string, collection, predicate;
 {
   Lisp_Object bestmatch, tail, elt, eltstring;
   /* Size in bytes of BESTMATCH.  */
   int bestmatchsize = 0;
   /* These are in bytes, too.  */
   int compare, matchsize;
-  int type = (HASH_TABLE_P (alist) ? 3
-              : VECTORP (alist) ? 2
-              : NILP (alist) || (CONSP (alist)
-                                 && (!SYMBOLP (XCAR (alist))
-                                     || NILP (XCAR (alist)))));
+  int type = (HASH_TABLE_P (collection) ? 3
+              : VECTORP (collection) ? 2
+              : NILP (collection) || (CONSP (collection)
+                                      && (!SYMBOLP (XCAR (collection))
+                                          || NILP (XCAR (collection)))));
   int index = 0, obsize = 0;
   int matchcount = 0;
   int bindcount = -1;
@@ -1278,18 +1281,18 @@ is used to further constrain the set of candidates.  */)
 
   CHECK_STRING (string);
   if (type == 0)
-    return call3 (alist, string, predicate, Qnil);
+    return call3 (collection, string, predicate, Qnil);
 
   bestmatch = bucket = Qnil;
   zero = make_number (0);
 
-  /* If ALIST is not a list, set TAIL just for gc pro.  */
-  tail = alist;
+  /* If COLLECTION is not a list, set TAIL just for gc pro.  */
+  tail = collection;
   if (type == 2)
     {
-      alist = check_obarray (alist);
-      obsize = XVECTOR (alist)->size;
-      bucket = XVECTOR (alist)->contents[index];
+      collection = check_obarray (collection);
+      obsize = XVECTOR (collection)->size;
+      bucket = XVECTOR (collection)->contents[index];
     }
 
   while (1)
@@ -1324,19 +1327,19 @@ is used to further constrain the set of candidates.  */)
             break;
           else
             {
-              bucket = XVECTOR (alist)->contents[index];
+              bucket = XVECTOR (collection)->contents[index];
               continue;
             }
         }
       else /* if (type == 3) */
         {
-          while (index < HASH_TABLE_SIZE (XHASH_TABLE (alist))
-                 && NILP (HASH_HASH (XHASH_TABLE (alist), index)))
+          while (index < HASH_TABLE_SIZE (XHASH_TABLE (collection))
+                 && NILP (HASH_HASH (XHASH_TABLE (collection), index)))
             index++;
-          if (index >= HASH_TABLE_SIZE (XHASH_TABLE (alist)))
+          if (index >= HASH_TABLE_SIZE (XHASH_TABLE (collection)))
             break;
           else
-            elt = eltstring = HASH_KEY (XHASH_TABLE (alist), index++);
+            elt = eltstring = HASH_KEY (XHASH_TABLE (collection), index++);
         }
 
       /* Is this element a possible completion? */
@@ -1389,7 +1392,7 @@ is used to further constrain the set of candidates.  */)
                   GCPRO4 (tail, string, eltstring, bestmatch);
                   tem = type == 3
                     ? call2 (predicate, elt,
-                             HASH_VALUE (XHASH_TABLE (alist), index - 1))
+                             HASH_VALUE (XHASH_TABLE (collection), index - 1))
                     : call1 (predicate, elt);
                   UNGCPRO;
                 }
@@ -1498,19 +1501,22 @@ is used to further constrain the set of candidates.  */)
 }
 
 DEFUN ("all-completions", Fall_completions, Sall_completions, 2, 4, 0,
-       doc: /* Search for partial matches to STRING in ALIST.
-Each car of each element of ALIST (or each element if it is not a cons cell)
-is tested to see if it begins with STRING.  The possible matches may be
+       doc: /* Search for partial matches to STRING in COLLECTION.
+Test each of the possible completions specified by COLLECTION
+to see if it begins with STRING.  The possible completions may be
 strings or symbols.  Symbols are converted to strings before testing,
 see `symbol-name'.
-The value is a list of all the strings from ALIST that match.
+The value is a list of all the possible completions that match STRING.
 
-If ALIST is a hash-table, all the string and symbol keys are the
-possible matches.
-If ALIST is an obarray, the names of all symbols in the obarray
-are the possible matches.
+If COLLECTION is an alist, the keys (cars of elements) are the
+possible completions.  If an element is not a cons cell, then the
+element itself is the possible completion.
+If COLLECTION is a hash-table, all the keys that are strings or symbols
+are the possible completions.
+If COLLECTION is an obarray, the names of all symbols in the obarray
+are the possible completions.
 
-ALIST can also be a function to do the completion itself.
+COLLECTION can also be a function to do the completion itself.
 It receives three arguments: the values STRING, PREDICATE and t.
 Whatever it returns becomes the value of `all-completions'.
 
@@ -1518,24 +1524,24 @@ If optional third argument PREDICATE is non-nil,
 it is used to test each possible match.
 The match is a candidate only if PREDICATE returns non-nil.
 The argument given to PREDICATE is the alist element
-or the symbol from the obarray.  If ALIST is a hash-table,
+or the symbol from the obarray.  If COLLECTION is a hash-table,
 predicate is called with two arguments: the key and the value.
 Additionally to this predicate, `completion-regexp-list'
 is used to further constrain the set of candidates.
 
 If the optional fourth argument HIDE-SPACES is non-nil,
-strings in ALIST that start with a space
+strings in COLLECTION that start with a space
 are ignored unless STRING itself starts with a space.  */)
-     (string, alist, predicate, hide_spaces)
-     Lisp_Object string, alist, predicate, hide_spaces;
+     (string, collection, predicate, hide_spaces)
+     Lisp_Object string, collection, predicate, hide_spaces;
 {
   Lisp_Object tail, elt, eltstring;
   Lisp_Object allmatches;
-  int type = HASH_TABLE_P (alist) ? 3
-    : VECTORP (alist) ? 2
-    : NILP (alist) || (CONSP (alist)
-                       && (!SYMBOLP (XCAR (alist))
-                           || NILP (XCAR (alist))));
+  int type = HASH_TABLE_P (collection) ? 3
+    : VECTORP (collection) ? 2
+    : NILP (collection) || (CONSP (collection)
+                            && (!SYMBOLP (XCAR (collection))
+                                || NILP (XCAR (collection))));
   int index = 0, obsize = 0;
   int bindcount = -1;
   Lisp_Object bucket, tem, zero;
@@ -1543,16 +1549,16 @@ are ignored unless STRING itself starts with a space.  */)
 
   CHECK_STRING (string);
   if (type == 0)
-    return call3 (alist, string, predicate, Qt);
+    return call3 (collection, string, predicate, Qt);
   allmatches = bucket = Qnil;
   zero = make_number (0);
 
-  /* If ALIST is not a list, set TAIL just for gc pro.  */
-  tail = alist;
+  /* If COLLECTION is not a list, set TAIL just for gc pro.  */
+  tail = collection;
   if (type == 2)
     {
-      obsize = XVECTOR (alist)->size;
-      bucket = XVECTOR (alist)->contents[index];
+      obsize = XVECTOR (collection)->size;
+      bucket = XVECTOR (collection)->contents[index];
     }
 
   while (1)
@@ -1585,19 +1591,19 @@ are ignored unless STRING itself starts with a space.  */)
             break;
           else
             {
-              bucket = XVECTOR (alist)->contents[index];
+              bucket = XVECTOR (collection)->contents[index];
               continue;
             }
         }
       else /* if (type == 3) */
         {
-          while (index < HASH_TABLE_SIZE (XHASH_TABLE (alist))
-                 && NILP (HASH_HASH (XHASH_TABLE (alist), index)))
+          while (index < HASH_TABLE_SIZE (XHASH_TABLE (collection))
+                 && NILP (HASH_HASH (XHASH_TABLE (collection), index)))
             index++;
-          if (index >= HASH_TABLE_SIZE (XHASH_TABLE (alist)))
+          if (index >= HASH_TABLE_SIZE (XHASH_TABLE (collection)))
             break;
           else
-            elt = eltstring = HASH_KEY (XHASH_TABLE (alist), index++);
+            elt = eltstring = HASH_KEY (XHASH_TABLE (collection), index++);
         }
 
       /* Is this element a possible completion? */
@@ -1659,7 +1665,7 @@ are ignored unless STRING itself starts with a space.  */)
                   GCPRO4 (tail, eltstring, allmatches, string);
                   tem = type == 3
                     ? call2 (predicate, elt,
-                             HASH_VALUE (XHASH_TABLE (alist), index - 1))
+                             HASH_VALUE (XHASH_TABLE (collection), index - 1))
                     : call1 (predicate, elt);
                   UNGCPRO;
                 }
@@ -1686,14 +1692,14 @@ Lisp_Object Vminibuffer_completing_file_name;
 DEFUN ("completing-read", Fcompleting_read, Scompleting_read, 2, 8, 0,
        doc: /* Read a string in the minibuffer, with completion.
 PROMPT is a string to prompt with; normally it ends in a colon and a space.
-TABLE can be a list of strings, an alist, an obarray or a hash table.
-TABLE can also be a function to do the completion itself.
-PREDICATE limits completion to a subset of TABLE.
+COLLECTION can be a list of strings, an alist, an obarray or a hash table.
+COLLECTION can also be a function to do the completion itself.
+PREDICATE limits completion to a subset of COLLECTION.
 See `try-completion' and `all-completions' for more details
- on completion, TABLE, and PREDICATE.
+ on completion, COLLECTION, and PREDICATE.
 
 If REQUIRE-MATCH is non-nil, the user is not allowed to exit unless
- the input is (or completes to) an element of TABLE or is null.
+ the input is (or completes to) an element of COLLECTION or is null.
  If it is also not t, typing RET does not exit if it does non-null completion.
 If the input is null, `completing-read' returns DEF, or an empty string
  if DEF is nil, regardless of the value of REQUIRE-MATCH.
@@ -1727,8 +1733,8 @@ If INHERIT-INPUT-METHOD is non-nil, the minibuffer inherits
 
 Completion ignores case if the ambient value of
   `completion-ignore-case' is non-nil.  */)
-     (prompt, table, predicate, require_match, initial_input, hist, def, inherit_input_method)
-     Lisp_Object prompt, table, predicate, require_match, initial_input;
+     (prompt, collection, predicate, require_match, initial_input, hist, def, inherit_input_method)
+     Lisp_Object prompt, collection, predicate, require_match, initial_input;
      Lisp_Object hist, def, inherit_input_method;
 {
   Lisp_Object val, histvar, histpos, position;
@@ -1740,7 +1746,7 @@ Completion ignores case if the ambient value of
   init = initial_input;
   GCPRO1 (def);
 
-  specbind (Qminibuffer_completion_table, table);
+  specbind (Qminibuffer_completion_table, collection);
   specbind (Qminibuffer_completion_predicate, predicate);
   specbind (Qminibuffer_completion_confirm,
             EQ (require_match, Qt) ? Qnil : require_match);
@@ -1802,27 +1808,28 @@ Lisp_Object Fassoc_string ();
 DEFUN ("test-completion", Ftest_completion, Stest_completion, 2, 3, 0,
        doc: /* Return non-nil if STRING is a valid completion.
 Takes the same arguments as `all-completions' and `try-completion'.
-If ALIST is a function, it is called with three arguments:
+If COLLECTION is a function, it is called with three arguments:
 the values STRING, PREDICATE and `lambda'.  */)
-       (string, alist, predicate)
-     Lisp_Object string, alist, predicate;
+       (string, collection, predicate)
+     Lisp_Object string, collection, predicate;
 {
   Lisp_Object regexps, tail, tem = Qnil;
   int i = 0;
 
   CHECK_STRING (string);
 
-  if ((CONSP (alist) && (!SYMBOLP (XCAR (alist)) || NILP (XCAR (alist))))
-      || NILP (alist))
+  if ((CONSP (collection)
+       && (!SYMBOLP (XCAR (collection)) || NILP (XCAR (collection))))
+      || NILP (collection))
     {
-      tem = Fassoc_string (string, alist, completion_ignore_case ? Qt : Qnil);
+      tem = Fassoc_string (string, collection, completion_ignore_case ? Qt : Qnil);
       if (NILP (tem))
         return Qnil;
     }
-  else if (VECTORP (alist))
+  else if (VECTORP (collection))
     {
       /* Bypass intern-soft as that loses for nil.  */
-      tem = oblookup (alist,
+      tem = oblookup (collection,
                       SDATA (string),
                       SCHARS (string),
                       SBYTES (string));
@@ -1833,7 +1840,7 @@ the values STRING, PREDICATE and `lambda'.  */)
           else
             string = Fstring_make_multibyte (string);
 
-          tem = oblookup (alist,
+          tem = oblookup (collection,
                           SDATA (string),
                           SCHARS (string),
                           SBYTES (string));
@@ -1841,9 +1848,9 @@ the values STRING, PREDICATE and `lambda'.  */)
 
       if (completion_ignore_case && !SYMBOLP (tem))
         {
-          for (i = XVECTOR (alist)->size - 1; i >= 0; i--)
+          for (i = XVECTOR (collection)->size - 1; i >= 0; i--)
             {
-              tail = XVECTOR (alist)->contents[i];
+              tail = XVECTOR (collection)->contents[i];
               if (SYMBOLP (tail))
                 while (1)
                   {
@@ -1865,9 +1872,9 @@ the values STRING, PREDICATE and `lambda'.  */)
       if (!SYMBOLP (tem))
         return Qnil;
     }
-  else if (HASH_TABLE_P (alist))
+  else if (HASH_TABLE_P (collection))
     {
-      struct Lisp_Hash_Table *h = XHASH_TABLE (alist);
+      struct Lisp_Hash_Table *h = XHASH_TABLE (collection);
       i = hash_lookup (h, string, NULL);
       if (i >= 0)
         tem = HASH_KEY (h, i);
@@ -1886,7 +1893,7 @@ the values STRING, PREDICATE and `lambda'.  */)
         return Qnil;
     }
   else
-    return call3 (alist, string, predicate, Qlambda);
+    return call3 (collection, string, predicate, Qlambda);
 
   /* Reject this element if it fails to match all the regexps.  */
   if (CONSP (Vcompletion_regexp_list))
@@ -1907,8 +1914,8 @@ the values STRING, PREDICATE and `lambda'.  */)
   /* Finally, check the predicate.  */
   if (!NILP (predicate))
     {
-      return HASH_TABLE_P (alist)
-        ? call2 (predicate, tem, HASH_VALUE (XHASH_TABLE (alist), i))
+      return HASH_TABLE_P (collection)
+        ? call2 (predicate, tem, HASH_VALUE (XHASH_TABLE (collection), i))
         : call1 (predicate, tem);
     }
   else
diff --git a/src/syssignal.h b/src/syssignal.h
index a4e3fcb3e1b..36292670bc6 100644
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -210,7 +210,7 @@ char *strsignal ();
 #ifdef HAVE_GTK_AND_PTHREAD
 #define SIGNAL_THREAD_CHECK(signo)                                      \
   do {                                                                  \
-    if (pthread_self () != main_thread)                                 \
+    if (!pthread_equal (pthread_self (), main_thread))                  \
       {                                                                 \
         /* POSIX says any thread can receive the signal.  On GNU/Linux  \
            that is not true, but for other systems (FreeBSD at least)   \
diff --git a/src/unexhp9k800.c b/src/unexhp9k800.c
deleted file mode 100644
index 146cc5707da..00000000000
--- a/src/unexhp9k800.c
+++ /dev/null
@@ -1,322 +0,0 @@
-/* Unexec for HP 9000 Series 800 machines.
-   Bob Desinger <hpsemc!bd@hplabs.hp.com>
-
-   Note that the GNU project considers support for HP operation a
-   peripheral activity which should not be allowed to divert effort
-   from development of the GNU system.  Changes in this code will be
-   installed when users send them in, but aside from that we don't
-   plan to think about it, or about whether other Emacs maintenance
-   might break it.
-
-
-  Unexec creates a copy of the old a.out file, and replaces the old data
-  area with the current data area.  When the new file is executed, the
-  process will see the same data structures and data values that the
-  original process had when unexec was called.
-
-  Unlike other versions of unexec, this one copies symbol table and
-  debug information to the new a.out file.  Thus, the new a.out file
-  may be debugged with symbolic debuggers.
-
-  If you fix any bugs in this, I'd like to incorporate your fixes.
-  Send them to uunet!hpda!hpsemc!jmorris or jmorris%hpsemc@hplabs.HP.COM.
-
-  CAVEATS:
-  This routine saves the current value of all static and external
-  variables.  This means that any data structure that needs to be
-  initialized must be explicitly reset.  Variables will not have their
-  expected default values.
-
-  Unfortunately, the HP-UX signal handler has internal initialization
-  flags which are not explicitly reset.  Thus, for signals to work in
-  conjunction with this routine, the following code must executed when
-  the new process starts up.
-
-  void _sigreturn ();
-  ...
-  sigsetreturn (_sigreturn);
-*/
-
-#ifdef emacs
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#include <a.out.h>
-
-#ifdef HPUX_USE_SHLIBS
-#include <dl.h>
-#endif
-
-/* brk value to restore, stored as a global.
-   This is really used only if we used shared libraries.  */
-static long brk_on_dump = 0;
-
-/* Called from main, if we use shared libraries.  */
-int
-run_time_remap (ignored)
-     char *ignored;
-{
-  brk ((char *) brk_on_dump);
-}
-
-#undef roundup
-#define roundup(x,n) (((x) + ((n) - 1)) & ~((n) - 1))  /* n is power of 2 */
-#define min(x,y)  (((x) < (y)) ? (x) : (y))
-
-
-/* Create a new a.out file, same as old but with current data space */
-
-unexec (new_name, old_name, new_end_of_text, dummy1, dummy2)
-     char new_name[];           /* name of the new a.out file to be created */
-     char old_name[];           /* name of the old a.out file */
-     char *new_end_of_text;     /* ptr to new edata/etext; NOT USED YET */
-     int dummy1, dummy2;        /* not used by emacs */
-{
-  int old, new;
-  int old_size, new_size;
-  struct header hdr;
-  struct som_exec_auxhdr auxhdr;
-  long i;
-
-  /* For the greatest flexibility, should create a temporary file in
-     the same directory as the new file.  When everything is complete,
-     rename the temp file to the new name.
-     This way, a program could update its own a.out file even while
-     it is still executing.  If problems occur, everything is still
-     intact.  NOT implemented.  */
-
-  /* Open the input and output a.out files */
-  old = open (old_name, O_RDONLY);
-  if (old < 0)
-    { perror (old_name); exit (1); }
-  new = open (new_name, O_CREAT|O_RDWR|O_TRUNC, 0777);
-  if (new < 0)
-    { perror (new_name); exit (1); }
-
-  /* Read the old headers */
-  read_header (old, &hdr, &auxhdr);
-
-  brk_on_dump = (long) sbrk (0);
-
-  /* Decide how large the new and old data areas are */
-  old_size = auxhdr.exec_dsize;
-  /* I suspect these two statements are separate
-     to avoid a compiler bug in hpux version 8.  */
-  i = (long) sbrk (0);
-  new_size = i - auxhdr.exec_dmem;
-
-  /* Copy the old file to the new, up to the data space */
-  lseek (old, 0, 0);
-  copy_file (old, new, auxhdr.exec_dfile);
-
-  /* Skip the old data segment and write a new one */
-  lseek (old, old_size, 1);
-  save_data_space (new, &hdr, &auxhdr, new_size);
-
-  /* Copy the rest of the file */
-  copy_rest (old, new);
-
-  /* Update file pointers since we probably changed size of data area */
-  update_file_ptrs (new, &hdr, &auxhdr, auxhdr.exec_dfile, new_size-old_size);
-
-  /* Save the modified header */
-  write_header (new, &hdr, &auxhdr);
-
-  /* Close the binary file */
-  close (old);
-  close (new);
-  return 0;
-}
-
-/* Save current data space in the file, update header.  */
-
-save_data_space (file, hdr, auxhdr, size)
-     int file;
-     struct header *hdr;
-     struct som_exec_auxhdr *auxhdr;
-     int size;
-{
-  /* Write the entire data space out to the file */
-  if (write (file, auxhdr->exec_dmem, size) != size)
-    { perror ("Can't save new data space"); exit (1); }
-
-  /* Update the header to reflect the new data size */
-  auxhdr->exec_dsize = size;
-  auxhdr->exec_bsize = 0;
-}
-
-/* Update the values of file pointers when something is inserted.  */
-
-update_file_ptrs (file, hdr, auxhdr, location, offset)
-     int file;
-     struct header *hdr;
-     struct som_exec_auxhdr *auxhdr;
-     unsigned int location;
-     int offset;
-{
-  struct subspace_dictionary_record subspace;
-  int i;
-
-  /* Increase the overall size of the module */
-  hdr->som_length += offset;
-
-  /* Update the various file pointers in the header */
-#define update(ptr) if (ptr > location) ptr = ptr + offset
-  update (hdr->aux_header_location);
-  update (hdr->space_strings_location);
-  update (hdr->init_array_location);
-  update (hdr->compiler_location);
-  update (hdr->symbol_location);
-  update (hdr->fixup_request_location);
-  update (hdr->symbol_strings_location);
-  update (hdr->unloadable_sp_location);
-  update (auxhdr->exec_tfile);
-  update (auxhdr->exec_dfile);
-
-  /* Do for each subspace dictionary entry */
-  lseek (file, hdr->subspace_location, 0);
-  for (i = 0; i < hdr->subspace_total; i++)
-    {
-      if (read (file, &subspace, sizeof (subspace)) != sizeof (subspace))
-        { perror ("Can't read subspace record"); exit (1); }
-
-      /* If subspace has a file location, update it */
-      if (subspace.initialization_length > 0
-          && subspace.file_loc_init_value > location)
-        {
-          subspace.file_loc_init_value += offset;
-          lseek (file, -sizeof (subspace), 1);
-          if (write (file, &subspace, sizeof (subspace)) != sizeof (subspace))
-            { perror ("Can't update subspace record"); exit (1); }
-        }
-    }
-
-  /* Do for each initialization pointer record */
-  /* (I don't think it applies to executable files, only relocatables) */
-#undef update
-}
-
-/* Read in the header records from an a.out file.  */
-
-read_header (file, hdr, auxhdr)
-     int file;
-     struct header *hdr;
-     struct som_exec_auxhdr *auxhdr;
-{
-
-  /* Read the header in */
-  lseek (file, 0, 0);
-  if (read (file, hdr, sizeof (*hdr)) != sizeof (*hdr))
-    { perror ("Couldn't read header from a.out file"); exit (1); }
-
-  if (hdr->a_magic != EXEC_MAGIC && hdr->a_magic != SHARE_MAGIC
-      &&  hdr->a_magic != DEMAND_MAGIC)
-    {
-      fprintf (stderr, "a.out file doesn't have legal magic number\n");
-      exit (1);
-    }
-
-  lseek (file, hdr->aux_header_location, 0);
-  if (read (file, auxhdr, sizeof (*auxhdr)) != sizeof (*auxhdr))
-    {
-      perror ("Couldn't read auxiliary header from a.out file");
-      exit (1);
-    }
-}
-
-/* Write out the header records into an a.out file.  */
-
-write_header (file, hdr, auxhdr)
-     int file;
-     struct header *hdr;
-     struct som_exec_auxhdr *auxhdr;
-{
-  /* Update the checksum */
-  hdr->checksum = calculate_checksum (hdr);
-
-  /* Write the header back into the a.out file */
-  lseek (file, 0, 0);
-  if (write (file, hdr, sizeof (*hdr)) != sizeof (*hdr))
-    { perror ("Couldn't write header to a.out file"); exit (1); }
-  lseek (file, hdr->aux_header_location, 0);
-  if (write (file, auxhdr, sizeof (*auxhdr)) != sizeof (*auxhdr))
-    { perror ("Couldn't write auxiliary header to a.out file"); exit (1); }
-}
-
-/* Calculate the checksum of a SOM header record. */
-
-calculate_checksum (hdr)
-     struct header *hdr;
-{
-  int checksum, i, *ptr;
-
-  checksum = 0;  ptr = (int *) hdr;
-
-  for (i = 0; i < sizeof (*hdr) / sizeof (int) - 1; i++)
-    checksum ^= ptr[i];
-
-  return (checksum);
-}
-
-/* Copy size bytes from the old file to the new one.  */
-
-copy_file (old, new, size)
-     int new, old;
-     int size;
-{
-  int len;
-  int buffer[8192];  /* word aligned will be faster */
-
-  for (; size > 0; size -= len)
-    {
-      len = min (size, sizeof (buffer));
-      if (read (old, buffer, len) != len)
-        { perror ("Read failure on a.out file"); exit (1); }
-      if (write (new, buffer, len) != len)
-        { perror ("Write failure in a.out file"); exit (1); }
-    }
-}
-
-/* Copy the rest of the file, up to EOF.  */
-
-copy_rest (old, new)
-     int new, old;
-{
-  int buffer[4096];
-  int len;
-
-  /* Copy bytes until end of file or error */
-  while ((len = read (old, buffer, sizeof (buffer))) > 0)
-    if (write (new, buffer, len) != len) break;
-
-  if (len != 0)
-    { perror ("Unable to copy the rest of the file"); exit (1); }
-}
-
-#ifdef  DEBUG
-display_header (hdr, auxhdr)
-     struct header *hdr;
-     struct som_exec_auxhdr *auxhdr;
-{
-  /* Display the header information (debug) */
-  printf ("\n\nFILE HEADER\n");
-  printf ("magic number %d \n", hdr->a_magic);
-  printf ("text loc %.8x   size %d \n", auxhdr->exec_tmem, auxhdr->exec_tsize);
-  printf ("data loc %.8x   size %d \n", auxhdr->exec_dmem, auxhdr->exec_dsize);
-  printf ("entry     %x \n",   auxhdr->exec_entry);
-  printf ("Bss  segment size %u\n", auxhdr->exec_bsize);
-  printf ("\n");
-  printf ("data file loc %d    size %d\n",
-          auxhdr->exec_dfile, auxhdr->exec_dsize);
-  printf ("som_length %d\n", hdr->som_length);
-  printf ("unloadable sploc %d    size %d\n",
-          hdr->unloadable_sp_location, hdr->unloadable_sp_size);
-}
-#endif /* DEBUG */
-
-/* arch-tag: d55a09ac-9427-4ec4-8496-cb9d7710774f
-   (do not change this comment) */