procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge trunk

Browse source
This commit is contained in:
Kenichi Handa 2013-10-13 20:59:25 +09:00
commit 4168439a5f
4 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
autogen/Makefile.in
View file

@ -1105,6 +1105,7 @@ REPLACE_STRSTR = @REPLACE_STRSTR@
REPLACE_STRTOD = @REPLACE_STRTOD@
REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@
REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@
REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
REPLACE_SYMLINK = @REPLACE_SYMLINK@
REPLACE_TIMEGM = @REPLACE_TIMEGM@
@ -2052,6 +2053,7 @@ uninstall-am:
@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \
@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \
@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \
@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''REPLACE_STRTOUMAX''@/$(REPLACE_STRTOUMAX)/g' \
@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \
@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''INT64_MAX_EQ_LONG_MAX''@/$(INT64_MAX_EQ_LONG_MAX)/g' \
@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''UINT32_MAX_LT_UINTMAX_MAX''@/$(UINT32_MAX_LT_UINTMAX_MAX)/g' \

23
autogen/configure vendored
View file

@ -910,6 +910,7 @@ PRIPTR_PREFIX
PRI_MACROS_BROKEN
INT64_MAX_EQ_LONG_MAX
INT32_MAX_LT_INTMAX_MAX
REPLACE_STRTOUMAX
REPLACE_STRTOIMAX
HAVE_DECL_STRTOUMAX
HAVE_DECL_STRTOIMAX
@ -20969,6 +20970,7 @@ fi
HAVE_DECL_STRTOIMAX=1;
HAVE_DECL_STRTOUMAX=1;
REPLACE_STRTOIMAX=0;
REPLACE_STRTOUMAX=0;
INT32_MAX_LT_INTMAX_MAX=1;
INT64_MAX_EQ_LONG_MAX='defined _LP64';
PRI_MACROS_BROKEN=0;
@ -27035,7 +27037,7 @@ $as_echo "#define my_strftime nstrftime" >>confdefs.h
HAVE_DECL_STRTOIMAX=0
fi
if test $ac_cv_func_strtoimax = yes; then
if test "$ac_cv_func_strtoimax" = yes; then
HAVE_STRTOIMAX=1
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strtoimax works" >&5
$as_echo_n "checking whether strtoimax works... " >&6; }
@ -27108,10 +27110,14 @@ $as_echo "$gl_cv_func_strtoimax" >&6; }
*no) REPLACE_STRTOIMAX=1 ;;
esac
else
if test "$ac_cv_have_decl_strtoimax" = yes; then
# HP-UX 11.11 has "#define strtoimax(...) ..." but no function.
REPLACE_STRTOIMAX=1
fi
HAVE_STRTOIMAX=0
fi
if test $HAVE_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; then
if test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; then
@ -27152,11 +27158,16 @@ _ACEOF
if test "$ac_cv_have_decl_strtoumax" != yes; then
if test "$ac_cv_have_decl_strtoumax" = yes; then
if test "$ac_cv_func_strtoumax" != yes; then
# HP-UX 11.11 has "#define strtoimax(...) ..." but no function.
REPLACE_STRTOUMAX=1
fi
else
HAVE_DECL_STRTOUMAX=0
fi
if test $ac_cv_func_strtoumax = no; then
if test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1; then
@ -29126,10 +29137,10 @@ done
if test $HAVE_READLINKAT = 0; then
func_gl_gnulib_m4code_03e0aaad4cb89ca757653bd367a6ccb7
fi
if { test $HAVE_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; } && test $ac_cv_type_long_long_int = yes; then
if { test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; } && test $ac_cv_type_long_long_int = yes; then
func_gl_gnulib_m4code_strtoll
fi
if test $ac_cv_func_strtoumax = no && test $ac_cv_type_unsigned_long_long_int = yes; then
if { test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1; } && test $ac_cv_type_unsigned_long_long_int = yes; then
func_gl_gnulib_m4code_strtoull
fi

4
doc/emacs/ChangeLog
View file

@ -1,3 +1,7 @@
2013-10-13 Xue Fuqiao <xfq.free@gmail.com>
* calendar.texi (Special Diary Entries): Remove @refill.
2013-10-13 Glenn Morris <rgm@gnu.org>
* display.texi (Text Scale): Update text-scale-adjust details.

2
doc/emacs/calendar.texi
View file

@ -1347,7 +1347,7 @@ mean ``second'', @minus{}2 would mean ``second-to-last'', and so on).
The month can be a single month or a list of months. Thus you could change
the 11 above to @samp{'(1 2 3)} and have the entry apply to the last
Thursday of January, February, and March. If the month is @code{t}, the
entry applies to all months of the year.@refill
entry applies to all months of the year.
Each of the standard sexp diary entries takes an optional parameter
specifying the name of a face or a single-character string to use when