From edfaf7c0e39361a10eb4bdbe7f5bbd0d45df05ed Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 11 Jun 2013 21:23:16 -0400 Subject: [PATCH 01/10] * doc/lispref/functions.texi (Anonymous Functions): Put back ' over-enthusiastically removed 2012-10-23. --- doc/lispref/ChangeLog | 4 ++++ doc/lispref/functions.texi | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 36dd05b125a..751e4f9885b 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2013-06-12 Glenn Morris + + * functions.texi (Anonymous Functions): Put back ' removed 2012-10-23. + 2013-03-12 Glenn Morris * elisp.texi: Add some stuff specific to www.gnu.org. diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi index 999923f5b84..dc425031af3 100644 --- a/doc/lispref/functions.texi +++ b/doc/lispref/functions.texi @@ -975,10 +975,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 From 611e8a48541d27e24e89facadae4822f6c39285d Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 11 Jun 2013 21:25:53 -0400 Subject: [PATCH 02/10] * doc/lispref/variables.texi (Lexical Binding): Fix typo. --- doc/lispref/ChangeLog | 2 ++ doc/lispref/variables.texi | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 751e4f9885b..8b1bfa6be40 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,5 +1,7 @@ 2013-06-12 Glenn Morris + * variables.texi (Lexical Binding): Fix typo. + * functions.texi (Anonymous Functions): Put back ' removed 2012-10-23. 2013-03-12 Glenn Morris diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi index 4bcf7985f0c..4a38fa9ccd5 100644 --- a/doc/lispref/variables.texi +++ b/doc/lispref/variables.texi @@ -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 From e8b3825d3db5b05c858dff492ad43c096d63ee65 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 18 Jun 2013 20:45:10 -0700 Subject: [PATCH 03/10] * doc/lispref/loading.texi (Autoload): Fix typo. --- doc/lispref/ChangeLog | 4 ++++ doc/lispref/loading.texi | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 8b1bfa6be40..b851b869ed4 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2013-06-19 Glenn Morris + + * loading.texi (Autoload): Fix typo. + 2013-06-12 Glenn Morris * variables.texi (Lexical Binding): Fix typo. diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi index 8c2c8498a5c..060e3b813a9 100644 --- a/doc/lispref/loading.texi +++ b/doc/lispref/loading.texi @@ -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 From ab6a27d8790f43e45194ab3c2ed7b3e1130f3718 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 21 Jun 2013 20:28:07 -0400 Subject: [PATCH 04/10] * configure.ac: Include X11/X.h when testing for Xft.h. Fixes: debbugs:14684 --- ChangeLog | 4 ++++ configure.ac | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2a7f2b0e546..45b6c9152b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-06-22 Glenn Morris + + * configure.ac: Include X11/X.h when testing for Xft.h. (Bug#14684) + 2013-03-11 Glenn Morris * Version 24.3 released. diff --git a/configure.ac b/configure.ac index 62f53a3fac2..0ab66a70c7a 100644 --- a/configure.ac +++ b/configure.ac @@ -2425,7 +2425,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 ]]) if test "${HAVE_XFT}" = "yes"; then AC_DEFINE(HAVE_XFT, 1, [Define to 1 if you have the Xft library.]) From e6b4a89e78d38315b199414da27d88437dc54a71 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 22 Jun 2013 07:17:30 -0400 Subject: [PATCH 05/10] Auto-commit of generated files. --- autogen/configure | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/autogen/configure b/autogen/configure index 59136ff758a..b674278b91b 100755 --- a/autogen/configure +++ b/autogen/configure @@ -11993,7 +11993,8 @@ fi CFLAGS="$CFLAGS $XFT_CFLAGS" XFT_LIBS="-lXrender $XFT_LIBS" LIBS="$XFT_LIBS $LIBS" - ac_fn_c_check_header_mongrel "$LINENO" "X11/Xft/Xft.h" "ac_cv_header_X11_Xft_Xft_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$LINENO" "X11/Xft/Xft.h" "ac_cv_header_X11_Xft_Xft_h" "#include +" if test "x$ac_cv_header_X11_Xft_Xft_h" = x""yes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XftFontOpen in -lXft" >&5 $as_echo_n "checking for XftFontOpen in -lXft... " >&6; } From 7eeeb7ddc9b6d5d04a36f6a279464b2a552dfeaf Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 23 Jun 2013 17:42:12 -0700 Subject: [PATCH 06/10] * doc/misc/eshell.texi: Fix cross-references to other manuals. --- doc/misc/ChangeLog | 4 ++++ doc/misc/eshell.texi | 29 +++++++++++++++++++---------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 2a62dc852e9..b2624e7b05a 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2013-06-24 Glenn Morris + + * eshell.texi: Fix cross-references to other manuals. + 2013-03-11 Glenn Morris * Version 24.3 released. diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi index d24cdc216b5..688a547feeb 100644 --- a/doc/misc/eshell.texi +++ b/doc/misc/eshell.texi @@ -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 @@ -647,7 +651,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 @@ -679,7 +684,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 @@ -692,9 +698,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 @@ -738,7 +746,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 From 07f8499f767e61f89b831cb3850e0005df357d77 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 23 Jun 2013 19:24:40 -0700 Subject: [PATCH 07/10] * doc/emacs/files.texi: Comment. --- doc/emacs/files.texi | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index a85c16ee1bc..3e92d4d4687 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -1253,9 +1253,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}. From a4c0de97dc360428b9640c512d1368c63ee70be3 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 23 Jun 2013 19:26:57 -0700 Subject: [PATCH 08/10] * doc/misc/eudc.texi (Overview, Creating BBDB Records): Restrict bbdb cross-ref to info output. It's not very important, and gives broken links in the html version. --- doc/misc/ChangeLog | 3 +++ doc/misc/eudc.texi | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index b2624e7b05a..514cd616aa2 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,5 +1,8 @@ 2013-06-24 Glenn Morris + * eudc.texi (Overview, Creating BBDB Records): + Restrict bbdb cross-ref to info output. + * eshell.texi: Fix cross-references to other manuals. 2013-03-11 Glenn Morris diff --git a/doc/misc/eudc.texi b/doc/misc/eudc.texi index 03438eab58d..c9c4af5722e 100644 --- a/doc/misc/eudc.texi +++ b/doc/misc/eudc.texi @@ -104,7 +104,9 @@ inline query Fast minibuffer queries for email addresses and phone numbers @item Interface to BBDB to let you insert server records into your own BBDB database +@ifinfo (@pxref{Top,,BBDB,bbdb,BBDB Manual}) +@end ifinfo @end itemize @menu @@ -730,7 +732,10 @@ that all available servers should be tried. @findex eudc-insert-record-at-point-into-bbdb @findex eudc-try-bbdb-insert With EUDC, you can automatically create BBDB records -(@pxref{Top,,BBDB,bbdb,BBDB Manual}) from records you get from a +@ifinfo +(@pxref{Top,,BBDB,bbdb,BBDB Manual}) +@end ifinfo +from records you get from a directory server. You do this by moving point to the appropriate record in a query result display buffer and invoking the command @kbd{M-x eudc-insert-record-at-point-into-bbdb} with the From 8009a04a1546aa5ca7202ea9731d9ff28b43b184 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 23 Jun 2013 19:38:45 -0700 Subject: [PATCH 09/10] Revert previous change --- doc/misc/ChangeLog | 3 --- doc/misc/eudc.texi | 7 +------ 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 514cd616aa2..b2624e7b05a 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,8 +1,5 @@ 2013-06-24 Glenn Morris - * eudc.texi (Overview, Creating BBDB Records): - Restrict bbdb cross-ref to info output. - * eshell.texi: Fix cross-references to other manuals. 2013-03-11 Glenn Morris diff --git a/doc/misc/eudc.texi b/doc/misc/eudc.texi index c9c4af5722e..03438eab58d 100644 --- a/doc/misc/eudc.texi +++ b/doc/misc/eudc.texi @@ -104,9 +104,7 @@ inline query Fast minibuffer queries for email addresses and phone numbers @item Interface to BBDB to let you insert server records into your own BBDB database -@ifinfo (@pxref{Top,,BBDB,bbdb,BBDB Manual}) -@end ifinfo @end itemize @menu @@ -732,10 +730,7 @@ that all available servers should be tried. @findex eudc-insert-record-at-point-into-bbdb @findex eudc-try-bbdb-insert With EUDC, you can automatically create BBDB records -@ifinfo -(@pxref{Top,,BBDB,bbdb,BBDB Manual}) -@end ifinfo -from records you get from a +(@pxref{Top,,BBDB,bbdb,BBDB Manual}) from records you get from a directory server. You do this by moving point to the appropriate record in a query result display buffer and invoking the command @kbd{M-x eudc-insert-record-at-point-into-bbdb} with the From 9dc3215fab2989509ce14e6eb7c1d616d2c7c5b3 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 23 Jun 2013 23:52:33 -0700 Subject: [PATCH 10/10] * doc/emacs/rmail.texi: Comment --- doc/emacs/rmail.texi | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi index f80f9e175fa..62f35b2ee83 100644 --- a/doc/emacs/rmail.texi +++ b/doc/emacs/rmail.texi @@ -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: