Merge from emacs-24; up to 2012-12-17T11:17:34Z!rgm@gnu.org

8 files changed, 104 insertions, 59 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ed750032dd6..31ffd36c060 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,49 @@
+2013-02-13  Glenn Morris  <rgm@gnu.org>
+
+        * keyboard.c (input-decode-map, key-translation-map): Doc fixes.
+
+2013-02-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Improve AIX port some more (Bug#13650).
+        With this, it should be as good as it was in 23.3, though it's
+        still pretty bad: the dumped emacs does not run.  See Mark Fleishman in
+        http://lists.gnu.org/archive/html/help-gnu-emacs/2011-04/msg00287.html
+        * unexaix.c (start_of_text): Remove.
+        (_data, _text): Declare as char[], not int, as AIX manual suggests.
+        (bias, lnnoptr, text_scnptr, data_scnptr, load_scnptr)
+        (orig_load_scnptr, orig_data_scnptr):
+        Now off_t, not long, since they are file offsets.
+        (make_hdr): Use _data, not start_of_data ().
+        This is the key part of the fix.
+        (make_hdr, unrelocate_symbols): Use off_t for file offsets.
+        (unrelocate_symbols): Cast pointers to intptr_t, not to ulong.
+
+        * pre-crt0.c (data_start): Initialize to 1.
+        This ports to compilers that optimize the external declaration
+        'int x = 0;' as if it were 'int x;' to shrink the executable.
+
+        Improve AIX port (Bug#13650).
+        This doesn't fix the bug, but it makes progress: Emacs builds now.
+        * unexaix.c: Include inttypes.h, stdarg.h.
+        (report_error, report_error_1): Mark as _Noreturn.
+        (report_error): Don't report the wrong errno.
+        (report_error_1): Now varargs.  All callers changed.
+        (make_hdr): Use uintptr_t, not unsigned, when converting pointers
+        to unsigned.  Don't use ADDR_CORRECT, as it no longer exists.
+        (write_ptr): Use %p to print address rather than %lx and a cast
+        to unsigned long.  Grow buffer a bit, to be safer.
+
+2013-02-13  Eli Zaretskii  <eliz@gnu.org>
+
+        * bidi.c (bidi_resolve_neutral): After finding the next
+        non-neutral character, accept NEUTRAL_ON type as well, because
+        directional control characters, such as LRE and RLE, have their
+        type converted to that by bidi_resolve_weak.  This avoids aborts
+        when LRE/RLE follows a run of neutrals.
+        (bidi_move_to_visually_next): Assert that return value of
+        bidi_peek_at_next_level is non-negative.  Negative values will
+        cause an infloop.
+
 2013-02-13  Paul Eggert  <eggert@cs.ucla.edu>
 
         Minor getenv-related fixes.
diff --git a/src/bidi.c b/src/bidi.c
index b067c8134e3..db2e48a2ca7 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -1973,6 +1973,7 @@ bidi_resolve_neutral (struct bidi_it *bidi_it)
                 next_type = STRONG_R;
                 break;
               case WEAK_BN:
+              case NEUTRAL_ON:  /* W6/Retaining */
                 if (!bidi_explicit_dir_char (bidi_it->ch))
                   emacs_abort (); /* can't happen: BNs are skipped */
                 /* FALLTHROUGH */
@@ -2391,6 +2392,10 @@ bidi_move_to_visually_next (struct bidi_it *bidi_it)
       next_level = bidi_peek_at_next_level (bidi_it);
       while (next_level != expected_next_level)
         {
+          /* If next_level is -1, it means we have an unresolved level
+             in the cache, which at this point should not happen.  If
+             it does, we will infloop.  */
+          eassert (next_level >= 0);
           expected_next_level += incr;
           level_to_search += incr;
           bidi_find_other_level_edge (bidi_it, level_to_search, !ascending);
diff --git a/src/coding.c b/src/coding.c
index b881f162ab9..868fb7df0ea 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -10712,7 +10712,7 @@ reading if you suppress escape sequence detection.
 
 The other way to read escape sequences in a file without decoding is
 to explicitly specify some coding system that doesn't use ISO-2022
-escape sequence (e.g `latin-1') on reading by \\[universal-coding-system-argument].  */);
+escape sequence (e.g., `latin-1') on reading by \\[universal-coding-system-argument].  */);
   inhibit_iso_escape_detection = 0;
 
   DEFVAR_BOOL ("inhibit-null-byte-detection",
diff --git a/src/font.c b/src/font.c
index bed0ac8caf2..5cfac07de72 100644
--- a/src/font.c
+++ b/src/font.c
@@ -4831,7 +4831,7 @@ where
   OPENED-NAME is the name used for opening the font,
   FULL-NAME is the full name of the font,
   SIZE is the pixelsize of the font,
-  HEIGHT is the pixel-height of the font (i.e ascent + descent),
+  HEIGHT is the pixel-height of the font (i.e., ascent + descent),
   BASELINE-OFFSET is the upward offset pixels from ASCII baseline,
   RELATIVE-COMPOSE and DEFAULT-ASCENT are the numbers controlling
     how to compose characters.
diff --git a/src/indent.c b/src/indent.c
index 44ecbbc8a58..ce1639eae1e 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -291,7 +291,7 @@ DEFUN ("current-column", Fcurrent_column, Scurrent_column, 0, 0, 0,
        doc: /* Return the horizontal position of point.  Beginning of line is column 0.
 This is calculated by adding together the widths of all the displayed
 representations of the character between the start of the previous line
-and point (eg. control characters will have a width of 2 or 4, tabs
+and point (e.g., control characters will have a width of 2 or 4, tabs
 will have a variable width).
 Ignores finite width of frame, which means that this function may return
 values greater than (frame-width).
diff --git a/src/keyboard.c b/src/keyboard.c
index 94432cb7bf6..4ead0538b92 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -11618,9 +11618,7 @@ If the binding is a function, it is called with one argument (the prompt)
 and its return value (a key sequence) is used.
 
 The events that come from bindings in `input-decode-map' are not
-themselves looked up in `input-decode-map'.
-
-This variable is keyboard-local.  */);
+themselves looked up in `input-decode-map'.  */);
 
   DEFVAR_LISP ("function-key-map", Vfunction_key_map,
                doc: /* The parent keymap of all `local-function-key-map' instances.
@@ -11633,8 +11631,7 @@ definition will take precedence.  */);
   DEFVAR_LISP ("key-translation-map", Vkey_translation_map,
                doc: /* Keymap of key translations that can override keymaps.
 This keymap works like `function-key-map', but comes after that,
-and its non-prefix bindings override ordinary bindings.
-Another difference is that it is global rather than keyboard-local.  */);
+and its non-prefix bindings override ordinary bindings.  */);
   Vkey_translation_map = Fmake_sparse_keymap (Qnil);
 
   DEFVAR_LISP ("deferred-action-list", Vdeferred_action_list,
diff --git a/src/pre-crt0.c b/src/pre-crt0.c
index ea5736eba2a..6b9618c8dc3 100644
--- a/src/pre-crt0.c
+++ b/src/pre-crt0.c
@@ -4,7 +4,7 @@
    that make environ an initialized variable.  However, we do
    need to make sure the label data_start exists anyway.  */
 
-/* Create a label to appear at the beginning of data space.  */
-
-int data_start = 0;
+/* Create a label to appear at the beginning of data space.
+   Its value is nonzero so that it cannot be put into bss.  */
 
+int data_start = 1;
diff --git a/src/unexaix.c b/src/unexaix.c
index 92ebd2e3ceb..da44480fdca 100644
--- a/src/unexaix.c
+++ b/src/unexaix.c
@@ -51,6 +51,8 @@ what you give them.   Help stamp out software-hoarding!  */
 #include "getpagesize.h"
 
 #include <sys/types.h>
+#include <inttypes.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <sys/stat.h>
 #include <errno.h>
@@ -59,10 +61,8 @@ what you give them.   Help stamp out software-hoarding!  */
 
 #include "mem-limits.h"
 
-char *start_of_text (void);                     /* Start of text */
-
-extern int _data;
-extern int _text;
+extern char _data[];
+extern char _text[];
 
 #include <filehdr.h>
 #include <aouthdr.h>
@@ -71,15 +71,15 @@ extern int _text;
 
 static struct filehdr f_hdr;            /* File header */
 static struct aouthdr f_ohdr;           /* Optional file header (a.out) */
-static long bias;                       /* Bias to add for growth */
-static long lnnoptr;                    /* Pointer to line-number info within file */
+static off_t bias;                      /* Bias to add for growth */
+static off_t lnnoptr;                   /* Pointer to line-number info within file */
 
-static long text_scnptr;
-static long data_scnptr;
+static off_t text_scnptr;
+static off_t data_scnptr;
 #define ALIGN(val, pwr) (((val) + ((1L<<(pwr))-1)) & ~((1L<<(pwr))-1))
-static long load_scnptr;
-static long orig_load_scnptr;
-static long orig_data_scnptr;
+static off_t load_scnptr;
+static off_t orig_load_scnptr;
+static off_t orig_data_scnptr;
 static int unrelocate_symbols (int, int, const char *, const char *);
 
 #ifndef MAX_SECTIONS
@@ -92,23 +92,30 @@ static int pagemask;
 
 #include "lisp.h"
 
-static void
+static _Noreturn void
 report_error (const char *file, int fd)
 {
   if (fd)
-    close (fd);
+    {
+      int failed_errno = errno;
+      close (fd);
+      errno = failed_errno;
+    }
   report_file_error ("Cannot unexec", Fcons (build_string (file), Qnil));
 }
 
-#define ERROR0(msg) report_error_1 (new, msg, 0, 0); return -1
-#define ERROR1(msg,x) report_error_1 (new, msg, x, 0); return -1
-#define ERROR2(msg,x,y) report_error_1 (new, msg, x, y); return -1
+#define ERROR0(msg) report_error_1 (new, msg)
+#define ERROR1(msg,x) report_error_1 (new, msg, x)
+#define ERROR2(msg,x,y) report_error_1 (new, msg, x, y)
 
-static void
-report_error_1 (int fd, const char *msg, int a1, int a2)
+static _Noreturn void ATTRIBUTE_FORMAT_PRINTF (2, 3)
+report_error_1 (int fd, const char *msg, ...)
 {
+  va_list ap;
   close (fd);
-  error (msg, a1, a2);
+  va_start (ap, msg);
+  verror (msg, ap);
+  va_end (ap);
 }
 
 static int make_hdr (int, int, const char *, const char *);
@@ -163,8 +170,8 @@ make_hdr (int new, int a_out,
           const char *a_name, const char *new_name)
 {
   int scns;
-  unsigned int bss_start;
-  unsigned int data_start;
+  uintptr_t bss_start;
+  uintptr_t data_start;
 
   struct scnhdr section[MAX_SECTIONS];
   struct scnhdr * f_thdr;               /* Text section header */
@@ -179,17 +186,17 @@ make_hdr (int new, int a_out,
   pagemask = getpagesize () - 1;
 
   /* Adjust text/data boundary. */
-  data_start = (long) start_of_data ();
-  data_start = ADDR_CORRECT (data_start);
+  data_start = (uintptr_t) _data;
 
   data_start = data_start & ~pagemask; /* (Down) to page boundary. */
 
-  bss_start = ADDR_CORRECT (sbrk (0)) + pagemask;
+  bss_start = (uintptr_t) sbrk (0) + pagemask;
   bss_start &= ~ pagemask;
 
   if (data_start > bss_start)   /* Can't have negative data size. */
     {
-      ERROR2 ("unexec: data_start (%u) can't be greater than bss_start (%u)",
+      ERROR2 (("unexec: data_start (0x%"PRIxPTR
+               ") can't be greater than bss_start (0x%"PRIxPTR")"),
               data_start, bss_start);
     }
 
@@ -279,7 +286,7 @@ make_hdr (int new, int a_out,
 
   /* fix scnptr's */
   {
-    ulong ptr = section[0].s_scnptr;
+    off_t ptr = section[0].s_scnptr;
 
     bias = -1;
     for (scns = 0; scns < f_hdr.f_nscns; scns++)
@@ -375,12 +382,12 @@ copy_text_and_data (int new)
   char *end;
   char *ptr;
 
-  lseek (new, (long) text_scnptr, SEEK_SET);
-  ptr = start_of_text () + text_scnptr;
+  lseek (new, text_scnptr, SEEK_SET);
+  ptr = _text + text_scnptr;
   end = ptr + f_ohdr.tsize;
   write_segment (new, ptr, end);
 
-  lseek (new, (long) data_scnptr, SEEK_SET);
+  lseek (new, data_scnptr, SEEK_SET);
   ptr = (char *) f_ohdr.data_start;
   end = ptr + f_ohdr.dsize;
   write_segment (new, ptr, end);
@@ -393,7 +400,6 @@ static void
 write_segment (int new, char *ptr, char *end)
 {
   int i, nwrite, ret;
-  char buf[80];
   char zeros[UnexBlockSz];
 
   for (i = 0; ptr < end;)
@@ -414,9 +420,13 @@ write_segment (int new, char *ptr, char *end)
         }
       else if (nwrite != ret)
         {
+          int write_errno = errno;
+          char buf[1000];
+          void *addr = ptr;
           sprintf (buf,
-                   "unexec write failure: addr 0x%lx, fileno %d, size 0x%x, wrote 0x%x, errno %d",
-                   (unsigned long)ptr, new, nwrite, ret, errno);
+                   "unexec write failure: addr %p, fileno %d, size 0x%x, wrote 0x%x, errno %d",
+                   addr, new, nwrite, ret, errno);
+          errno = write_errno;
           PERROR (buf);
         }
       i += nwrite;
@@ -537,13 +547,13 @@ unrelocate_symbols (int new, int a_out,
   int i;
   LDHDR ldhdr;
   LDREL ldrel;
-  ulong t_reloc = (ulong) &_text - f_ohdr.text_start;
+  off_t t_reloc = (intptr_t) _text - f_ohdr.text_start;
 #ifndef ALIGN_DATA_RELOC
-  ulong d_reloc = (ulong) &_data - f_ohdr.data_start;
+  off_t d_reloc = (intptr_t) _data - f_ohdr.data_start;
 #else
   /* This worked (and was needed) before AIX 4.2.
      I have no idea why. -- Mike */
-  ulong d_reloc = (ulong) &_data - ALIGN (f_ohdr.data_start, 2);
+  off_t d_reloc = (intptr_t) _data - ALIGN (f_ohdr.data_start, 2);
 #endif
   int * p;
 
@@ -628,16 +638,3 @@ unrelocate_symbols (int new, int a_out,
     }
   return 0;
 }
-
-/*
- *      Return the address of the start of the text segment prior to
- *      doing an unexec.  After unexec the return value is undefined.
- *      See crt0.c for further explanation and _start.
- *
- */
-
-char *
-start_of_text (void)
-{
-  return ((char *) 0x10000000);
-}