[Emacs-diffs] trunk r113151: Merge from emacs-24; up to r111363

[Glenn Morris]

------------------------------------------------------------
revno: 113151 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2013-06-23 23:58:52 -0700
message:
  Merge from emacs-24; up to r111363
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783
  doc/emacs/files.texi           files.texi-20091113204419-o5vbwnq5f7feedwu-6249
  doc/emacs/rmail.texi           rmail.texi-20091113204419-o5vbwnq5f7feedwu-6274
  doc/lispref/ChangeLog          changelog-20091113204419-o5vbwnq5f7feedwu-6155
  doc/lispref/functions.texi     
functions.texi-20091113204419-o5vbwnq5f7feedwu-6182
  doc/lispref/loading.texi       
loading.texi-20091113204419-o5vbwnq5f7feedwu-6193
  doc/lispref/variables.texi     
variables.texi-20091113204419-o5vbwnq5f7feedwu-6221
  doc/misc/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-6331
  doc/misc/eshell.texi           
eshell.texi-20091113204419-o5vbwnq5f7feedwu-6299

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-06-22 02:41:14 +0000
+++ b/ChangeLog 2013-06-24 06:58:52 +0000
@@ -1,3 +1,7 @@
+2013-06-24  Glenn Morris  <address@hidden>
+
+       * configure.ac: Include X11/X.h when testing for Xft.h.  (Bug#14684)
+
 2013-06-22  Juanma Barranquero  <address@hidden>
 
        * .bzrignore: Add GNU idutils ID database file.

=== modified file 'configure.ac'
--- a/configure.ac      2013-06-21 01:03:23 +0000
+++ b/configure.ac      2013-06-24 06:58:52 +0000
@@ -2644,7 +2644,8 @@
        XFT_LIBS="-lXrender $XFT_LIBS"
        LIBS="$XFT_LIBS $LIBS"
        AC_CHECK_HEADER(X11/Xft/Xft.h,
-         AC_CHECK_LIB(Xft, XftFontOpen, HAVE_XFT=yes, , $XFT_LIBS))
+         AC_CHECK_LIB(Xft, XftFontOpen, HAVE_XFT=yes, , $XFT_LIBS) , ,
+          [[#include <X11/X.h>]])
 
        if test "${HAVE_XFT}" = "yes"; then
          AC_DEFINE(HAVE_XFT, 1, [Define to 1 if you have the Xft library.])

=== modified file 'doc/emacs/files.texi'
--- a/doc/emacs/files.texi      2013-05-05 00:51:49 +0000
+++ b/doc/emacs/files.texi      2013-06-24 06:58:52 +0000
@@ -1267,9 +1267,12 @@
 buffer named @file{*diff*}.  This works by running the @command{diff}
 program, using options taken from the variable @code{diff-switches}.
 The value of @code{diff-switches} should be a string; the default is
address@hidden"-c"} to specify a context diff.  @xref{Top,, Diff, diff,
-Comparing and Merging Files}, for more information about the
address@hidden program.
address@hidden"-c"} to specify a context diff.
address@hidden Note that the actual name of the info file is diffutils.info,
address@hidden but it adds a dir entry for diff too.
address@hidden On older systems, only "info diff" works, not "info diffutils".
address@hidden,, Diff, diff, Comparing and Merging Files}, for more
+information about the @command{diff} program.
 
   The output of the @code{diff} command is shown using a major mode
 called Diff mode.  @xref{Diff Mode}.

=== modified file 'doc/emacs/rmail.texi'
--- a/doc/emacs/rmail.texi      2013-01-01 09:11:05 +0000
+++ b/doc/emacs/rmail.texi      2013-06-24 06:52:33 +0000
@@ -1370,6 +1370,7 @@
 or IMAP4 protocol, and can retrieve mail from them using a TLS
 encrypted channel.  It also accepts mailbox arguments in @acronym{URL}
 form.  The detailed description of mailbox @acronym{URL}s can be found
address@hidden Note this node seems to be missing in some versions of 
mailutils.info?
 in @ref{URL,,,mailutils,Mailbox URL Formats}.  In short, a
 @acronym{URL} is:
 

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2013-06-23 19:24:27 +0000
+++ b/doc/lispref/ChangeLog     2013-06-24 06:58:52 +0000
@@ -1,3 +1,11 @@
+2013-06-24  Glenn Morris  <address@hidden>
+
+       * loading.texi (Autoload): Fix typo.
+
+       * variables.texi (Lexical Binding): Fix typo.
+
+       * functions.texi (Anonymous Functions): Put back ' removed 2012-10-23.
+
 2013-06-23  Lars Magne Ingebrigtsen  <address@hidden>
 
        * display.texi (ImageMagick Images): Mention :max-width and

=== modified file 'doc/lispref/functions.texi'
--- a/doc/lispref/functions.texi        2013-05-29 00:24:50 +0000
+++ b/doc/lispref/functions.texi        2013-06-24 06:58:52 +0000
@@ -974,10 +974,11 @@
 compiled.  This would not happen if, say, you had constructed the
 anonymous function by quoting it as a list:
 
