From: Glenn Morris Date: Fri, 4 Jan 2013 19:22:37 +0000 (-0800) Subject: Merge from emacs-24; up to 2012-12-06T20:16:38Z!monnier@iro.umontreal.ca X-Git-Tag: emacs-24.3.90~173^2~7^2~401 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0f668a4db4a33f98f84613513af3efea521b4847;p=emacs.git Merge from emacs-24; up to 2012-12-06T20:16:38Z!monnier@iro.umontreal.ca --- 0f668a4db4a33f98f84613513af3efea521b4847 diff --cc ChangeLog index 68c0d85b5cc,0dcbc4747fb..a6d5148c777 --- a/ChangeLog +++ b/ChangeLog @@@ -1,28 -1,8 +1,32 @@@ + 2013-01-04 Glenn Morris + + * info/dir: Add htmlfontify. + -2012-12-29 Andreas Schwab +2013-01-04 Paul Eggert + + 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 + + Merge from gnulib, incorporating copyright-date changes and: + 2012-12-31 dup2: work around cygwin bug + +2012-12-30 Jan Djärv + + * 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 * configure.ac (TEMACS_LDFLAGS2): Don't define. (LIBS_GNUSTEP): Set for GNUstep and substitute. diff --cc doc/lispref/ChangeLog index f9f3aad9ab2,4deea30005f..e701f61c6b0 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@@ -1,7 -1,7 +1,11 @@@ -2013-01-03 Ari Roponen (tiny change) ++2013-01-04 Ari Roponen (tiny change) + + * hash.texi (Defining Hash): Fix typo. (Bug#13345) + +2013-01-04 Stefan Monnier + + * files.texi (File Attributes): Undocument return format of file-acl. + 2013-01-03 Glenn Morris * processes.texi (System Processes): diff --cc doc/misc/ChangeLog index f902ca511f1,343e1046d10..b0c39ce8507 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@@ -1,9 -1,20 +1,25 @@@ + 2013-01-04 Glenn Morris + + * 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 + + * htmlfontify.texi: New file. + -2012-12-22 Glenn Morris +2013-01-02 Jay Belanger + + * calc.texi (Free-Form Dates): Expand on the date reading + algorithm. + +2012-12-27 Glenn Morris * viper.texi (Rudimentary Changes, Key Bindings, Key Bindings): Avoid some overfull lines. diff --cc lisp/ChangeLog index 0dbe5ac0eb7,86cd55c6c36..c34f256b955 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,38 -1,21 +1,56 @@@ + 2013-01-04 Michael Albinus + + * 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-03 Glenn Morris ++2013-01-04 Glenn Morris + + * 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 (tiny change) + + * icomplete.el (icomplete-completions): + Honor icomplete-prospects-height once more following + 2012-11-29 changes. (Bug#13224) + +2013-01-04 Stefan Monnier + + * 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 + + * epg.el (epg--start): Ignore errors when /dev/fd/0 does not + exist. (Bug#13344) + +2013-01-03 Glenn Morris + + * 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 src/ChangeLog index 5205ef4625e,9e315700e8a..8fc876e248c --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,8 -1,16 +1,20 @@@ + 2013-01-04 YAMAMOTO Mitsuharu + + * 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. + -2012-12-31 Glenn Morris +2013-01-04 Stefan Monnier + + * fileio.c (Ffile_acl): Undocument return format. + +2013-01-02 Glenn Morris * keymap.c (Fkey_description): Doc fix. (Bug#13323)