merge trunk

diff --cc lisp/ChangeLog
index 4b6d0b0e3798b9379c0f907f1da67b139521631b,6b99c5719bb6240bb8c17a6cd189f3102b350873..68ebad48d427cf0bc180de466afb115b84d7adf2
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,11 -1,29 +1,34 @@@
 +2013-07-20  Kenichi Handa  <handa@gnu.org>
 +
 +      * international/mule.el (coding-system-iso-2022-flags): Add
 +      `8-bit-level-4'.  (Bug#8522)
 +
+ 2013-07-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+ 
+       * net/shr.el (shr-mouse-browse-url): New command and keystroke
+       (bug#14815).
+ 
+       * net/eww.el (eww-process-text-input): Allow inputting when the
+       point is at the start of the line, as the properties aren't
+       front-sticky.
+ 
+       * net/shr.el (shr-make-table-1): Ensure that we don't infloop on
+       degenerate widths.
+ 
+ 2013-07-19  Richard Stallman  <rms@gnu.org>
+ 
+       * epa.el (epa-popup-info-window): Doc fix.
+ 
+       * subr.el (split-string): New arg TRIM.
+ 
+ 2013-07-18  Juanma Barranquero  <lekktu@gmail.com>
+ 
+       * frame.el (blink-cursor-timer-function, blink-cursor-suspend):
+       Add check for W32 (followup to 2013-07-16T11:41:06Z!jan.h.d@swipnet.se).
+ 
  2013-07-18  Michael Albinus  <michael.albinus@gmx.de>
  
-       * filenotify.el (file-notify--library): Renamed from
+       * filenotify.el (file-notify--library): Rename from
        `file-notify-support'.  Do not autoload.  Adapt all uses.
        (file-notify-supported-p): New defun.
  

diff --cc src/ChangeLog
index c3a9ee4c1455113023d49c5d6f367c8e5be6201a,712fc2bc3b58a1e497d1fe55fd69d0ccb7e89516..5f3a48cbe88aebabc1775cacdfb6a0f983004cb3
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,81 +1,86 @@@
 +2013-07-20  Kenichi Handa  <handa@gnu.org>
 +
 +      * coding.c (CODING_ISO_FLAG_LEVEL_4): New macro.
 +      (decode_coding_iso_2022): Check the single-shift area.  (Bug#8522)
 +
+ 2013-07-20  Andreas Schwab  <schwab@linux-m68k.org>
+ 
+       * lread.c (Fload): Avoid uninitialized warning.
+ 
+ 2013-07-19  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+       Fix some minor file descriptor leaks and related glitches.
+       * filelock.c (create_lock_file) [!O_CLOEXEC]: Use fcntl with FD_CLOEXEC.
+       (create_lock_file): Use write, not emacs_write.
+       * image.c (slurp_file, png_load_body):
+       * process.c (Fnetwork_interface_list, Fnetwork_interface_info)
+       (server_accept_connection):
+       Don't leak an fd on memory allocation failure.
+       * image.c (slurp_file): Add a cheap heuristic for growing files.
+       * xfaces.c (Fx_load_color_file): Block input around the fopen too,
+       as that's what the other routines do.  Maybe input need not be
+       blocked at all, but it's better to be consistent.
+       Avoid undefined behavior when strlen is zero.
+ 
+       * alloc.c (staticpro): Avoid buffer overrun on repeated calls.
+       (NSTATICS): Now a constant; doesn't need to be a macro.
+ 
+ 2013-07-19  Richard Stallman  <rms@gnu.org>
+ 
+       * coding.c (decode_coding_utf_8): Add simple loop for fast
+       processing of ASCII characters.
+ 
+ 2013-07-19  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+       * conf_post.h (RE_TRANSLATE_P) [emacs]: Remove obsolete optimization.
+ 
+ 2013-07-19  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * keyboard.c (kbd_buffer_get_event): Use Display_Info instead of
+       unportable 'struct x_display_info'.
+       (DISPLAY_LIST_INFO): Delete macro: not needed, since Display_Info
+       is a portable type.
+ 
+ 2013-07-19  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+       * sysdep.c [GNU_LINUX]: Fix fd and memory leaks and similar issues.
+       (procfs_ttyname): Don't use uninitialized storage if emacs_fopen
+       or fscanf fails.
+       (system_process_attributes): Prefer plain char to unsigned char
+       when either will do.  Clean up properly if interrupted or if
+       memory allocations fail.  Don't assume sscanf succeeds.  Remove
+       no-longer-needed workaround to stop GCC from whining.  Read
+       command-line once, instead of multiple times.  Check read status a
+       bit more carefully.
+ 
+       Fix obscure porting bug with varargs functions.
+       The code assumed that int is treated like ptrdiff_t in a vararg
+       function, which is not a portable assumption.  There was a similar
+       -- though these days less likely -- porting problem with various
+       assumptions that pointers of different types all smell the same as
+       far as vararg functions is conserved.  To make this problem less
+       likely in the future, redo the API to use varargs functions.
+       * alloc.c (make_save_value): Remove this vararg function.
+       All uses changed to ...
+       (make_save_int_int_int, make_save_obj_obj_obj_obj)
+       (make_save_ptr_int, make_save_funcptr_ptr_obj, make_save_memory):
+       New functions.
+       (make_save_ptr): Rename from make_save_pointer, for consistency with
+       the above.  Define only on platforms that need it.  All uses changed.
+ 
+ 2013-07-18  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+       * keyboard.c: Try to fix typos in previous change.
+       (DISPLAY_LIST_INFO): New macro.
+       (kbd_buffer_get_event): Do not access members that are not present
+       in X11.  Revert inadvertent change of "!=" to "=".
+ 
+ 2013-07-18  Juanma Barranquero  <lekktu@gmail.com>
+ 
+       * keyboard.c (kbd_buffer_get_event):
+       * w32term.c (x_focus_changed): Port FOCUS_(IN|OUT)_EVENT changes to W32.
+       Followup to 2013-07-16T11:41:06Z!jan.h.d@swipnet.se.
+ 
  2013-07-18  Paul Eggert  <eggert@cs.ucla.edu>
  
        * filelock.c: Fix unlikely file descriptor leaks.

diff --cc src/coding.c
Simple merge