Merge from trunk.

1 files changed, 42 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9d7834fd053..0a1d11f58f6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2011-08-14  Paul Eggert  <eggert@cs.ucla.edu>
+2011-08-15  Paul Eggert  <eggert@cs.ucla.edu>
 
         Integer and memory overflow issues (Bug#9196).
 
@@ -409,6 +409,47 @@
         (gs_load): Use printmax_t to print the widest integers possible.
         Check for integer overflow when computing image height and width.
 
+2011-08-14  Kenichi Handa  <handa@m17n.org>
+
+        * process.c (create_process): Call setup_process_coding_systems
+        after the pid of the process is set to -1.
+
+2011-08-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (move_it_in_display_line_to): Don't invoke
+        IT_RESET_X_ASCENT_DESCENT when iterator position was restored from
+        ppos_it.  Fixes vertical cursor motion when line beginning is
+        covered by an image.  (Bug#9296)
+
+2011-08-14  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsterm.h (ns_run_ascript): Declare.
+        (NSAPP_DATA2_RUNASSCRIPT): Define.
+
+        * nsfns.m (as_script, as_result, as_status): New static variables.
+        (ns_run_ascript): New function.
+        (Fns_do_applescript): Set variables as_*. Make an NSApplicationDefined
+        event with data2 set to NSAPP_DATA2_RUNASSCRIPT, post it and then start
+        the event loop.  Get status from as_status (Bug#7276).
+
+        * nsterm.m (sendEvent): If event is NSApplicationDefined and
+        data2 is NSAPP_DATA2_RUNASSCRIPT, call ns_run_ascript and then exit
+        the event loop (Bug#7276).
+
+2011-08-14  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * gnutls.c (QCgnutls_bootprop_priority)
+        (QCgnutls_bootprop_trustfiles, QCgnutls_bootprop_keylist)
+        (QCgnutls_bootprop_crlfiles, QCgnutls_bootprop_callbacks)
+        (QCgnutls_bootprop_loglevel, QCgnutls_bootprop_hostname)
+        (QCgnutls_bootprop_min_prime_bits, QCgnutls_bootprop_verify_flags)
+        (QCgnutls_bootprop_verify_hostname_error)
+        (QCgnutls_bootprop_callbacks_verify): Rename from
+        Qgnutls_bootprop_..., all uses changed.
+
+        * xfaces.c (QCignore_defface): Rename from Qignore_defface, all
+        uses changed.
+
 2011-08-14  Paul Eggert  <eggert@cs.ucla.edu>
 
         * xfaces.c (Qframe_set_background_mode): Now static.