Merge from emacs-24; up to 2012-12-06T20:16:38Z!monnier@iro.umontreal.ca

diff --cc ChangeLog
index 68c0d85,0dcbc47..a6d5148
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,28 -1,8 +1,32 @@@
 -2012-12-29  Andreas Schwab  <schwab@linux-m68k.org>
+ 2013-01-04  Glenn Morris  <rgm@gnu.org>
+ 
+       * info/dir: Add htmlfontify.
+ 
 +2013-01-04  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Merge from gnulib, incorporating:
 +      2013-01-04 stdio: remove now-unnecessary stdio.c
 +      2013-01-04 fprintftime: depend on stdio, not ignore-value
 +      2013-01-04 fwrite: silence __wur only for older glibc versions
 +      2013-01-04 fwrite: silence __wur without using inline
 +      * lib/stdio.c: Remove.
 +      * lib/stdio.in.h, lib/strftime.c: Update from gnulib.
 +      * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
 +
 +2013-01-02  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Merge from gnulib, incorporating copyright-date changes and:
 +      2012-12-31 dup2: work around cygwin bug
 +
 +2012-12-30  Jan Djärv  <jan.h.d@swipnet.se>
 +
 +      * configure.ac: Check for GtkHandlebox.
 +      Check for GtkTearoffMenuItem.
 +      New enable: --enable-gtk-deprecation-warnings, default off.
 +      (HAVE_GTK3): If above enable is off, add
 +      -DGDK_DISABLE_DEPRECATION_WARNINGS to GTK_CFLAGS.
 +
 +2012-12-30  Andreas Schwab  <schwab@linux-m68k.org>
  
        * configure.ac (TEMACS_LDFLAGS2): Don't define.
        (LIBS_GNUSTEP): Set for GNUstep and substitute.

diff --cc doc/lispref/ChangeLog
index f9f3aad,4deea30..e701f61
--- 1/doc/lispref/ChangeLog
--- 2/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@@ -1,7 -1,7 +1,11 @@@
 -2013-01-03  Ari Roponen  <ari.roponen@gmail.com>  (tiny change)