address@hidden Do not unquote this lambda!
 @example
 @group
 (defun double-property (symbol prop)
-  (change-property symbol prop (lambda (x) (* 2 x))))
+  (change-property symbol prop '(lambda (x) (* 2 x))))
 @end group
 @end example
 

=== modified file 'doc/lispref/loading.texi'
--- a/doc/lispref/loading.texi  2013-06-13 22:24:52 +0000
+++ b/doc/lispref/loading.texi  2013-06-24 06:58:52 +0000
@@ -461,7 +461,7 @@
 symbol @var{function}.
 
 @cindex function cell in autoload
-if @var{function} already has non-void function definition that is not
+If @var{function} already has a non-void function definition that is not
 an autoload object, this function does nothing and returns @code{nil}.
 Otherwise, it constructs an autoload object (@pxref{Autoload Type}),
 and stores it as the function definition for @var{function}.  The

=== modified file 'doc/lispref/variables.texi'
--- a/doc/lispref/variables.texi        2013-02-27 12:12:20 +0000
+++ b/doc/lispref/variables.texi        2013-06-12 01:25:53 +0000
@@ -988,7 +988,7 @@
   (setq my-ticker (lambda ()
                     (setq x (1+ x)))))
     @result{} (closure ((x . 0) t) ()
-          (1+ x))
+          (setq x (1+ x)))
 
 (funcall my-ticker)
     @result{} 1

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2013-06-23 01:48:23 +0000
+++ b/doc/misc/ChangeLog        2013-06-24 06:58:52 +0000
@@ -1,3 +1,7 @@
+2013-06-24  Glenn Morris  <address@hidden>
+
+       * eshell.texi: Fix cross-references to other manuals.
+
 2013-06-23  Glenn Morris  <address@hidden>
 
        * Makefile.in (HTML_TARGETS, html, emacs-faq.html, emacs-faq):

=== modified file 'doc/misc/eshell.texi'
--- a/doc/misc/eshell.texi      2013-06-10 02:41:49 +0000
+++ b/doc/misc/eshell.texi      2013-06-24 06:58:52 +0000
@@ -378,12 +378,13 @@
 
 @item define
 @cmindex define
-Define a varalias.  @xref{Variable Aliases, , , elisp}.
+Define a varalias.
address@hidden Aliases, , , elisp, The Emacs Lisp Reference Manual}.
 
 @item diff
 @cmindex diff
 Use Emacs's internal @code{diff} (not to be confused with
address@hidden).  @xref{Comparing Files, , , elisp}.
address@hidden).  @xref{Comparing Files, , , emacs, The GNU Emacs Manual}.
 
 @item grep
 @cmindex grep
@@ -422,15 +423,18 @@
 @item locate
 @cmindex locate
 Alias to Emacs's @code{locate} function, which simply runs the external
address@hidden command and parses the results.  @xref{Dired and `find', , , 
elisp}.
address@hidden command and parses the results.
address@hidden and Find, , , emacs, The GNU Emacs Manual}.
 
 @item make
 @cmindex make
-Run @command{make} through @code{compile}.  @xref{Running Compilations under 
Emacs, , , elisp}.
+Run @command{make} through @code{compile}.
address@hidden, , , emacs, The GNU Emacs Manual}.
 
 @item occur
 @cmindex occur
-Alias to Emacs's @code{occur}.  @xref{Other Search-and-Loop Commands, , , 
elisp}.
+Alias to Emacs's @code{occur}.
address@hidden Repeating Search, , , emacs, The GNU Emacs Manual}.
 
 @item printnl
 @cmindex printnl
@@ -648,7 +652,8 @@
 
 @item $#var
 Expands to the length of the value bound to @code{var}.  Raises an error
-if the value is not a sequence (@pxref{Sequences Arrays and Vectors, 
Sequences, , elisp}).
+if the value is not a sequence
+(@pxref{Sequences Arrays Vectors, Sequences, , elisp, The Emacs Lisp Reference 
Manual}).
 
 @item $(lisp)
 Expands to the result of evaluating the S-expression @code{(lisp)}.  On
@@ -680,7 +685,8 @@
 
 @item $var[hello]
 Calls @code{assoc} on @code{var} with @code{"hello"}, expecting it to be
-an alist (@pxref{Association List Type, Association Lists, , elisp}).
+an alist (@pxref{Association List Type, Association Lists, , elisp,
+The Emacs Lisp Reference Manual}).
 
 @item $#var[hello]
 Returns the length of the cdr of the element of @code{var} who car is equal
@@ -693,9 +699,11 @@
 Eshell's globbing syntax is very similar to that of Zsh.  Users coming
 from Bash can still use Bash-style globbing, as there are no
 incompatibilities.  Most globbing is pattern-based expansion, but there
-is also predicate-based expansion.  See @ref{Filename Generation, , , zsh}
+is also predicate-based expansion.  See
address@hidden Generation, , , zsh, The Z Shell Manual}
 for full syntax.  To customize the syntax and behaviour of globbing in
-Eshell see the address@hidden@xref{Customization Settings, Customize, , 
elisp}.}
+Eshell see the address@hidden@xref{Easy Customization, , , emacs,
+The GNU Emacs Manual}.}
 groups ``eshell-glob'' and ``eshell-pred''.
 
 @node Input/Output
@@ -757,7 +765,8 @@
 and to provide a common parent Customize group for the
 address@hidden provides a similar module facility.}  An Eshell
 module is defined the same as any other library but one requirement: the
-module must define a address@hidden@xref{Customization Settings, Customize, , 
elisp}.}
+module must define a address@hidden@xref{Customization, , ,
+elisp, The Emacs Lisp Reference Manual}.}
 group using @code{eshell-defgroup} (in place of @code{defgroup}) with
 @code{eshell-module} as the parent address@hidden the module has
 no user-customizable options, then there is no need to define it as an