Merge from emacs-24; up to 2012-12-29T06:14:00Z!cyd@gnu.org
This commit is contained in:
Glenn Morris
commit
f99f7826a0
10 changed files with 48 additions and 17 deletions
|
|
@ -1,3 +1,7 @@
|
|||
2013-06-24 Glenn Morris <rgm@fencepost.gnu.org>
|
||||
|
||||
* configure.ac: Include X11/X.h when testing for Xft.h. (Bug#14684)
|
||||
|
||||
2013-06-22 Juanma Barranquero <lekktu@gmail.com>
|
||||
|
||||
* .bzrignore: Add GNU idutils ID database file.
|
||||
|
|
|
|||
|
|
@ -2644,7 +2644,8 @@ if test "${HAVE_X11}" = "yes"; then
|
|||
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.])
|
||||
|
|
|
|||
|
|
@ -1267,9 +1267,12 @@ minibuffer, and displays the differences between the two files in a
|
|||
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
|
||||
@code{"-c"} to specify a context diff. @xref{Top,, Diff, diff,
|
||||
Comparing and Merging Files}, for more information about the
|
||||
@command{diff} program.
|
||||
@code{"-c"} to specify a context diff.
|
||||
@c Note that the actual name of the info file is diffutils.info,
|
||||
@c but it adds a dir entry for diff too.
|
||||
@c On older systems, only "info diff" works, not "info diffutils".
|
||||
@xref{Top,, 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}.
|
||||
|
|
|
|||
|
|
@ -1370,6 +1370,7 @@ mailboxes, etc. It is able to access remote mailboxes using the POP3
|
|||
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
|
||||
@c 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:
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,11 @@
|
|||
2013-06-24 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* 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 <larsi@gnus.org>
|
||||
|
||||
* display.texi (ImageMagick Images): Mention :max-width and
|
||||
|
|
|
|||
|
|
@ -974,10 +974,11 @@ Note that we do not quote the @code{lambda} form.
|
|||
compiled. This would not happen if, say, you had constructed the
|
||||
anonymous function by quoting it as a list:
|
||||
|
||||
@c 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
|
||||
|
||||
|
|
|
|||
|
|
@ -461,7 +461,7 @@ and calls @code{define-key}; not even if the variable name is the same
|
|||
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
|
||||
|
|
|
|||
|
|
@ -988,7 +988,7 @@ Here is an example:
|
|||
(setq my-ticker (lambda ()
|
||||
(setq x (1+ x)))))
|
||||
@result{} (closure ((x . 0) t) ()
|
||||
(1+ x))
|
||||
(setq x (1+ x)))
|
||||
|
||||
(funcall my-ticker)
|
||||
@result{} 1
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
2013-06-24 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* eshell.texi: Fix cross-references to other manuals.
|
||||
|
||||
2013-06-23 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* Makefile.in (HTML_TARGETS, html, emacs-faq.html, emacs-faq):
|
||||
|
|
|
|||
|
|
@ -378,12 +378,13 @@ Similar to, but slightly different from, the GNU Coreutils
|
|||
|
||||
@item define
|
||||
@cmindex define
|
||||
Define a varalias. @xref{Variable Aliases, , , elisp}.
|
||||
Define a varalias.
|
||||
@xref{Variable Aliases, , , elisp, The Emacs Lisp Reference Manual}.
|
||||
|
||||
@item diff
|
||||
@cmindex diff
|
||||
Use Emacs's internal @code{diff} (not to be confused with
|
||||
@code{ediff}). @xref{Comparing Files, , , elisp}.
|
||||
@code{ediff}). @xref{Comparing Files, , , emacs, The GNU Emacs Manual}.
|
||||
|
||||
@item grep
|
||||
@cmindex grep
|
||||
|
|
@ -422,15 +423,18 @@ and @code{("foo" "bar")} both evaluate to @code{("foo" "bar")}.
|
|||
@item locate
|
||||
@cmindex locate
|
||||
Alias to Emacs's @code{locate} function, which simply runs the external
|
||||
@command{locate} command and parses the results. @xref{Dired and `find', , , elisp}.
|
||||
@command{locate} command and parses the results.
|
||||
@xref{Dired 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}.
|
||||
@xref{Compilation, , , 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}.
|
||||
@xref{Other Repeating Search, , , emacs, The GNU Emacs Manual}.
|
||||
|
||||
@item printnl
|
||||
@cmindex printnl
|
||||
|
|
@ -648,7 +652,8 @@ variables in command invocations.
|
|||
|
||||
@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 @@ any regular expression. So to split on numbers, use @samp{$var["[0-9]+" 10 20]}
|
|||
|
||||
@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 @@ to @code{"hello"}.
|
|||
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
|
||||
@ref{Filename Generation, , , zsh, The Z Shell Manual}
|
||||
for full syntax. To customize the syntax and behaviour of globbing in
|
||||
Eshell see the Customize@footnote{@xref{Customization Settings, Customize, , elisp}.}
|
||||
Eshell see the Customize@footnote{@xref{Easy Customization, , , emacs,
|
||||
The GNU Emacs Manual}.}
|
||||
groups ``eshell-glob'' and ``eshell-pred''.
|
||||
|
||||
@node Input/Output
|
||||
|
|
@ -757,7 +765,8 @@ can be disabled and enabled without having to unload and reload them,
|
|||
and to provide a common parent Customize group for the
|
||||
modules.@footnote{ERC provides a similar module facility.} An Eshell
|
||||
module is defined the same as any other library but one requirement: the
|
||||
module must define a Customize@footnote{@xref{Customization Settings, Customize, , elisp}.}
|
||||
module must define a Customize@footnote{@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 group.@footnote{If the module has
|
||||
no user-customizable options, then there is no need to define it as an
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue