Merge from trunk.

10 files changed, 147 insertions, 68 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 506396e9583..b72de32ffc3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2011-07-17  Paul Eggert  <eggert@cs.ucla.edu>
+2011-07-19  Paul Eggert  <eggert@cs.ucla.edu>
 
         Integer signedness and overflow and related fixes.  (Bug#9079)
 
@@ -197,6 +197,54 @@
         Use EMACS_INT, not EMACS_UINT, for sizes.  The code works equally
         well either way, and we prefer signed to unsigned.
 
+2011-07-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port to OpenBSD.
+        See http://lists.gnu.org/archive/html/emacs-devel/2011-07/msg00688.html
+        and the surrounding thread.
+        * minibuf.c (read_minibuf_noninteractive): Rewrite to use getchar
+        rather than fgets, and retry after EINTR.  Otherwise, 'emacs
+        --batch -f byte-compile-file' fails on OpenBSD if an inactivity
+        timer goes off.
+        * s/openbsd.h (BROKEN_SIGIO): Define.
+        * unexelf.c (unexec) [__OpenBSD__]:
+        Don't update the .mdebug section of the Alpha COFF symbol table.
+
+2011-07-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * lread.c (syms_of_lread): Clarify when `lexical-binding' is used
+        (bug#8460).
+
+2011-07-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * fileio.c (Fcopy_file) [!MSDOS]: Tighten created file's mask.
+        This fixes some race conditions on the permissions of any newly
+        created file.
+
+        * alloc.c (valid_pointer_p): Use pipe, not open.
+        This fixes some permissions issues when debugging.
+
+        * fileio.c (Fcopy_file): Adjust mode if fchown fails.  (Bug#9002)
+        If fchown fails to set both uid and gid, try to set just gid,
+        as that is sometimes allowed.  Adjust the file's mode to eliminate
+        setuid or setgid bits that are inappropriate if fchown fails.
+
+2011-07-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xdisp.c (next_element_from_string, next_element_from_buffer): Use EQ
+        to compare Lisp_Objects.
+        * gnutls.c (syms_of_gnutls): Rename Vgnutls_log_level to
+        global_gnutls_log_level, don't mistake it for a Lisp_Object.
+        (init_gnutls_functions, emacs_gnutls_handle_error): Fix up uses.
+
+2011-07-17  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * lread.c (read_integer): Unread even EOF character.
+        (read1): Likewise.  Properly record start position of symbol.
+
+        * lread.c (read1): Read `#:' as empty uninterned symbol if no
+        symbol character follows.
+
 2011-07-17  Paul Eggert  <eggert@cs.ucla.edu>
 
         * fileio.c (Fcopy_file): Pacify gcc re fchown.  (Bug#9002)
diff --git a/src/alloc.c b/src/alloc.c
index 5848e797b4b..eb0185a8e35 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -4430,18 +4430,18 @@ valid_pointer_p (void *p)
 #ifdef WINDOWSNT
   return w32_valid_pointer_p (p, 16);
 #else
-  int fd;
+  int fd[2];
 
   /* Obviously, we cannot just access it (we would SEGV trying), so we
      trick the o/s to tell us whether p is a valid pointer.
      Unfortunately, we cannot use NULL_DEVICE here, as emacs_write may
      not validate p in that case.  */
 
-  if ((fd = emacs_open ("__Valid__Lisp__Object__", O_CREAT | O_WRONLY | O_TRUNC, 0666)) >= 0)
+  if (pipe (fd) == 0)
     {
-      int valid = (emacs_write (fd, (char *)p, 16) == 16);
-      emacs_close (fd);
-      unlink ("__Valid__Lisp__Object__");
+      int valid = (emacs_write (fd[1], (char *) p, 16) == 16);
+      emacs_close (fd[1]);
+      emacs_close (fd[0]);
       return valid;
     }
 
diff --git a/src/fileio.c b/src/fileio.c
index bdea302a0d6..61713689351 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -38,8 +38,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <selinux/context.h>
 #endif
 
-#include <ignore-value.h>
-
 #include "lisp.h"
 #include "intervals.h"
 #include "buffer.h"
@@ -1939,10 +1937,19 @@ on the system, we copy the SELinux context of FILE to NEWNAME.  */)
                     | (NILP (ok_if_already_exists) ? O_EXCL : 0),
                     S_IREAD | S_IWRITE);
 #else  /* not MSDOS */
-  ofd = emacs_open (SSDATA (encoded_newname),
-                    O_WRONLY | O_TRUNC | O_CREAT
-                    | (NILP (ok_if_already_exists) ? O_EXCL : 0),
-                    0666);
+  {
+    int new_mask = 0666;
+    if (input_file_statable_p)
+      {
+        if (!NILP (preserve_uid_gid))
+          new_mask = 0600;
+        new_mask &= st.st_mode;
+      }
+    ofd = emacs_open (SSDATA (encoded_newname),
+                      (O_WRONLY | O_TRUNC | O_CREAT
+                       | (NILP (ok_if_already_exists) ? O_EXCL : 0)),
+                      new_mask);
+  }
 #endif /* not MSDOS */
   if (ofd < 0)
     report_file_error ("Opening output file", Fcons (newname, Qnil));
@@ -1961,9 +1968,21 @@ on the system, we copy the SELinux context of FILE to NEWNAME.  */)
      owner and group.  */
   if (input_file_statable_p)
     {
+      int mode_mask = 07777;
       if (!NILP (preserve_uid_gid))
-        ignore_value (fchown (ofd, st.st_uid, st.st_gid));
-      if (fchmod (ofd, st.st_mode & 07777) != 0)
+        {
+          /* Attempt to change owner and group.  If that doesn't work
+             attempt to change just the group, as that is sometimes allowed.
+             Adjust the mode mask to eliminate setuid or setgid bits
+             that are inappropriate if the owner and group are wrong.  */
+          if (fchown (ofd, st.st_uid, st.st_gid) != 0)
+            {
+              mode_mask &= ~06000;
+              if (fchown (ofd, -1, st.st_gid) == 0)
+                mode_mask |= 02000;
+            }
+        }
+      if (fchmod (ofd, st.st_mode & mode_mask) != 0)
         report_file_error ("Doing chmod", Fcons (newname, Qnil));
     }
 #endif  /* not MSDOS */
diff --git a/src/gnutls.c b/src/gnutls.c
index 52e80a69ae5..3175f55041d 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -193,8 +193,7 @@ init_gnutls_functions (Lisp_Object libraries)
   LOAD_GNUTLS_FN (library, gnutls_x509_crt_import);
   LOAD_GNUTLS_FN (library, gnutls_x509_crt_init);
 
-  if (NUMBERP (Vgnutls_log_level))
-    max_log_level = XINT (Vgnutls_log_level);
+  max_log_level = global_gnutls_log_level;
 
   GNUTLS_LOG2 (1, max_log_level, "GnuTLS library loaded:",
                SDATA (Fget (Qgnutls_dll, QCloaded_from)));
@@ -406,8 +405,7 @@ emacs_gnutls_handle_error (gnutls_session_t session, int err)
   if (err >= 0)
     return 0;
 
-  if (NUMBERP (Vgnutls_log_level))
-    max_log_level = XINT (Vgnutls_log_level);
+  max_log_level = global_gnutls_log_level;
 
   /* TODO: use gnutls-error-fatalp and gnutls-error-string.  */
 
@@ -1155,9 +1153,9 @@ syms_of_gnutls (void)
   defsubr (&Sgnutls_bye);
   defsubr (&Sgnutls_available_p);
 
-  DEFVAR_INT ("gnutls-log-level", Vgnutls_log_level,
-              doc: /* Logging level used by the GnuTLS functions. */);
-  Vgnutls_log_level = make_number (0);
+  DEFVAR_INT ("gnutls-log-level", global_gnutls_log_level,
+              doc: /* Logging level used by the GnuTLS functions.  */);
+  global_gnutls_log_level = 0;
 }
 
 #endif /* HAVE_GNUTLS */
diff --git a/src/lread.c b/src/lread.c
index c80ac430671..0613ad037bf 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -2327,8 +2327,7 @@ read_integer (Lisp_Object readcharfun, EMACS_INT radix)
           c = READCHAR;
         }
 
-      if (c >= 0)
-        UNREAD (c);
+      UNREAD (c);
       *p = '\0';
     }
 
@@ -2583,8 +2582,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
               nskip *= 10;
               nskip += c - '0';
             }
-          if (c >= 0)
-            UNREAD (c);
+          UNREAD (c);
 
           if (load_force_doc_strings
               && (EQ (readcharfun, Qget_file_char)
@@ -2660,7 +2658,17 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
         {
           uninterned_symbol = 1;
           c = READCHAR;
-          goto default_label;
+          if (!(c > 040
+                && c != 0x8a0
+                && (c >= 0200
+                    || strchr ("\"';()[]#`,", c) == NULL)))
+            {
+              /* No symbol character follows, this is the empty
+                 symbol.  */
+              UNREAD (c);
+              return Fmake_symbol (build_string (""));
+            }
+          goto read_symbol;
         }
       /* Reader forms that can reuse previously read objects.  */
       if (c >= '0' && c <= '9')
@@ -2841,7 +2849,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
         next_char = READCHAR;
         ok = (next_char <= 040
               || (next_char < 0200
-                  && (strchr ("\"';()[]#?`,.", next_char))));
+                  && strchr ("\"';()[]#?`,.", next_char) != NULL));
         UNREAD (next_char);
         if (ok)
           return make_number (c);
@@ -2966,11 +2974,6 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
             /* Otherwise, READ_BUFFER contains only ASCII.  */
           }
 
-        /* We want readchar_count to be the number of characters, not
-           bytes.  Hence we adjust for multibyte characters in the
-           string.  ... But it doesn't seem to be necessary, because
-           READCHAR *does* read multibyte characters from buffers. */
-        /* readchar_count -= (p - read_buffer) - nchars; */
         if (read_pure)
           return make_pure_string (read_buffer, nchars, p - read_buffer,
                                    (force_multibyte
@@ -2987,7 +2990,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
 
         if (next_char <= 040
             || (next_char < 0200
-                && (strchr ("\"';([#?`,", next_char))))
+                && strchr ("\"';([#?`,", next_char) != NULL))
           {
             *pch = c;
             return Qnil;
@@ -3002,9 +3005,12 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
       if (c <= 040) goto retry;
       if (c == 0x8a0) /* NBSP */
         goto retry;
+
+    read_symbol:
       {
         char *p = read_buffer;
         int quoted = 0;
+        EMACS_INT start_position = readchar_count - 1;
 
         {
           char *end = read_buffer + read_buffer_size;
@@ -3035,10 +3041,11 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
               else
                 *p++ = c;
               c = READCHAR;
-            } while (c > 040
-                     && c != 0x8a0 /* NBSP */
-                     && (c >= 0200
-                         || !(strchr ("\"';()[]#`,", c))));
+            }
+          while (c > 040
+                 && c != 0x8a0 /* NBSP */
+                 && (c >= 0200
+                     || strchr ("\"';()[]#`,", c) == NULL));
 
           if (p == end)
             {
@@ -3051,8 +3058,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
               end = read_buffer + read_buffer_size;
             }
           *p = 0;
-          if (c >= 0)
-            UNREAD (c);
+          UNREAD (c);
         }
 
         if (!quoted && !uninterned_symbol)
@@ -3080,12 +3086,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
           if (EQ (Vread_with_symbol_positions, Qt)
               || EQ (Vread_with_symbol_positions, readcharfun))
             Vread_symbol_positions_list =
-              /* Kind of a hack; this will probably fail if characters
-                 in the symbol name were escaped.  Not really a big
-                 deal, though.  */
-              Fcons (Fcons (result,
-                            make_number (readchar_count
-                                         - XFASTINT (Flength (Fsymbol_name (result))))),
+              Fcons (Fcons (result, make_number (start_position)),
                      Vread_symbol_positions_list);
           return result;
         }
@@ -4490,10 +4491,9 @@ to load.  See also `load-dangerous-libraries'.  */);
   Qlexical_binding = intern ("lexical-binding");
   staticpro (&Qlexical_binding);
   DEFVAR_LISP ("lexical-binding", Vlexical_binding,
-               doc: /* If non-nil, use lexical binding when evaluating code.
-This applies to code evaluated by `eval-buffer' and `eval-region' and
-other commands that call these functions, like `eval-defun' and
-the like.
+               doc: /* Whether to use lexical binding when evaluating code.
+Non-nil means that the code in the current buffer should be evaluated
+with lexical binding.
 This variable is automatically set from the file variables of an
 interpreted Lisp file read using `load'.  */);
   Fmake_variable_buffer_local (Qlexical_binding);
diff --git a/src/minibuf.c b/src/minibuf.c
index cf37c337be4..7e59cf157b5 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -19,6 +19,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
+#include <errno.h>
 #include <stdio.h>
 #include <setjmp.h>
 