++2013-01-04  Ari Roponen  <ari.roponen@gmail.com>  (tiny change)
+ 
+       * hash.texi (Defining Hash): Fix typo.  (Bug#13345)
+ 
 +2013-01-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * files.texi (File Attributes): Undocument return format of file-acl.
 +
  2013-01-03  Glenn Morris  <rgm@gnu.org>
  
        * processes.texi (System Processes):

diff --cc doc/misc/ChangeLog
index f902ca5,343e104..b0c39ce
--- 1/doc/misc/ChangeLog
--- 2/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@@ -1,9 -1,20 +1,25 @@@
 -2012-12-22  Glenn Morris  <rgm@gnu.org>
+ 2013-01-04  Glenn Morris  <rgm@gnu.org>
+ 
+       * Makefile.in (INFO_TARGETS, DVI_TARGETS, PDF_TARGETS):
+       Add htmlfontify.
+       (htmlfontify, $(buildinfodir)/htmlfontify$(INFO_EXT))
+       (htmlfontify.dvi, htmlfontify.pdf): New targets.
+       * makefile.w32-in (INFO_TARGETS, DVI_TARGETS, clean): Add htmlfontify.
+       ($(infodir)/htmlfontify$(INFO_EXT), htmlfontify.dvi): New targets.
+ 
+       * htmlfontify.texi: Miscellaneous fixes and updates.
+       Set copyright to FSF, update license to GFDL 1.3+.
+ 
+ 2013-01-04  Vivek Dasmohapatra  <vivek@etla.org>
+ 
+       * htmlfontify.texi: New file.
+ 
 +2013-01-02  Jay Belanger  <jay.p.belanger@gmail.com>
 +
 +      * calc.texi (Free-Form Dates): Expand on the date reading
 +      algorithm.
 +
 +2012-12-27  Glenn Morris  <rgm@gnu.org>
  
        * viper.texi (Rudimentary Changes, Key Bindings, Key Bindings):
        Avoid some overfull lines.

diff --cc doc/misc/Makefile.in
Simple merge

diff --cc doc/misc/makefile.w32-in
Simple merge

diff --cc lisp/ChangeLog
index 0dbe5ac,86cd55c..c34f256
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,38 -1,21 +1,56 @@@
 -2013-01-03  Glenn Morris  <rgm@gnu.org>
+ 2013-01-04  Michael Albinus  <michael.albinus@gmx.de>
+ 
+       * net/tramp-sh.el (tramp-set-file-uid-gid): UID and GID must be
+       non-negative integers.  Otherwise, the default values are used.
+       (tramp-convert-file-attributes): Convert uid and gid to integers.
+ 
++2013-01-04  Glenn Morris  <rgm@gnu.org>
+ 
+       * term.el (term-handle-colors-array): Ensure face attributes
+       are fully specified, not nil.  (Bug#13337)
+ 
+       * term.el (term-default-fg-color, term-default-bg-color):
+       Fix custom type.
+ 
+       * progmodes/etags.el (tags-compression-info-list): Doc fix.
+       (tag-find-file-of-tag-noselect): Check auto-compression-mode
+       rather than 'jka-compr being loaded.  (Bug#13338)
+ 
 +2013-01-04  Wesley Dawson  <whd@lavabit.com>  (tiny change)
 +
 +      * icomplete.el (icomplete-completions):
 +      Honor icomplete-prospects-height once more following
 +      2012-11-29 changes.  (Bug#13224)
 +
 +2013-01-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * subr.el (internal--called-interactively-p--get-frame): Find aliases
 +      of called-interactively-p as well (bug#13237).
 +
 +      * view.el (view--enable, view--disable): Rename from view-mode-enable
 +      and view-mode-disable and assume it's called from view-mode.
 +      (view-mode-enable, view-mode-disable): Redefine as obsolete
 +      compatibility layer above view-mode.
 +      (view-mode-enter): Call `view-mode'.
 +
 +      * files.el (after-find-file): Call `view-mode'.
 +
 +      * doc-view.el (doc-view-scale-internally): New var.
 +      (doc-view-enlarge, doc-view-insert-image): Obey it.
 +
 +2013-01-03  Daiki Ueno  <ueno@gnu.org>
 +
 +      * epg.el (epg--start): Ignore errors when /dev/fd/0 does not
 +      exist.  (Bug#13344)
 +
 +2013-01-03  Glenn Morris  <rgm@gnu.org>
 +
 +      * mail/rmail.el (rmail-set-header-1): Ignore case.
 +      Handle multi-line headers.  (Bug#13330)
 +
 +      * progmodes/make-mode.el (makefile-fill-paragraph): Add doc.
 +      Handle paragraph starting at beginning of buffer.
 +
        * subr.el (eval-after-load): Don't purecopy the form, so that it
        can be nconc'd later on; reverts 2009-11-11 change.  (Bug#13331)
  

diff --cc lisp/net/tramp-sh.el
Simple merge

diff --cc lisp/progmodes/etags.el
Simple merge

diff --cc lisp/term.el
Simple merge

diff --cc src/ChangeLog
index 5205ef4,9e31570..8fc876e
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,16 +1,20 @@@
 -2012-12-31  Glenn Morris  <rgm@gnu.org>
+ 2013-01-04  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+ 
+       * nsterm.m (ns_draw_underwave):
+       * w32term.c (w32_draw_underwave):
+       * xterm.c (x_draw_underwave): Make underwave look more triangular
+       and also degrade gracefully for small fonts.  (Bug#13000)
+ 
+       * nsterm.m (ns_draw_text_decoration):
+       * w32term.c (x_draw_glyph_string):
+       * xterm.c (x_draw_glyph_string): Don't use previous underline
+       thickness and position if previous underline type is underwave.
+ 
 +2013-01-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * fileio.c (Ffile_acl): Undocument return format.
 +
 +2013-01-02  Glenn Morris  <rgm@gnu.org>
  
        * keymap.c (Fkey_description): Doc fix.  (Bug#13323)
  

diff --cc src/nsterm.m
Simple merge

diff --cc src/w32term.c
Simple merge

diff --cc src/xterm.c
Simple merge