@@ -236,8 +237,9 @@ read_minibuf_noninteractive (Lisp_Object map, Lisp_Object initial,
                              int allow_props, int inherit_input_method)
 {
   ptrdiff_t size, len;
-  char *line, *s;
+  char *line;
   Lisp_Object val;
+  int c;
 
   fprintf (stdout, "%s", SDATA (prompt));
   fflush (stdout);
@@ -246,22 +248,30 @@ read_minibuf_noninteractive (Lisp_Object map, Lisp_Object initial,
   size = 100;
   len = 0;
   line = (char *) xmalloc (size);
-  while ((s = fgets (line + len, size - len, stdin)) != NULL
-         && (len = strlen (line),
-             len == size - 1 && line[len - 1] != '\n'))
+
+  while ((c = getchar ()) != '\n')
     {
-      if (STRING_BYTES_BOUND / 2 < size)
-        memory_full (SIZE_MAX);
-      size *= 2;
-      line = (char *) xrealloc (line, size);
+      if (c < 0)
+        {
+          if (errno != EINTR)
+            break;
+        }
+      else
+        {
+          if (len == size)
+            {
+              if (STRING_BYTES_BOUND / 2 < size)
+                memory_full (SIZE_MAX);
+              size *= 2;
+              line = (char *) xrealloc (line, size);
+            }
+          line[len++] = c;
+        }
     }
 
-  if (s)
+  if (len)
     {
-      char *nl = strchr (line, '\n');
-      if (nl)
-        *nl = '\0';
-      val = build_string (line);
+      val = make_string (line, len);
       xfree (line);
     }
   else
diff --git a/src/process.h b/src/process.h
index 4866a8c1022..aff9e970f63 100644
--- a/src/process.h
+++ b/src/process.h
@@ -141,7 +141,7 @@ struct Lisp_Process
 /* Every field in the preceding structure except for the first two
    must be a Lisp_Object, for GC's sake.  */
 
-#define ChannelMask(n) (1<<(n))
+#define ChannelMask(n) (1 << (n))
 
 /* True if we are about to fork off a synchronous process or if we
    are waiting for it.  */
diff --git a/src/s/openbsd.h b/src/s/openbsd.h
index 175d61dc9c9..0a8bab2290f 100644
--- a/src/s/openbsd.h
+++ b/src/s/openbsd.h
@@ -1,5 +1,9 @@
 /* System file for openbsd.  */
 
-/* The same as NetBSD.  Note there are differences in configure.  */
+/* Nearly the same as NetBSD.  Note there are differences in configure.  */
 #include "netbsd.h"
 
+/* The symbol SIGIO is defined, but the feature doesn't work in the
+   way Emacs needs it to.  See
+   <http://article.gmane.org/gmane.os.openbsd.ports/46831>.  */
+#define BROKEN_SIGIO
diff --git a/src/unexelf.c b/src/unexelf.c
index 951e7c0eea6..a169ffcb5c8 100644
--- a/src/unexelf.c
+++ b/src/unexelf.c
@@ -1053,7 +1053,7 @@ temacs:
       memcpy (NEW_SECTION_H (nn).sh_offset + new_base, src,
               NEW_SECTION_H (nn).sh_size);
 
-#ifdef __alpha__
+#if defined __alpha__ && !defined __OpenBSD__
       /* Update Alpha COFF symbol table: */
       if (strcmp (old_section_names + OLD_SECTION_H (n).sh_name, ".mdebug")
           == 0)
@@ -1072,7 +1072,7 @@ temacs:
           symhdr->cbRfdOffset += new_data2_size;
           symhdr->cbExtOffset += new_data2_size;
         }
-#endif /* __alpha__ */
+#endif /* __alpha__ && !__OpenBSD__ */
 
 #if defined (_SYSTYPE_SYSV)
       if (NEW_SECTION_H (nn).sh_type == SHT_MIPS_DEBUG
diff --git a/src/xdisp.c b/src/xdisp.c
index 0352867941e..137cbec497c 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -6945,7 +6945,7 @@ next_element_from_string (struct it *it)
   struct text_pos position;
 
   xassert (STRINGP (it->string));
-  xassert (!it->bidi_p || it->string == it->bidi_it.string.lstring);
+  xassert (!it->bidi_p || EQ (it->string, it->bidi_it.string.lstring));
   xassert (IT_STRING_CHARPOS (*it) >= 0);
   position = it->current.string_pos;
 
@@ -7259,7 +7259,7 @@ next_element_from_buffer (struct it *it)
   xassert (IT_CHARPOS (*it) >= BEGV);
   xassert (NILP (it->string) && !it->s);
   xassert (!it->bidi_p
-           || (it->bidi_it.string.lstring == Qnil
+           || (EQ (it->bidi_it.string.lstring, Qnil)
                && it->bidi_it.string.s == NULL));
 
   /* With bidi reordering, the character to display might not be the