From c978536f741b75ff44639f723984abf983d9063a Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Mon, 18 Oct 2010 17:07:31 -0400 Subject: * src/frame.c (Fframe_pointer_visible_p): Add `frame-pointer-visible-p' to get the pointer visibility. --- doc/lispref/frames.texi | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'doc') diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index d27010d2096..4c44d0a6439 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -1748,6 +1748,15 @@ If @var{frame} is not visible, this function does nothing. The return value is not significant. @end defun +@defun frame-pointer-visible-p &optional frame +This predicate function returns non-@code{nil} if the mouse pointer +displayed on @var{frame} is visible; otherwise it returns @code{nil}. +@var{frame} omitted or @code{nil} means the selected frame. This is +useful when @code{make-pointer-invisible} is set to @code{t}: it +allows to know if the pointer has been hidden. +@xref{Mouse Avoidance,,,emacs}. +@end defun + @need 3000 @node Pop-Up Menus -- cgit v1.2.1 From 7cad71ad21f4ee07ff4652c9e39ebf4510e0216b Mon Sep 17 00:00:00 2001 From: Gnus developers Date: Mon, 18 Oct 2010 22:09:28 +0000 Subject: Merge changes made in Gnus trunk. gnus-art.el: Make the "dumbquotes" translation work again. gnus-registry.el (gnus-registry-split-fancy-with-parent): Splitting according to references/in-reply-to obeys the ignore-groups variable, while splitting by sender and subject do not. nnimap.el (nnimap-request-group): Don't SELECT the group twice on `M-g'. nnimap.el (nnimap-update-info): Update flags/read marks even if \* isn't part of the permanent marks. gnus-coding.texi (Gnus Maintainance Guide): Update to mention Emacs bzr/Gnus git sync. gnus-delay.el (gnus-delay-article): Remove superfluous `group' binding. gnus-art.el (gnus-article-make-menu-bar): The article/group menus aren't so wide as to need to switch off the edit menu. --- doc/misc/ChangeLog | 5 +++++ doc/misc/gnus-coding.texi | 34 +++++++++++++++++++--------------- 2 files changed, 24 insertions(+), 15 deletions(-) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index df6e478a34e..76051efef27 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,8 @@ +2010-10-18 Lars Magne Ingebrigtsen + + * gnus-coding.texi (Gnus Maintainance Guide): Update to mention Emacs + bzr/Gnus git sync. + 2010-10-15 Eli Zaretskii * auth.texi (GnuPG and EasyPG Assistant Configuration): Fix last diff --git a/doc/misc/gnus-coding.texi b/doc/misc/gnus-coding.texi index 22b74c900b0..f513bc15a24 100644 --- a/doc/misc/gnus-coding.texi +++ b/doc/misc/gnus-coding.texi @@ -288,14 +288,21 @@ Emacs repository might have been lost. With the inclusion of Gnus 5.10, Miles Bader has set up an Emacs-Gnus gateway to ensure the bug fixes from Emacs CVS are propagated to Gnus -CVS semi-automatically. These bug fixes are installed on the stable -branch and on the trunk. Basically the idea is that the gateway will -cause all common files in Emacs and Gnus v5-10 to be identical except -when there's a very good reason (e.g., the Gnus version string in Emacs -says @samp{5.11}, but the v5-10 version string remains @samp{5.10.x}). -Furthermore, all changes in these files in either Emacs or the v5-10 -branch will be installed into the Gnus CVS trunk, again except where -there's a good reason. +CVS semi-automatically. + +After Emacs moved to bzr and Gnus moved to git, Katsumi Yamaoka has +taken over the chore of keeping Emacs and Gnus in sync. In general, +changes made to one repository will usually be replicated in the other +within a few days. + +Basically the idea is that the gateway will cause all common files in +Emacs and Gnus v5-13 to be identical except when there's a very good +reason (e.g., the Gnus version string in Emacs says @samp{5.11}, but +the v5-13 version string remains @samp{5.13.x}). Furthermore, all +changes in these files in either Emacs or the v5-13 branch will be +installed into the Gnus git trunk, again except where there's a good +reason. + @c (typically so far the only exception has been that the changes @c already exist in the trunk in modified form). Because of this, when the next major version of Gnus will be included in @@ -311,9 +318,9 @@ If it's a file which is thought of as being outside of Gnus (e.g., the new @file{encrypt.el}), you should probably make the change in the Emacs tree, and it will show up in the Gnus tree a few days later. -If you don't have Emacs CVS access (or it's inconvenient), you can +If you don't have Emacs bzr access (or it's inconvenient), you can change such a file in the v5-10 branch, and it should propagate to Emacs -CVS -- however, it will get some extra scrutiny (by Miles) to see if the +bzr -- however, it will get some extra scrutiny (by Miles) to see if the changes are possibly controversial and need discussion on the mailing list. Many changes are obvious bug-fixes however, so often there won't be any problem. @@ -321,12 +328,12 @@ be any problem. @item If it's to a Gnus file, and it's important enough that it should be part of Emacs and the v5-10 branch, then you can make the change on the v5-10 -branch, and it will go into Emacs CVS and the Gnus CVS trunk (a few days +branch, and it will go into Emacs bzr and the Gnus git trunk (a few days later). The most prominent examples for such changes are bug-fixed including improvements on the documentation. If you know that there will be conflicts (perhaps because the affected -source code is different in v5-10 and the Gnus CVS trunk), then you can +source code is different in v5-10 and the Gnus git trunk), then you can install your change in both places, and when I try to sync them, there will be a conflict -- however, since in most such cases there would be a conflict @emph{anyway}, it's often easier for me to resolve it simply if @@ -338,9 +345,6 @@ For general Gnus development changes, of course you just make the change on the Gnus Git trunk and it goes into Emacs a few years later... :-) -With the new Git repository, we'll probably set up something to -automatically synchronize with Emacs when possible. CVS was much less -powerful for this kind of synchronization. @end itemize Of course in any case, if you just can't wait for me to sync your -- cgit v1.2.1 From 2e76c12c577989479dc497fc3afdef3e04b263a1 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Tue, 19 Oct 2010 22:20:47 +0000 Subject: Merge changes made in Gnus trunk. gnus.texi (Customizing the IMAP Connection): The port strings are strings. nnmairix.el (nnmairix-summary-mode-hook): Move nnmairix's `$' command to `G G' to avoid collisions. shr.el (shr-parse-style, shr-tag-span): New functions. nndoc.el (nndoc-type-alist): Add git support. (nndoc-git-type-p, nndoc-transform-git-article, nndoc-transform-git-headers): New functions. --- doc/misc/gnus.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 1a1f0d48eb9..c0b504ef5b3 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -14872,7 +14872,7 @@ The address of the server, like @samp{imap.gmail.com}. @item nnimap-server-port If the server uses a non-standard port, that can be specified here. A -typical port would be @samp{imap} or @samp{imaps}. +typical port would be @code{"imap"} or @code{"imaps"}. @item nnimap-stream How @code{nnimap} should connect to the server. Possible values are: -- cgit v1.2.1 From da4517871646b9d2d8549367925fbde40d83b2f3 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Tue, 19 Oct 2010 22:30:29 +0000 Subject: Update. --- doc/misc/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 76051efef27..421b47b309f 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,8 @@ +2010-10-19 Lars Magne Ingebrigtsen + + * gnus.texi (Customizing the IMAP Connection): The port strings are + strings. + 2010-10-18 Lars Magne Ingebrigtsen * gnus-coding.texi (Gnus Maintainance Guide): Update to mention Emacs -- cgit v1.2.1 From c872595d34c5254408a0e8197f9869a53a5f4b34 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Tue, 19 Oct 2010 23:06:50 +0000 Subject: nndoc.el (nndoc-transform-git-headers): Generate Subject headers. gnus.texi (Document Groups): Mention git. --- doc/misc/ChangeLog | 1 + doc/misc/gnus.texi | 4 ++++ 2 files changed, 5 insertions(+) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 421b47b309f..85c1e7883a6 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -2,6 +2,7 @@ * gnus.texi (Customizing the IMAP Connection): The port strings are strings. + (Document Groups): Mention git. 2010-10-18 Lars Magne Ingebrigtsen diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index c0b504ef5b3..39693204da3 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -17969,6 +17969,10 @@ A @acronym{MIME} digest of messages. @item lanl-gov-announce Announcement messages from LANL Gov Announce. +@cindex git commit messages +@item git +@code{git} commit messages. + @cindex forwarded messages @item rfc822-forward A message forwarded according to RFC822. -- cgit v1.2.1 From ba91f05dd8e1e92f5c568458810d2d3200dd0226 Mon Sep 17 00:00:00 2001 From: Gnus developers Date: Wed, 20 Oct 2010 10:31:10 +0000 Subject: emacs-mime.texi (Flowed text): Add a note about mml-enable-flowed variable. gnus/ChangeLog (2010-10-15): Fix typo in changelog. gnus-draft.el (gnus-draft-check-draft-articles): Don't unnecessarily run file-truename on remote files when checking drafts. --- doc/misc/ChangeLog | 5 +++++ doc/misc/emacs-mime.texi | 4 ++++ 2 files changed, 9 insertions(+) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 85c1e7883a6..1737ce35703 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,8 @@ +2010-10-20 Julien Danjou + + * emacs-mime.texi (Flowed text): Add a note about mml-enable-flowed + variable. + 2010-10-19 Lars Magne Ingebrigtsen * gnus.texi (Customizing the IMAP Connection): The port strings are diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi index 475ce2bb53f..9511f6d10c0 100644 --- a/doc/misc/emacs-mime.texi +++ b/doc/misc/emacs-mime.texi @@ -1040,6 +1040,10 @@ flowed text, the default is to wrap after 66 characters. If hard newline characters are not present in the buffer, no flow encoding occurs. +You can customize the value of the @code{mml-enable-flowed} variable +to enable or disable the flowed encoding usage when newline +characteres are present in the buffer. + On decoding flowed text, lines with soft newline characters are filled together and wrapped after the column decided by @code{fill-flowed-display-column}. The default is to wrap after -- cgit v1.2.1 From 2526f423795632d123f3cd99e9aa45065b41745b Mon Sep 17 00:00:00 2001 From: Gnus developers Date: Wed, 20 Oct 2010 22:29:38 +0000 Subject: Merge changes made in Gnus trunk. nnimap.el (nnimap-insert-partial-structure): Fix boundary detection. spam.el (spam-list-of-processors): Mark as obsolete. gnus-art.el (gnus-blocked-images): New function. Allow the `gnus-blocked-images' to be a function. gnus-art.el (gnus-article-wash-function): Remove it, and use `mm-text-html-renderer' instead. mm-decode.el (mm-inline-text-html-renderer): Removed. mm-decode.el (mm-inline-media-tests): Removed use. mm-view.el (mm-inline-text-html): Removed use. mm-view.el (mm-text-html-renderer-alist): Add the `shr' and `gnus-w3m' symbols. gnus.texi (Article Washing): shr and gnus-w3m, not the direct function names. gnus-art.el (article-wash-html): Simplify and remove the charset stuff. Use the normal html rendering code instead of the special html washing code. mm-view.el (mm-text-html-washer-alist): Removed. gnus-news.texi: Mention that mm-text-html-renderer is the only HTML variable now. shr.el (shr-tag-table): Remove useless nconc. --- doc/misc/ChangeLog | 6 ++++++ doc/misc/gnus-news.texi | 3 +++ doc/misc/gnus.texi | 22 ++++++++++++---------- 3 files changed, 21 insertions(+), 10 deletions(-) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 1737ce35703..2272f6a3296 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,9 @@ +2010-10-20 Lars Magne Ingebrigtsen + + * gnus.texi (HTML): Document the function value of + gnus-blocked-images. + (Article Washing): shr and gnus-w3m, not the direct function names. + 2010-10-20 Julien Danjou * emacs-mime.texi (Flowed text): Add a note about mml-enable-flowed diff --git a/doc/misc/gnus-news.texi b/doc/misc/gnus-news.texi index 1136d52e51d..19483f51426 100644 --- a/doc/misc/gnus-news.texi +++ b/doc/misc/gnus-news.texi @@ -124,6 +124,9 @@ Customization}. @itemize @bullet +@item There's now only one variable that determines how @acronym{HTML} +is rendered: @code{mm-text-html-renderer}. + @item Gnus now supports sticky article buffers. Those are article buffers that are not reused when you select another article. @xref{Sticky Articles}. diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 39693204da3..2cd45b4f2e0 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -9803,19 +9803,16 @@ If a prefix is given, a charset will be asked for. If it is a number, the charset defined in @code{gnus-summary-show-article-charset-alist} (@pxref{Paging the Article}) will be used. -@vindex gnus-article-wash-function The default is to use the function specified by @code{mm-text-html-renderer} (@pxref{Display Customization, ,Display Customization, emacs-mime, The Emacs MIME Manual}) to convert the -@acronym{HTML}, but this is controlled by the -@code{gnus-article-wash-function} variable. Pre-defined functions you -can use include: +@acronym{HTML}. Pre-defined functions you can use include: @table @code -@item mm-shr +@item shr Use Gnus simple html renderer. -@item gnus-article-html +@item gnus-w3m Use Gnus rendered based on w3m. @item w3 @@ -12462,15 +12459,20 @@ that's based on @code{w3m}. @item gnus-blocked-images @vindex gnus-blocked-images -Images that have @acronym{URL}s that match this regexp won't be -fetched and displayed. For instance, do block all @acronym{URL}s that -have the string ``ads'' in them, do the following: +External images that have @acronym{URL}s that match this regexp won't +be fetched and displayed. For instance, do block all @acronym{URL}s +that have the string ``ads'' in them, do the following: @lisp (setq gnus-blocked-images "ads") @end lisp -The default is to block all external images. +This can also be a function to be evaluated. If so, it will be +called with the group name as the parameter. The default value is +@code{gnus-block-private-groups}, which will return @samp{"."} for +anything that isn't a newsgroup. This means that no external images +will be fetched as a result of reading mail, so that nobody can use +web bugs (and the like) to track whether you've read email. @item gnus-html-cache-directory @vindex gnus-html-cache-directory -- cgit v1.2.1 From b79bbef7add92e2c9e6f6e891dd2fa06d54f55ac Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Thu, 21 Oct 2010 00:33:40 +0000 Subject: gnus.texi (RSS): Remove nnrss-wash-html-in-text-plain-parts. --- doc/misc/ChangeLog | 4 ++++ doc/misc/gnus.texi | 9 --------- 2 files changed, 4 insertions(+), 9 deletions(-) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 2272f6a3296..31310d9725f 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2010-10-21 Katsumi Yamaoka + + * gnus.texi (RSS): Remove nnrss-wash-html-in-text-plain-parts. + 2010-10-20 Lars Magne Ingebrigtsen * gnus.texi (HTML): Document the function value of diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 2cd45b4f2e0..7b642aefda0 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -17713,15 +17713,6 @@ If you set @code{nnrss-use-local} to @code{t}, @code{nnrss} will read the feeds from local files in @code{nnrss-directory}. You can use the command @code{nnrss-generate-download-script} to generate a download script using @command{wget}. - -@item nnrss-wash-html-in-text-plain-parts -Non-@code{nil} means that @code{nnrss} renders text in @samp{text/plain} -parts as @acronym{HTML}. The function specified by the -@code{mm-text-html-renderer} variable (@pxref{Display Customization, -,Display Customization, emacs-mime, The Emacs MIME Manual}) will be used -to render text. If it is @code{nil}, which is the default, text will -simply be folded. Leave it @code{nil} if you prefer to see -@samp{text/html} parts. @end table The following code may be helpful, if you want to show the description in -- cgit v1.2.1 From d5798f68ccc1fa853437af6398cf43b399688c4d Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Thu, 21 Oct 2010 02:31:33 +0000 Subject: gnus-news.texi: Mention new archive defaults. --- doc/misc/ChangeLog | 4 ++++ doc/misc/gnus-news.texi | 3 +++ 2 files changed, 7 insertions(+) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 31310d9725f..5327bf415e6 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2010-10-21 Lars Magne Ingebrigtsen + + * gnus-news.texi: Mention new archive defaults. + 2010-10-21 Katsumi Yamaoka * gnus.texi (RSS): Remove nnrss-wash-html-in-text-plain-parts. diff --git a/doc/misc/gnus-news.texi b/doc/misc/gnus-news.texi index 19483f51426..6037a979acb 100644 --- a/doc/misc/gnus-news.texi +++ b/doc/misc/gnus-news.texi @@ -224,6 +224,9 @@ that are accessible from the article buffer. @item Changes in Message mode @itemize @bullet +@item Gnus now defaults to saving all outgoing messages in per-month +nnfolder archives. + @item Gnus now supports the ``hashcash'' client puzzle anti-spam mechanism. Use @code{(setq message-generate-hashcash t)} to enable. @xref{Hashcash}. -- cgit v1.2.1 From d806c8722219298e9342c39138abc9b26dcb0d9b Mon Sep 17 00:00:00 2001 From: Gnus developers Date: Thu, 21 Oct 2010 22:12:01 +0000 Subject: message.el (message-setup-1): Allow message-default-headers to be a function. message.el (message-mode-map): Don't bind M-; to comment region, to allow the global comment-dwim to work. --- doc/misc/ChangeLog | 5 +++++ doc/misc/message.texi | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 5327bf415e6..a87fb9e610e 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,8 @@ +2010-10-21 Julien Danjou + + * message.texi (Message Headers): Allow message-default-headers to be a + function. + 2010-10-21 Lars Magne Ingebrigtsen * gnus-news.texi: Mention new archive defaults. diff --git a/doc/misc/message.texi b/doc/misc/message.texi index 8e9eca55177..76845e4aafe 100644 --- a/doc/misc/message.texi +++ b/doc/misc/message.texi @@ -1451,7 +1451,7 @@ Allegedly. @item message-default-headers @vindex message-default-headers This string is inserted at the end of the headers in all message -buffers. +buffers. If set to a function, the returned results is inserted. @item message-subject-re-regexp @vindex message-subject-re-regexp -- cgit v1.2.1 From 89baa1df6943eb3e8b4ff2a11b1c3e2463f85849 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 22 Oct 2010 12:35:31 +0200 Subject: Document values of window-system and deprecate its use as predicate. src/frame.c (Fframep, Fwindow_system): Deprecate use as a predicate. Document all values. src/dispnew.c (syms_of_display) : Deprecate use as a boolean flag. Document all values. src/display.texi (Window Systems): Deprecate use of window-system as a predicate. --- doc/lispref/ChangeLog | 5 +++++ doc/lispref/display.texi | 8 ++++++++ 2 files changed, 13 insertions(+) (limited to 'doc') diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 2aca9fce5bf..ccbbe1b9c81 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2010-10-22 Eli Zaretskii + + * display.texi (Window Systems): Deprecate use of window-system as + a predicate. + 2010-09-05 Alexander Klimov (tiny change) * files.texi (Directory Names): Use \` rather than ^. diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 71680c56821..ba4cfca0854 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -5878,6 +5878,14 @@ selected frame). The list of possible symbols it returns is the same one documented for the variable @code{window-system} above. @end defun + Do @emph{not} use @code{window-system} and +@code{initial-window-system} as predicates or boolean flag variables, +if you want to write code that works differently on text terminals and +graphic displays. That is because @code{window-system} is not a good +indicator of Emacs capabilities on a given display type. Instead, use +@code{display-graphic-p} or any of the other @code{display-*-p} +predicates described in @ref{Display Feature Testing}. + @defvar window-setup-hook This variable is a normal hook which Emacs runs after handling the initialization files. Emacs runs this hook after it has completed -- cgit v1.2.1 From 88dbda519d46ea8902e7f91a6d217387cfe5a2c0 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Sat, 23 Oct 2010 01:38:34 +0200 Subject: Fix typos. * doc/misc/gnus.texi (Group Parameters, Buttons): Fix typos. * lisp/org/org-exp.el (org-export-visible): * lisp/progmodes/dcl-mode.el (dcl-electric-reindent-regexps): Fix typos in docstrings. --- doc/misc/ChangeLog | 4 ++++ doc/misc/gnus.texi | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 238cec8e82b..c3930486007 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2010-10-22 Juanma Barranquero + + * gnus.texi (Group Parameters, Buttons): Fix typos. + 2010-10-08 Glenn Morris * cl.texi (Organization, Installation, Old CL Compatibility): diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 7a917b6d2df..5bb28c5294c 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -3142,8 +3142,8 @@ The Sieve language is described in RFC 3028. @xref{Top, Emacs Sieve, Top, sieve, Emacs Sieve}. @item (agent parameters) -If the agent has been enabled, you can set any of the its parameters -to control the behavior of the agent in individual groups. See Agent +If the agent has been enabled, you can set any of its parameters to +control the behavior of the agent in individual groups. See Agent Parameters in @ref{Category Syntax}. Most users will choose to set agent parameters in either an agent category or group topic to minimize the configuration effort. @@ -23709,7 +23709,7 @@ Hook called after creating the score mode menu. @cindex mouse @cindex click -Those new-fangled @dfn{mouse} contraptions is very popular with the +Those new-fangled @dfn{mouse} contraptions are very popular with the young, hep kids who don't want to learn the proper way to do things these days. Why, I remember way back in the summer of '89, when I was using Emacs on a Tops 20 system. Three hundred users on one single -- cgit v1.2.1 From 280f417b7e9404fdc6b242e0b2edb0d3923055e6 Mon Sep 17 00:00:00 2001 From: Gnus developers Date: Sat, 23 Oct 2010 00:01:49 +0000 Subject: Merge changes made in Gnus trunk. gnus.texi (Subscription Commands): Mention that you can also subscribe to new groups via the Server buffer, which is probably more convenient when subscribing to many groups. gnus-group.el (gnus-group-mark-group): Use gnus-group-position-point instead of the summary one. shr.el (shr-tag-img): Don't bug out on images that don't have a SRC. --- doc/misc/ChangeLog | 6 ++++++ doc/misc/gnus.texi | 6 ++++++ 2 files changed, 12 insertions(+) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index a87fb9e610e..9c768950702 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,9 @@ +2010-10-22 Tassilo Horn + + * gnus.texi (Subscription Commands): Mention that you can also + subscribe to new groups via the Server buffer, which is probably more + convenient when subscribing to many groups. + 2010-10-21 Julien Danjou * message.texi (Message Headers): Allow message-default-headers to be a diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 7b642aefda0..a45ad232e65 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -2211,6 +2211,12 @@ selected. @section Subscription Commands @cindex subscription +The following commands allow for managing your subscriptions in the +Group buffer. If you want to subscribe to many groups, it's probably +more convenient to go to the @ref{Server Buffer}, and choose the +server there using @kbd{RET} or @kbd{SPC}. Then you'll have the +commands listed in @ref{Browse Foreign Server} at hand. + @table @kbd @item S t -- cgit v1.2.1 From 17284e30244d0dd635708cec51e19bafcd9a528b Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 22 Oct 2010 19:46:06 -0700 Subject: Replace digest-doc and sorted-doc C programs with Lisp commands. * lib-src/digest-doc.c, lib-src/sorted-doc.c: Remove files. * lib-src/Makefile.in (UTILITIES): Remove digest-doc and sorted-doc. (digest-doc${EXEEXT}, sorted-doc${EXEEXT}): Remove rules. * lib-src/makefile.w32-in (ALL): Remove digest-doc and sorted-doc. ($(BLD)/sorted-doc.exe, $(BLD)/digest-doc.exe, sorted-doc, digest-doc) ($(BLD)/digest-doc.$(O), $(BLD)/sorted-doc.$(O)): Remove rules. (install): Don't install digest-doc.exe or sorted-doc.exe. * lisp/help-fns.el (doc-file-to-man, doc-file-to-info): New commands. * doc/lispref/help.texi (Documentation Basics): Remove mentions of digest-doc and sorted-doc. * INSTALL, nt/README, nt/README.W32: Do not mention digest-doc and sorted-doc. * etc/NEWS: Mention this change. --- doc/lispref/ChangeLog | 5 +++++ doc/lispref/help.texi | 12 ++---------- 2 files changed, 7 insertions(+), 10 deletions(-) (limited to 'doc') diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index f5878dfed74..887578e9b5c 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2010-10-23 Glenn Morris + + * help.texi (Documentation Basics): Remove mentions of digest-doc and + sorted-doc. + 2010-10-15 Eli Zaretskii * os.texi (Dynamic Libraries): New node, with slightly modified diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi index 026258f2472..d3e289578c0 100644 --- a/doc/lispref/help.texi +++ b/doc/lispref/help.texi @@ -1,7 +1,8 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +@c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/help @node Documentation, Files, Modes, Top @@ -106,12 +107,6 @@ documentation string. The functions @code{documentation} and documentation string from the appropriate file; this is transparent to the user. -@c Wordy to prevent overfull hbox. --rjc 15mar92 - The @file{emacs/lib-src} directory contains two utilities that you can -use to print nice-looking hardcopy for the file -@file{emacs/etc/DOC-@var{version}}. These are @file{sorted-doc} and -@file{digest-doc}. - @node Accessing Documentation @section Access to Documentation Strings @@ -701,6 +696,3 @@ echo area at first, and display the longer @var{help-text} strings only if the user types the help character again. @end defopt -@ignore - arch-tag: ba36b4c2-e60f-49e2-bc25-61158fdcd815 -@end ignore -- cgit v1.2.1 From b5c575e640368d4a29c53d8a4f0cf2dab3355b9f Mon Sep 17 00:00:00 2001 From: Gnus developers Date: Sun, 24 Oct 2010 22:32:38 +0000 Subject: Merge changes made in Gnus trunk. message.el (message-default-headers): Fix type. nnimap.el (nnimap-request-head, nnimap-request-move-article): Make internal nnimap moving slightly faster. nnimap.el (nnimap-transform-headers): Don't bug out on bodiless articles. nnimap.el (nnimap-send-command): Have no outstanding messages if the IMAP server doesn't support streaming. nnimap.el (nnimap-transform-headers): Fold {quoted} strings more sloppily. --- doc/misc/message.texi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/misc/message.texi b/doc/misc/message.texi index 76845e4aafe..1fec34f147b 100644 --- a/doc/misc/message.texi +++ b/doc/misc/message.texi @@ -1450,8 +1450,10 @@ Allegedly. @item message-default-headers @vindex message-default-headers -This string is inserted at the end of the headers in all message -buffers. If set to a function, the returned results is inserted. +Header lines to be inserted in outgoing messages before you edit the +message, so you can edit or delete their lines. If set to a string, it +is directly inserted. If set to a function, it is called and its +result is inserted. @item message-subject-re-regexp @vindex message-subject-re-regexp -- cgit v1.2.1 From 9f534a47e3343718b2164497210fe43c2d4f0fa6 Mon Sep 17 00:00:00 2001 From: Jay Belanger Date: Sun, 24 Oct 2010 17:37:44 -0500 Subject: calc.texi: Use emacsver.texi to determine Emacs version. --- doc/misc/ChangeLog | 4 ++++ doc/misc/calc.texi | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index aa22c6415a1..874324ffac6 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2010-10-24 Jay Belanger + + * calc.texi: Use emacsver.texi to determine Emacs version. + 2010-10-22 Juanma Barranquero * gnus.texi (Group Parameters, Buttons): Fix typos. diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi index f0b79e95dc8..f76eeaf884d 100644 --- a/doc/misc/calc.texi +++ b/doc/misc/calc.texi @@ -7,6 +7,8 @@ @setchapternewpage odd @comment %**end of header (This is for running Texinfo on a region.) +@include ../emacs/emacsver.texi + @c The following macros are used for conditional output for single lines. @c @texline foo @c `foo' will appear only in TeX output @@ -88,7 +90,8 @@ This file documents Calc, the GNU Emacs calculator. @end ifinfo @ifnotinfo -This file documents Calc, the GNU Emacs calculator, included with GNU Emacs 23.1. +This file documents Calc, the GNU Emacs calculator, included with +GNU Emacs @value{EMACSVER}. @end ifnotinfo Copyright @copyright{} 1990, 1991, 2001, 2002, 2003, 2004, -- cgit v1.2.1 From 5793a7bc13ed1d92dd70f48d952ca651c48a0fd3 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Mon, 25 Oct 2010 02:04:44 +0200 Subject: Fix some ChangeLog entries. --- doc/lispref/ChangeLog | 2 +- doc/misc/ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 15a33a4aabf..53e1a77bab8 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,4 +1,4 @@ -2010-10-22 Eli Zaretskii +2010-10-24 Eli Zaretskii * display.texi (Window Systems): Deprecate use of window-system as a predicate. diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 874324ffac6..96bcca816b8 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -2,7 +2,7 @@ * calc.texi: Use emacsver.texi to determine Emacs version. -2010-10-22 Juanma Barranquero +2010-10-24 Juanma Barranquero * gnus.texi (Group Parameters, Buttons): Fix typos. -- cgit v1.2.1 From d85d3b3ab87474cabbe0a813dd825d56abd028bc Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 25 Oct 2010 12:06:35 +0900 Subject: Add alternative key bindings for epa-mail commands. * epa.texi (Mail-mode integration): Add alternative key bindings for epa-mail commands; escape comma. --- doc/misc/ChangeLog | 5 +++++ doc/misc/epa.texi | 14 +++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 96bcca816b8..ac4784606ec 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,8 @@ +2010-10-25 Daiki Ueno + + * epa.texi (Mail-mode integration): Add alternative key bindings + for epa-mail commands; escape comma. + 2010-10-24 Jay Belanger * calc.texi: Use emacsver.texi to determine Emacs version. diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi index 32bf9e7fe1d..dd7468959f4 100644 --- a/doc/misc/epa.texi +++ b/doc/misc/epa.texi @@ -313,7 +313,7 @@ inside a message body, not using modern MIME format. NOTE: Inline PGP is not recommended and you should consider to use PGP/MIME. See @uref{http://josefsson.org/inline-openpgp-considered-harmful.html, -Inline PGP in E-mail is bad, Mm'kay?}. +Inline PGP in E-mail is bad@comma{} Mm'kay?}. @noindent Once @code{epa-mail-mode} is enabled, the following keys are assigned. @@ -321,22 +321,26 @@ You can do it by @kbd{C-u 1 M-x epa-mail-mode} or through the Customize interface. Try @kbd{M-x customize-variable epa-global-mail-mode}. @table @kbd -@item C-c C-e d +@item C-c C-e C-d and C-c C-e d +@kindex @kbd{C-c C-e C-d} @kindex @kbd{C-c C-e d} @findex epa-mail-decrypt Decrypt OpenPGP armors in the current buffer. -@item C-c C-e v +@item C-c C-e C-v and C-c C-e v +@kindex @kbd{C-c C-e C-v} @kindex @kbd{C-c C-e v} @findex epa-mail-verify Verify OpenPGP cleartext signed messages in the current buffer. -@item C-c C-e s +@item C-c C-e C-s and C-c C-e s +@kindex @kbd{C-c C-e C-s} @kindex @kbd{C-c C-e s} @findex epa-mail-sign Compose a signed message from the current buffer. -@item C-c C-e e +@item C-c C-e C-e and C-c C-e e +@kindex @kbd{C-c C-e C-e} @kindex @kbd{C-c C-e e} @findex epa-mail-encrypt Compose an encrypted message from the current buffer. -- cgit v1.2.1 From c05c2b9bb0cfe2628301c431ee503e680ba3bc01 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 25 Oct 2010 21:24:44 +0900 Subject: Don't use the word "PGP", since it is a non-free program. --- doc/misc/ChangeLog | 1 + doc/misc/epa.texi | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index ac4784606ec..cde97d40fa5 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -2,6 +2,7 @@ * epa.texi (Mail-mode integration): Add alternative key bindings for epa-mail commands; escape comma. + Don't use the word "PGP", since it is a non-free program. 2010-10-24 Jay Belanger diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi index dd7468959f4..7afe9c0c9b8 100644 --- a/doc/misc/epa.texi +++ b/doc/misc/epa.texi @@ -306,14 +306,14 @@ Encrypt marked files. @section Mail-mode integration EasyPG Assistant provides a minor mode @code{epa-mail-mode} to help -user compose inline PGP messages. Inline PGP is a traditional style -of sending signed/encrypted emails by embedding raw OpenPGP blobs -inside a message body, not using modern MIME format. +user compose inline OpenPGP messages. Inline OpenPGP is a traditional +style of sending signed/encrypted emails by embedding raw OpenPGP +blobs inside a message body, not using modern MIME format. -NOTE: Inline PGP is not recommended and you should consider to use +NOTE: Inline OpenPGP is not recommended and you should consider to use PGP/MIME. See @uref{http://josefsson.org/inline-openpgp-considered-harmful.html, -Inline PGP in E-mail is bad@comma{} Mm'kay?}. +Inline OpenPGP in E-mail is bad@comma{} Mm'kay?}. @noindent Once @code{epa-mail-mode} is enabled, the following keys are assigned. -- cgit v1.2.1 From aab705a2a898cae643b328d745410d844cf08e6e Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 26 Oct 2010 21:06:52 -0700 Subject: Fix treatment of menu-bar-files-menu. * lisp/menu-bar.el (menu-bar-files-menu): Make it into an actual alias, rather than just an unused variable that inherits from the real one. * doc/lispref/maps.texi (Standard Keymaps): Update File menu description. --- doc/lispref/ChangeLog | 4 ++++ doc/lispref/maps.texi | 12 +++++------- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'doc') diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index ccbbe1b9c81..5974893288a 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2010-10-27 Glenn Morris + + * maps.texi (Standard Keymaps): Update File menu description. + 2010-10-22 Eli Zaretskii * display.texi (Window Systems): Deprecate use of window-system as diff --git a/doc/lispref/maps.texi b/doc/lispref/maps.texi index a5b126afcb2..4b416a82d64 100644 --- a/doc/lispref/maps.texi +++ b/doc/lispref/maps.texi @@ -1,7 +1,8 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2001, 2002, 2003, 2004, -@c 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +@c 2005, 2006, 2007, 2008, 2009, 2010 +@c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/maps @node Standard Keymaps, Standard Hooks, Standard Buffer-Local Variables, Top @@ -183,9 +184,9 @@ A sparse keymap used by Lisp mode. @vindex menu-bar-edit-menu The keymap which displays the Edit menu in the menu bar. -@item menu-bar-files-menu -@vindex menu-bar-files-menu -The keymap which displays the Files menu in the menu bar. +@item menu-bar-file-menu +@vindex menu-bar-file-menu +The keymap which displays the File menu in the menu bar. @item menu-bar-help-menu @vindex menu-bar-help-menu @@ -239,6 +240,3 @@ The keymap defining the contents of the tool bar. A full keymap used by View mode. @end table -@ignore - arch-tag: b741253c-7e23-4a02-b3fa-cffd9e4d72b9 -@end ignore -- cgit v1.2.1 From 11a5db4a62a5d29f9419db6658f818b9a4d499cc Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Wed, 27 Oct 2010 22:08:36 +0000 Subject: gnus-group.el: Make gnus-group-default-list-level possibly a function. --- doc/misc/gnus.texi | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc') diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index e08805f38e1..e0a3ca280b5 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -2415,6 +2415,9 @@ one with the best level. All groups with a level less than or equal to @code{gnus-group-default-list-level} will be listed in the group buffer by default. +This variable can also be a function. In that case, that function will +be called and the result will be used as value. + @vindex gnus-group-list-inactive-groups If @code{gnus-group-list-inactive-groups} is non-@code{nil}, non-active -- cgit v1.2.1 From 8289f37b64d3734339f8c82a1e444113873d8d25 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 28 Oct 2010 00:21:43 -0700 Subject: doc/Makefile fixes related to inclusion of emacsver.texi. * doc/lispref/Makefile.in (elisp.dvi, elisp.pdf): Also include $emacsdir. * doc/misc/Makefile.in (MAKEINFO, ENVADD): Add $emacsdir to include path. (($(infodir)/calc, calc.dvi, calc.pdf): Depend on emacsver.texi. ($(infodir)/efaq): Remove -I option now in $MAKEINFO. --- doc/lispref/ChangeLog | 4 ++++ doc/lispref/Makefile.in | 4 ++-- doc/misc/ChangeLog | 6 ++++++ doc/misc/Makefile.in | 14 +++++++------- doc/misc/calc.texi | 6 +----- 5 files changed, 20 insertions(+), 14 deletions(-) (limited to 'doc') diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 53e1a77bab8..afd20c3890a 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2010-10-28 Glenn Morris + + * Makefile.in (elisp.dvi, elisp.pdf): Also include $emacsdir. + 2010-10-24 Eli Zaretskii * display.texi (Window Systems): Deprecate use of window-system as diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in index f1caa9abfa2..be8b6ca2c9e 100644 --- a/doc/lispref/Makefile.in +++ b/doc/lispref/Makefile.in @@ -109,7 +109,7 @@ $(infodir)/elisp: $(srcs) $(MAKEINFO) -o $@ $< elisp.dvi: $(srcs) - $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $< + $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) -I $(emacsdir) $< elisp.html: $(srcs) $(MAKEINFO) --html -o $@ $< @@ -118,7 +118,7 @@ elisp.ps: elisp.dvi $(DVIPS) -o $@ $< elisp.pdf: $(srcs) - $(TEXI2PDF) -I $(srcdir) -I $(texinfodir) $< + $(TEXI2PDF) -I $(srcdir) -I $(texinfodir) -I $(emacsdir) $< .PHONY: mostlyclean clean distclean maintainer-clean infoclean diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index cde97d40fa5..029d2e039bb 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,9 @@ +2010-10-28 Glenn Morris + + * Makefile.in (MAKEINFO, ENVADD): Add $emacsdir to include path. + (($(infodir)/calc, calc.dvi, calc.pdf): Depend on emacsver.texi. + ($(infodir)/efaq): Remove -I option now in $MAKEINFO. + 2010-10-25 Daiki Ueno * epa.texi (Mail-mode integration): Add alternative key bindings diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in index d5afabd0374..deeafa2c1b2 100644 --- a/doc/misc/Makefile.in +++ b/doc/misc/Makefile.in @@ -37,12 +37,12 @@ VPATH=@srcdir@ ## Note that the setfilename command in the .texi files assumes this. infodir=../../info ## Directory with emacsver.texi. -## Currently only used by efaq; could be added to MAKEINFO. +## Currently only used by efaq and calc. emacsdir = $(srcdir)/../emacs # The makeinfo program is part of the Texinfo distribution. # Use --force so that it generates output even if there are errors. -MAKEINFO = makeinfo --force +MAKEINFO = makeinfo --force -I$(emacsdir) # Also add new entries to INFO_FILES in the top-level Makefile.in. INFO_TARGETS = \ @@ -198,7 +198,7 @@ PDF_TARGETS = \ TEXI2DVI = texi2dvi TEXI2PDF = texi2pdf -ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)" +ENVADD = TEXINPUTS="$(srcdir):$(emacsdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)" mkinfodir = @cd ${srcdir}; test -d ${infodir} || mkdir ${infodir} || test -d ${infodir} @@ -244,12 +244,12 @@ autotype.pdf: ${srcdir}/autotype.texi $(ENVADD) $(TEXI2PDF) $< calc : $(infodir)/calc -$(infodir)/calc: calc.texi +$(infodir)/calc: calc.texi $(emacsdir)/emacsver.texi $(mkinfodir) cd $(srcdir); $(MAKEINFO) $< -calc.dvi: ${srcdir}/calc.texi +calc.dvi: ${srcdir}/calc.texi $(emacsdir)/emacsver.texi $(ENVADD) $(TEXI2DVI) $< -calc.pdf: ${srcdir}/calc.texi +calc.pdf: ${srcdir}/calc.texi $(emacsdir)/emacsver.texi $(ENVADD) $(TEXI2PDF) $< ccmode : $(infodir)/ccmode @@ -381,7 +381,7 @@ eudc.pdf: ${srcdir}/eudc.texi efaq : $(infodir)/efaq $(infodir)/efaq: faq.texi $(emacsdir)/emacsver.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) -I $(emacsdir) $< + cd $(srcdir); $(MAKEINFO) $< faq.dvi: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi $(ENVADD) $(TEXI2DVI) $< faq.pdf: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi index f76eeaf884d..9c30556ab78 100644 --- a/doc/misc/calc.texi +++ b/doc/misc/calc.texi @@ -7,7 +7,7 @@ @setchapternewpage odd @comment %**end of header (This is for running Texinfo on a region.) -@include ../emacs/emacsver.texi +@include emacsver.texi @c The following macros are used for conditional output for single lines. @c @texline foo @@ -36585,7 +36585,3 @@ the corresponding full Lisp name is derived by adding a prefix of @bye - -@ignore - arch-tag: 77a71809-fa4d-40be-b2cc-da3e8fb137c0 -@end ignore -- cgit v1.2.1 From 97af9a72d0935af2907d83ba330c1040f4df98cf Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 28 Oct 2010 20:19:33 -0700 Subject: Correct some viewcvs links in docs and comments. * doc/misc/cc-mode.texi: Remove reference to defunct viewcvs URL. Instead, refer to the generic Savannah page, since it seems likely that Savannah will never provide the equivalent service for GNU bazaar. The other option would be to use the Git mirror URL, since it seems to be being updated now, and of course browsing Git repos works just fine. That would be a pretty poor advert for the GNU system though. * etc/MH-E-NEWS: Update URL (viewcvs -> viewvc). * lisp/net/tramp-fish.el: Update URL in comment (viewcvs -> viewvc). --- doc/misc/ChangeLog | 4 ++++ doc/misc/cc-mode.texi | 11 ++++------- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index c3930486007..b690fb17dbb 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2010-10-29 Glenn Morris + + * cc-mode.texi: Remove reference to defunct viewcvs URL. + 2010-10-22 Juanma Barranquero * gnus.texi (Group Parameters, Buttons): Fix typos. diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi index c1d8db80dae..0c42e0145a8 100644 --- a/doc/misc/cc-mode.texi +++ b/doc/misc/cc-mode.texi @@ -160,7 +160,8 @@ CC Mode This manual is for CC Mode in Emacs. Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -201,9 +202,8 @@ developing GNU and promoting software freedom.'' @vskip 0pt plus 1filll @insertcopying -This manual was generated from cc-mode.texi, which can be downloaded -from -@url{http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/doc/misc/cc-mode.texi}. +This manual was generated from cc-mode.texi, which is distributed with Emacs, +or can be downloaded from @url{http://savannah.gnu.org/projects/emacs/}. @end titlepage @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -6998,6 +6998,3 @@ Since most @ccmode{} variables are prepended with the string @bye -@ignore - arch-tag: c4cab162-5e57-4366-bdce-4a9db2fc97f0 -@end ignore -- cgit v1.2.1 From aeeb3dcb656d2df4421f3c0a8b6416a5c1ea94a7 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 29 Oct 2010 12:49:27 +0200 Subject: Fix doc/misc/makefile.w32.in like 2010-10-28T07:21:43Z!rgm@gnu.org did with Makefile.in. makefile.w32-in (MAKEINFO): Add -I$(emacsdir). (ENVADD): Remove extra -I$(emacsdir), included in $(MAKEINFO). ($(infodir)/efaq): Remove -I$(emacsdir), included in $(MAKEINFO). ($(infodir)/calc, calc.dvi): Depend on $(emacsdir)/emacsver.texi. --- doc/misc/ChangeLog | 7 +++++++ doc/misc/makefile.w32-in | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 029d2e039bb..587bbba3159 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,10 @@ +2010-10-29 Eli Zaretskii + + * makefile.w32-in (MAKEINFO): Add -I$(emacsdir). + (ENVADD): Remove extra -I$(emacsdir), included in $(MAKEINFO). + ($(infodir)/efaq): Remove -I$(emacsdir), included in $(MAKEINFO). + ($(infodir)/calc, calc.dvi): Depend on $(emacsdir)/emacsver.texi. + 2010-10-28 Glenn Morris * Makefile.in (MAKEINFO, ENVADD): Add $emacsdir to include path. diff --git a/doc/misc/makefile.w32-in b/doc/misc/makefile.w32-in index f4887738411..fd3b1476b55 100644 --- a/doc/misc/makefile.w32-in +++ b/doc/misc/makefile.w32-in @@ -32,7 +32,7 @@ infodir = $(srcdir)/../../info emacsdir = $(srcdir)/../emacs # The makeinfo program is part of the Texinfo distribution. -MAKEINFO = makeinfo --force +MAKEINFO = makeinfo --force -I$(emacsdir) MULTI_INSTALL_INFO = $(srcdir)\..\..\nt\multi-install-info.bat INFO_TARGETS = $(infodir)/ccmode \ $(infodir)/cl $(infodir)/dbus $(infodir)/dired-x \ @@ -70,7 +70,7 @@ INFOSOURCES = info.texi TEXI2DVI = texi2dvi ENVADD = $(srcdir)\..\..\nt\envadd.bat "TEXINPUTS=$(srcdir);$(TEXINPUTS)" \ - "MAKEINFO=$(MAKEINFO) -I$(srcdir) -I$(emacsdir)" /C + "MAKEINFO=$(MAKEINFO) -I$(srcdir)" /C info: $(INFO_TARGETS) @@ -218,7 +218,7 @@ widget.dvi: widget.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/widget.texi $(infodir)/efaq: faq.texi $(emacsdir)/emacsver.texi - $(MAKEINFO) -I$(emacsdir) faq.texi + $(MAKEINFO) faq.texi faq.dvi: faq.texi $(emacsdir)/emacsver.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/faq.texi @@ -227,10 +227,10 @@ $(infodir)/autotype: autotype.texi autotype.dvi: autotype.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/autotype.texi -$(infodir)/calc: calc.texi +$(infodir)/calc: calc.texi $(emacsdir)/emacsver.texi $(MAKEINFO) calc.texi -calc.dvi: calc.texi +calc.dvi: calc.texi $(emacsdir)/emacsver.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/calc.texi # This is produced with --no-split to avoid making files whose -- cgit v1.2.1 From 99e65b2d2e79edf3ed0c4f00916098d4ea3767f4 Mon Sep 17 00:00:00 2001 From: Gnus developers Date: Sat, 30 Oct 2010 05:59:34 +0000 Subject: Merge changes made in Gnus trunk. gnus.el: Remove `gnus-nntp-service' variable. gnus.el: Make gnus-nntp-server and gnus-secondary-servers obsolete. gnus-sum.el (gnus-summary-delete-marked-as-read, gnus-summary-delete-marked-with): Remove obsolete defalias. gnus.el (gnus-use-long-file-name): Fix docstring. nnimap.el (nnimap-open-connection): Use AUTHENTICATE PLAIN on servers that say they support that. gnus-msg.el (gnus-inews-do-gcc): Don't have the backends do the slow *-request-group, which seems unnecessary. gnus-group.el (gnus-group-get-new-news-this-group): Don't have point move to the previous line on `M-g'. nnimap.el (nnimap-split-incoming-mail): Note that the INBOX has been selected. nnimap.el: Allow the user to say whether to split old messages or not in nnimap. shr.el (shr-tag-table-1): Only insert the images after the top-level table. shr.el (shr-tag-span): Drop colorisation of regions since we don't control the background color. shr.el (shr-tag-img): Ignore very small web bug type images. shr.el (shr-put-image): Add help-echo alt texts to the images. shr.el (shr-tag-video): Show the video poster image. --- doc/misc/ChangeLog | 12 +++++++++++- doc/misc/gnus.texi | 27 ++++++++------------------- 2 files changed, 19 insertions(+), 20 deletions(-) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 587bbba3159..f1401cca9b7 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,13 @@ +2010-10-29 Lars Magne Ingebrigtsen + + * gnus.texi (Client-Side IMAP Splitting): Mention + nnimap-unsplittable-articles. + +2010-10-29 Julien Danjou + + * gnus.texi (Finding the News): Remove references to obsoletes + variables `gnus-nntp-server' and `gnus-secondary-servers'. + 2010-10-29 Eli Zaretskii * makefile.w32-in (MAKEINFO): Add -I$(emacsdir). @@ -19,7 +29,7 @@ 2010-10-24 Jay Belanger - * calc.texi: Use emacsver.texi to determine Emacs version. + * calc.texi: Use emacsver.texi to determine Emacs version. 2010-10-24 Juanma Barranquero diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index e0a3ca280b5..0afb57afd17 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -1020,22 +1020,6 @@ Gnus will see whether @code{gnus-nntpserver-file} If that fails as well, Gnus will try to use the machine running Emacs as an @acronym{NNTP} server. That's a long shot, though. -@vindex gnus-nntp-server -If @code{gnus-nntp-server} is set, this variable will override -@code{gnus-select-method}. You should therefore set -@code{gnus-nntp-server} to @code{nil}, which is what it is by default. - -@vindex gnus-secondary-servers -@vindex gnus-nntp-server -You can also make Gnus prompt you interactively for the name of an -@acronym{NNTP} server. If you give a non-numerical prefix to @code{gnus} -(i.e., @kbd{C-u M-x gnus}), Gnus will let you choose between the servers -in the @code{gnus-secondary-servers} list (if any). You can also just -type in the name of any server you feel like visiting. (Note that this -will set @code{gnus-nntp-server}, which means that if you then @kbd{M-x -gnus} later in the same Emacs session, Gnus will contact the same -server.) - @findex gnus-group-browse-foreign-server @kindex B (Group) However, if you use one @acronym{NNTP} server regularly and are just @@ -14945,6 +14929,11 @@ use the value of the @code{nnmail-split-methods} variable. @item nnimap-split-fancy Uses the same syntax as @code{nnmail-split-fancy}. +@item nnimap-unsplittable-articles +List of flag symbols to ignore when doing splitting. That is, +articles that have these flags won't be considered when splitting. +The default is @samp{(%Deleted %Seen)}. + @end table @@ -30102,11 +30091,11 @@ that means: (setq gnus-read-active-file 'some) @end lisp -On the other hand, if the manual says ``set @code{gnus-nntp-server} to -@samp{nntp.ifi.uio.no}'', that means: +On the other hand, if the manual says ``set @code{gnus-nntp-server-file} to +@samp{/etc/nntpserver}'', that means: @lisp -(setq gnus-nntp-server "nntp.ifi.uio.no") +(setq gnus-nntp-server-file "/etc/nntpserver") @end lisp So be careful not to mix up strings (the latter) with symbols (the -- cgit v1.2.1 From 837ba704f88ac7d2b1935d1810d1574ec811a94f Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Sat, 30 Oct 2010 15:01:14 +0000 Subject: gnus-start.el (gnus-find-new-newsgroups): Remove gnus-check-first-time-used. gnus.el: Remove gnus-backup-default-subscribed-newsgroups. gnus-group.el: Remove gnus-group-fetch-control. --- doc/misc/gnus.texi | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'doc') diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 0afb57afd17..dd3e07ef3cc 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -5188,24 +5188,6 @@ used for fetching the file. If fetching from the first site is unsuccessful, Gnus will attempt to go through @code{gnus-group-faq-directory} and try to open them one by one. -@item H C -@kindex H C (Group) -@findex gnus-group-fetch-control -@vindex gnus-group-fetch-control-use-browse-url -@cindex control message -Fetch the control messages for the group from the archive at -@code{ftp.isc.org} (@code{gnus-group-fetch-control}). Query for a -group if given a prefix argument. - -If @code{gnus-group-fetch-control-use-browse-url} is non-@code{nil}, -Gnus will open the control messages in a browser using -@code{browse-url}. Otherwise they are fetched using @code{ange-ftp} -and displayed in an ephemeral group. - -Note that the control messages are compressed. To use this command -you need to turn on @code{auto-compression-mode} (@pxref{Compressed -Files, ,Compressed Files, emacs, The Emacs Manual}). - @item H d @itemx C-c C-d @c @icon{gnus-group-describe-group} -- cgit v1.2.1 From bbe1ba5eec81f56b9a2155a0abdabe6c7c81e3be Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 30 Oct 2010 14:17:59 -0700 Subject: Tiny MH-E doc fixes. * doc/misc/mh-e.texi (Preface, From Bill Wohler): Change 23 to past tense. * etc/MH-E-NEWS: Change 23 to past tense. --- doc/misc/ChangeLog | 4 ++++ doc/misc/mh-e.texi | 10 ++++------ 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index b690fb17dbb..a37b8db475f 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2010-10-30 Glenn Morris + + * mh-e.texi (Preface, From Bill Wohler): Change 23 to past tense. + 2010-10-29 Glenn Morris * cc-mode.texi: Remove reference to defunct viewcvs URL. diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi index ed64f91ac39..a06a7231112 100644 --- a/doc/misc/mh-e.texi +++ b/doc/misc/mh-e.texi @@ -213,7 +213,7 @@ more niceties about GNU Emacs and MH@. Now I'm fully hooked on both of them. The MH-E package is distributed with GNU Emacs@footnote{Version -@value{VERSION} of MH-E will appear in GNU Emacs 23.1. It is supported +@value{VERSION} of MH-E appeared in GNU Emacs 23.1. It is supported in GNU Emacs 21 and 22, as well as XEmacs 21 (except for versions 21.5.9-21.5.16). It is compatible with MH versions 6.8.4 and higher, all versions of nmh, and GNU mailutils 1.0 and higher.}, so you @@ -8951,8 +8951,8 @@ files that were already part of Emacs) and the software was completely reorganized to push back two decades of entropy. Version 8 appeared in Emacs 22.1 in 2006. -Development was then quiet for a couple of years. Emacs 23.1, which is -due out in 2009, will contain version 8.1. This version includes a few +Development was then quiet for a couple of years. Emacs 23.1, released +in June 2009, contains version 8.2. This version includes a few new features and several bug fixes. Bill Wohler, August 2008 @@ -9061,6 +9061,4 @@ Bill Wohler, August 2008 @c sentence-end-double-space: nil @c End: -@ignore - arch-tag: b778477d-1a10-4a99-84de-f877a2ea6bef -@end ignore + -- cgit v1.2.1 From 389b76fa1b4e96b7da8896cea16d57403d76a947 Mon Sep 17 00:00:00 2001 From: Gnus developers Date: Sun, 31 Oct 2010 22:31:24 +0000 Subject: Merge changes made in Gnus trunk. nnimap.el (nnimap-open-connection): Only send AUTHENTICATE PLAIN if LOGINDISABLED is set. gnus.el (gnus-group-startup-message): Move point to the start of the buffer. nndoc.el (nndoc-dissect-buffer): Reverse the order of the articles to reflect the order they're in in the digest. gnus-sum.el (gnus-summary-select-article): Make `C-d' work reliably by checking whether the original article buffer is alive. shr.el (shr-find-fill-point): Don't break lines between punctuation and non-punctuation (like after the apostrophe in "'We"). gnus-cite.el (gnus-article-fill-cited-article): Remove unused `force' parameter. gnus-art.el (gnus-treatment-function-alist): Have gnus-treat-fill-long-lines point to gnus-article-fill-cited-long-lines. gnus-art.el (gnus-treat-fill-long-lines): Change default to fill all text/plain sections. gnus.el: Autoload gnus-article-fill-cited-long-lines. gnus-art.el (gnus-mime-display-alternative): Actually pass the type on to `gnus-treat-article'. gnus-sum.el (gnus-summary-show-article): Add `C-u C-u g' for showing the raw article, and change `C-u g' to show the article without doing treatments. gnus.texi (Paging the Article): Document C-u g/C-u C-u g. gnus-cite.el (gnus-article-foldable-buffer): Refactor out. gnus-cite.el (gnus-article-foldable-buffer): Don't fold regions that have a ragged left edge. gnus-cite.el (gnus-article-foldable-buffer): Skip past the prefix when determining raggedness. gnus-srvr.el, nnir.el: Allow nnir searching for an entire server. gnus-msg.el (gnus-configure-posting-styles): Permit the use of regular expression match and replace in posting styles. gnus-art.el (gnus-treat-article): Only inhibit body washing, and leave the header washing to take place. nnimap.el (nnimap-request-accept-article): Erase buffer before appending for easier debugging. nnimap.el (nnimap-wait-for-connection): Take a regexp. nnimap.el (nnimap-request-accept-article): Wait for the continuation line before sending anything unless we're streaming. --- doc/misc/ChangeLog | 4 ++++ doc/misc/gnus.texi | 27 +++++++++++++++++---------- 2 files changed, 21 insertions(+), 10 deletions(-) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index d5c5df92087..5e99132389e 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2010-10-31 Lars Magne Ingebrigtsen + + * gnus.texi (Paging the Article): Document C-u g/C-u C-u g. + 2010-10-31 Glenn Morris * mh-e.texi (Preface, From Bill Wohler): Change 23 to past tense. diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index dd3e07ef3cc..c3dd2b31a50 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -6153,8 +6153,9 @@ Scroll the current article one line backward @vindex gnus-summary-show-article-charset-alist (Re)fetch the current article (@code{gnus-summary-show-article}). If given a prefix, fetch the current article, but don't run any of the -article treatment functions. This will give you a ``raw'' article, just -the way it came from the server. +article treatment functions. If given a prefix twice (i.e., @kbd{C-u +C-u g'}), show a completely ``raw'' article, just the way it came from +the server. @cindex charset, view article with different charset If given a numerical prefix, you can do semi-manual charset stuff. @@ -13428,14 +13429,20 @@ the headers of the article; if the value is @code{nil}, the header name will be removed. If the attribute name is @code{eval}, the form is evaluated, and the result is thrown away. -The attribute value can be a string (used verbatim), a function with -zero arguments (the return value will be used), a variable (its value -will be used) or a list (it will be @code{eval}ed and the return value -will be used). The functions and sexps are called/@code{eval}ed in the -message buffer that is being set up. The headers of the current article -are available through the @code{message-reply-headers} variable, which -is a vector of the following headers: number subject from date id -references chars lines xref extra. +The attribute value can be a string, a function with zero arguments +(the return value will be used), a variable (its value will be used) +or a list (it will be @code{eval}ed and the return value will be +used). The functions and sexps are called/@code{eval}ed in the +message buffer that is being set up. The headers of the current +article are available through the @code{message-reply-headers} +variable, which is a vector of the following headers: number subject +from date id references chars lines xref extra. + +In the case of a string value, if the @code{match} is a regular +expression, a @samp{gnus-match-substitute-replacement} is proceed on +the value to replace the positional parameters @samp{\@var{n}} by the +corresponding parenthetical matches (see @xref{Replacing the Text that +Matched, , Text Replacement, elisp, The Emacs Lisp Reference Manual}.) @vindex message-reply-headers -- cgit v1.2.1 From cf503f7c08c73b89485ac3d00af917875ed13b39 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 2 Nov 2010 20:40:54 -0700 Subject: Mere anarchy is loosed upon the world. * doc/misc/gnus.texi (Agent Variables): Spelling fix. --- doc/misc/ChangeLog | 4 ++++ doc/misc/gnus.texi | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 5e99132389e..e5b2fa62836 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2010-11-03 Glenn Morris + + * gnus.texi (Agent Variables): Spelling fix. + 2010-10-31 Lars Magne Ingebrigtsen * gnus.texi (Paging the Article): Document C-u g/C-u C-u g. diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index c3dd2b31a50..7d3b87759de 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -19840,7 +19840,7 @@ limit to control how often the cycling occurs. A large value improves performance. A small value minimizes the time lost should the connection be lost while fetching (You may need to run @code{gnus-agent-regenerate-group} to update the group's state. -However, all articles parsed prior to loosing the connection will be +However, all articles parsed prior to losing the connection will be available while unplugged). The default is 10M so it is unusual to see any cycling. -- cgit v1.2.1 From 537b04b96a8516693acabd5474791f5c77a770d4 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 2 Nov 2010 20:49:04 -0700 Subject: Don't be so lax with spelling. * lisp/net/dbus.el (dbus-name-owner-changed-handler): Doc fix. * doc/misc/ediff.texi (Quick Help Commands, Miscellaneous): Spelling fix. --- doc/misc/ChangeLog | 1 + doc/misc/ediff.texi | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index e5b2fa62836..a58775595fc 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,5 +1,6 @@ 2010-11-03 Glenn Morris + * ediff.texi (Quick Help Commands, Miscellaneous): * gnus.texi (Agent Variables): Spelling fix. 2010-10-31 Lars Magne Ingebrigtsen diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi index 4259fccb390..c2897e185bf 100644 --- a/doc/misc/ediff.texi +++ b/doc/misc/ediff.texi @@ -759,7 +759,7 @@ Displays a list of currently active Ediff sessions---the Ediff Registry. You can then restart any of these sessions by either clicking on a session record or by putting the cursor over it and then typing the return key. -(Some poor souls leave so many active Ediff sessions around that they loose +(Some poor souls leave so many active Ediff sessions around that they lose track of them completely... The `R' command is designed to save these people from the recently discovered Ediff Proficiency Syndrome.) @@ -2315,7 +2315,7 @@ other behavior. However, Ediff temporarily resets this variable to @code{t} if it is invoked via one of the "buffer" jobs, such as @code{ediff-buffers}. -This is because it is all too easy to loose day's work otherwise. +This is because it is all too easy to lose a day's work otherwise. Besides, in a "buffer" job, the variant buffers have already been loaded prior to starting Ediff, so Ediff just preserves status quo here. @@ -2542,6 +2542,3 @@ Eli Zaretskii (eliz at is.elta.co.il) @bye -@ignore - arch-tag: 165ecb88-d03c-44b1-a921-b93f50b05b46 -@end ignore -- cgit v1.2.1 From d7619e3b53f8cf465a948383662586f1487a2918 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 2 Nov 2010 20:53:12 -0700 Subject: * doc/misc/gnus.texi (Configuring nnmairix): Spelling fix. --- doc/misc/ChangeLog | 2 +- doc/misc/gnus.texi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index a58775595fc..ccd4b14cf69 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,7 +1,7 @@ 2010-11-03 Glenn Morris * ediff.texi (Quick Help Commands, Miscellaneous): - * gnus.texi (Agent Variables): Spelling fix. + * gnus.texi (Agent Variables, Configuring nnmairix): Spelling fix. 2010-10-31 Lars Magne Ingebrigtsen diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 7d3b87759de..eccef851980 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -4556,7 +4556,7 @@ However, you can also create e.g. a new @code{nnmaildir} or @code{nnml} server exclusively for @code{nnmairix} in your secondary select methods (@pxref{Finding the News}). If you use a secondary @code{nnml} server just for mairix, make sure that you explicitly set the server variable -@code{nnml-get-new-mail} to @code{nil}, or you might loose mail +@code{nnml-get-new-mail} to @code{nil}, or you might lose mail (@pxref{nnmairix caveats}). If you want to use mairix remotely on an @acronym{IMAP} server, you have to choose the corresponding @code{nnimap} server here. -- cgit v1.2.1 From 630a5546c9cfaa5f4c8017486f05ac7566141f88 Mon Sep 17 00:00:00 2001 From: Jay Belanger Date: Wed, 3 Nov 2010 18:19:23 -0500 Subject: calc.texi: Update Emacs version to 23.3. --- doc/misc/ChangeLog | 4 ++++ doc/misc/calc.texi | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index a37b8db475f..7f70182a360 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2010-11-03 Jay Belanger + + * calc.texi: Use emacsver.texi to determine Emacs version. + 2010-10-30 Glenn Morris * mh-e.texi (Preface, From Bill Wohler): Change 23 to past tense. diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi index b410a6b31bb..1995a6f9936 100644 --- a/doc/misc/calc.texi +++ b/doc/misc/calc.texi @@ -89,7 +89,7 @@ This file documents Calc, the GNU Emacs calculator. @end ifinfo @ifnotinfo -This file documents Calc, the GNU Emacs calculator, included with GNU Emacs 23.1. +This file documents Calc, the GNU Emacs calculator, included with GNU Emacs 23.3. @end ifnotinfo Copyright @copyright{} 1990, 1991, 2001, 2002, 2003, 2004, -- cgit v1.2.1 From 36bc5d3ba335b4c473e596831057c89c717c8442 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Thu, 4 Nov 2010 14:30:20 +0100 Subject: * tramp.texi (Remote shell setup): New item "Interactive shell prompt". Reported by Christian Millour . (Remote shell setup, Remote processes): Use @code{} for environment variables. --- doc/misc/ChangeLog | 7 +++++++ doc/misc/tramp.texi | 38 +++++++++++++++++++++++++++++++++++--- 2 files changed, 42 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index ccd4b14cf69..89e16eaa308 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,10 @@ +2010-11-04 Michael Albinus + + * tramp.texi (Remote shell setup): New item "Interactive shell + prompt". Reported by Christian Millour . + (Remote shell setup, Remote processes): Use @code{} for + environment variables. + 2010-11-03 Glenn Morris * ediff.texi (Quick Help Commands, Miscellaneous): diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index 2c82becf6ae..6a77c138404 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -1942,7 +1942,7 @@ understand this syntax and will emit a syntax error when it reaches this line. Another example is the tilde (@code{~}) character, say when adding -@file{~/bin} to @code{$PATH}. Many Bourne shells will not expand this +@file{~/bin} to @code{PATH}. Many Bourne shells will not expand this character, and since there is usually no directory whose name consists of the single character tilde, strange things will happen. @@ -1969,6 +1969,38 @@ shell is Bourne-ish already, then it might be prudent to omit the @command{exec /bin/sh} step. But how to find out if the shell is Bourne-ish? + +@item Interactive shell prompt + +@value{tramp} redefines the shell prompt in order to parse the shell's +output robustly. When calling an interactive shell by @kbd{M-x +shell}, this doesn't look nice. + +You can redefine the shell prompt by checking the environment variable +@code{INSIDE_EMACS}, which is set by @value{tramp}, in your startup +script @file{~/.emacs_SHELLNAME}. @code{SHELLNAME} might be the string +@code{bash} or similar, in case of doubt you could set it the +environment variable @code{ESHELL} in your @file{.emacs}: + +@lisp +(setenv "ESHELL" "bash") +@end lisp + +Your file @file{~/.emacs_SHELLNAME} could contain code like + +@example +# Reset the prompt for remote Tramp shells. +if [ "$@{INSIDE_EMACS/*tramp*/tramp@}" == "tramp" ] ; then + PS1="[\u@@\h \w]$ " +fi +@end example + +@ifinfo +@ifset emacs +@xref{Interactive Shell, , , @value{emacsdir}}. +@end ifset +@end ifinfo + @end table @@ -2493,7 +2525,7 @@ Adding an entry can be performed via @code{add-to-list}: Changing or removing an existing entry is not encouraged. The default values are chosen for proper @value{tramp} work. Nevertheless, if for example a paranoid system administrator disallows changing the -@var{$HISTORY} environment variable, you can customize +@code{HISTORY} environment variable, you can customize @code{tramp-remote-process-environment}, or you can apply the following code in your @file{.emacs}: @@ -2512,7 +2544,7 @@ integrate them as well. @xref{Bug Reports}. If you want to run a remote program, which shall connect the X11 server you are using with your local host, you can set the -@var{$DISPLAY} environment variable on the remote host: +@code{DISPLAY} environment variable on the remote host: @lisp (add-to-list 'tramp-remote-process-environment -- cgit v1.2.1 From 181cb5fb657b4f226eb5f9f4d13d8ea9ede81268 Mon Sep 17 00:00:00 2001 From: Gnus developers Date: Thu, 4 Nov 2010 22:18:09 +0000 Subject: Merge changes made in Gnus trunk. mm-decode.el (mm-save-part): Put the entire path in the `M-n' slot. nnimap.el (nnimap-find-article-by-message-id): Don't EXAMINE a group if it's already selected. gnus.texi (Customizing the IMAP Connection): Document `nnimap-expunge' and remove `nnimap-expunge-inbox' from example. gnus.texi (Customizing the IMAP Connection): Remove nnir mention, since that works by default. gnus-sum.el (gnus-summary-show-article): Take `t' as the arg to mean "raw". gnus-html.el (gnus-html-browse-url): Implement mailto: URLs. shr.el (shr-browse-url): Implement mailto: URLs. nnir.el, gnus-sum.el: Improve thread-referral. message.el (message-send-mail): Use the value of message-courtesy-message from the message buffer. --- doc/misc/ChangeLog | 10 ++++++++++ doc/misc/gnus.texi | 9 ++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 89e16eaa308..9761e599d8f 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,13 @@ +2010-11-04 Lars Magne Ingebrigtsen + + * gnus.texi (Customizing the IMAP Connection): Remove nnir mention, + since that works by default. + +2010-11-03 Kan-Ru Chen (tiny change) + + * gnus.texi (Customizing the IMAP Connection): Document + `nnimap-expunge' and remove `nnimap-expunge-inbox' from example. + 2010-11-04 Michael Albinus * tramp.texi (Remote shell setup): New item "Interactive shell diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index eccef851980..8709635a58b 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -14845,9 +14845,7 @@ Here's an example method that's more complex: (nnimap-inbox "INBOX") (nnimap-split-methods default) (nnimap-expunge t) - (nnimap-stream ssl) - (nnir-search-engine imap) - (nnimap-expunge-inbox t)) + (nnimap-stream ssl)) @end example @table @code @@ -14883,6 +14881,11 @@ what you need. Some @acronym{IMAP} servers allow anonymous logins. In that case, this should be set to @code{anonymous}. +@item nnimap-expunge +If non-@code{nil}, expunge articles after deleting them. This is always done +if the server supports UID EXPUNGE, but it's not done by default on +servers that doesn't support that command. + @item nnimap-streaming Virtually all @code{IMAP} server support fast streaming of data. If you have problems connecting to the server, try setting this to @code{nil}. -- cgit v1.2.1 From 3ff919646c3afd6cd5999566325964b07655b2f7 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Fri, 5 Nov 2010 21:55:06 +0100 Subject: * trampver.texi: Update release number. This shall not be merged into the trunk. --- doc/misc/ChangeLog | 4 ++++ doc/misc/trampver.texi | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 7f70182a360..11da421603e 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2010-11-05 Michael Albinus + + * trampver.texi: Update release number. + 2010-11-03 Jay Belanger * calc.texi: Use emacsver.texi to determine Emacs version. diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi index 25fa4908143..12848948e92 100644 --- a/doc/misc/trampver.texi +++ b/doc/misc/trampver.texi @@ -9,7 +9,7 @@ @c In the Tramp CVS, the version number is auto-frobbed from @c configure.ac, so you should edit that file and run @c "autoconf && ./configure" to change the version number. -@set trampver 2.1.19 +@set trampver 2.1.20 @c Other flags from configuration @set instprefix /usr/local -- cgit v1.2.1 From a16b2d46ffd8180c359425db98f7905d73587c69 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 6 Nov 2010 12:23:33 +0200 Subject: Fix bug #7300. msdog.texi (Windows HOME): Add information regarding startup directory when invoking Emacs from a desktop shortcut. --- doc/emacs/ChangeLog | 5 +++++ doc/emacs/msdog.texi | 12 ++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index b5a5c700688..18819f858fd 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,8 @@ +2010-11-06 Eli Zaretskii + + * msdog.texi (Windows HOME): Add information regarding startup + directory when invoking Emacs from a desktop shortcut. (bug#7300) + 2010-09-14 Glenn Morris * cal-xtra.texi (Fancy Diary Display): Emphasize that sort should be diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi index a44438bf81f..3e8d5ef57c1 100644 --- a/doc/emacs/msdog.texi +++ b/doc/emacs/msdog.texi @@ -31,7 +31,8 @@ here. * Text and Binary:: Text files use CRLF to terminate lines. * Windows Files:: File-name conventions on Windows. * ls in Lisp:: Emulation of @code{ls} for Dired. -* Windows HOME:: Where Emacs looks for your @file{.emacs}. +* Windows HOME:: Where Emacs looks for your @file{.emacs} and + where it starts up. * Windows Keyboard:: Windows-specific keyboard features. * Windows Mouse:: Windows-specific mouse features. * Windows Processes:: Running subprocesses on Windows. @@ -329,7 +330,7 @@ names, which might cause misalignment of columns in Dired display. @end ifnottex @node Windows HOME -@section HOME Directory on MS-Windows +@section HOME and Startup Directories on MS-Windows @cindex @code{HOME} directory on MS-Windows The Windows equivalent of the @code{HOME} directory is the @@ -371,6 +372,13 @@ names, the Windows port of Emacs supports an alternative name @file{_emacs} as a fallback, if such a file exists in the home directory, whereas @file{.emacs} does not. +@cindex start directory, MS-Windows +@cindex directory where Emacs starts on MS-Windows + If you use a Windows desktop shortcut to start Emacs, it starts in +the directory specified by the shortcut. To control where that is, +right-click on the shortcut, select ``Properties'', and in the +``Shortcut'' tab modify the ``Start in'' field to your liking. + @node Windows Keyboard @section Keyboard Usage on MS-Windows @cindex keyboard, MS-Windows -- cgit v1.2.1 From 0f161c71c97fccef2c9e4b7c64a4a0275adee7b9 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Mon, 8 Nov 2010 21:53:18 -0500 Subject: Bump version to 23.2.90. Regenerate AUTHORS, configure, and ldefs-boot.el. --- doc/emacs/emacs.texi | 2 +- doc/lispref/book-spine.texinfo | 2 +- doc/lispref/elisp.texi | 2 +- doc/lispref/vol1.texi | 2 +- doc/lispref/vol2.texi | 2 +- doc/man/emacs.1 | 2 +- doc/misc/faq.texi | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'doc') diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index 50a7dcc1b5b..b9dd51a85e6 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -5,7 +5,7 @@ @c The edition number appears in several places in this file @set EDITION Sixteenth -@set EMACSVER 23.2.50 +@set EMACSVER 23.2.90 @copying This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@* diff --git a/doc/lispref/book-spine.texinfo b/doc/lispref/book-spine.texinfo index 30b966b15d2..e665a66fea5 100644 --- a/doc/lispref/book-spine.texinfo +++ b/doc/lispref/book-spine.texinfo @@ -11,7 +11,7 @@ @center @titlefont{GNU Emacs Lisp Reference Manual} @sp 5 @center GNU -@center Emacs Version 23.2.50 +@center Emacs Version 23.2.90 @center for Unix Users @sp 5 diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index 231d71b7308..bd6695777d3 100644 --- a/doc/lispref/elisp.texi +++ b/doc/lispref/elisp.texi @@ -8,7 +8,7 @@ @c Please remember to update the edition number in README as well. @c And also the copies in vol1.texi and vol2.texi. @set VERSION 3.0 -@set EMACSVER 23.2.50 +@set EMACSVER 23.2.90 @set DATE July 2009 @c in general, keep the following line commented out, unless doing a diff --git a/doc/lispref/vol1.texi b/doc/lispref/vol1.texi index d8449044fdd..0f2a21d6580 100644 --- a/doc/lispref/vol1.texi +++ b/doc/lispref/vol1.texi @@ -27,7 +27,7 @@ @c Version of the manual and of Emacs. @c Please remember to update the edition number in README as well. @set VERSION 3.0 -@set EMACSVER 23.2.50 +@set EMACSVER 23.2.90 @set DATE July 2009 @dircategory Emacs diff --git a/doc/lispref/vol2.texi b/doc/lispref/vol2.texi index 3f1dc33c234..738c8d55f95 100644 --- a/doc/lispref/vol2.texi +++ b/doc/lispref/vol2.texi @@ -27,7 +27,7 @@ @c Version of the manual and of Emacs. @c Please remember to update the edition number in README as well. @set VERSION 3.0 -@set EMACSVER 23.2.50 +@set EMACSVER 23.2.90 @set DATE July 2009 @dircategory Emacs diff --git a/doc/man/emacs.1 b/doc/man/emacs.1 index 0800a868d65..fc197a01adc 100644 --- a/doc/man/emacs.1 +++ b/doc/man/emacs.1 @@ -1,5 +1,5 @@ .\" See section COPYING for copyright and redistribution information. -.TH EMACS 1 "2007 April 13" "GNU Emacs 23.2.50" +.TH EMACS 1 "2007 April 13" "GNU Emacs 23.2.90" . . .SH NAME diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi index 9cf9ff50345..b109af4d68b 100644 --- a/doc/misc/faq.texi +++ b/doc/misc/faq.texi @@ -5,7 +5,7 @@ @c %**end of header @c This is used in many places -@set VER 23.2.50 +@set VER 23.2.90 @c This file is maintained by Romain Francoise . @c Feel free to install changes without prior permission (but I'd -- cgit v1.2.1 From be3c11b30596150a3e9e25614d6b65ca938b198e Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Tue, 9 Nov 2010 22:17:36 +0000 Subject: Merge changes made in Gnus trunk. message.el (message-mailto): New function. message.el (message-mailto): Should accept other parameters. message.el (message-mailto): Remove since it duplicates browse-url-mailto functionality. shr.el (shr-browse-url): Call browse-url-mailto for mailto: links. message.el (message-subject-trailing-was-ask-regexp): A ] in a [] regexp doesn't need quoting. gnus-art.el (article-treat-non-ascii): New command and keystroke. shr.el (browse-url-mailto): Autoload. gnus.texi (Article Washing): Document gnus-article-treat-non-ascii. --- doc/misc/ChangeLog | 4 ++++ doc/misc/gnus.texi | 11 +++++++++++ 2 files changed, 15 insertions(+) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index e255b44f189..0d1d0e2cc2e 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2010-11-09 Lars Magne Ingebrigtsen + + * gnus.texi (Article Washing): Document gnus-article-treat-non-ascii. + 2010-11-09 Jay Belanger * calc.texi: Use emacsver.texi to determine Emacs version. diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 8709635a58b..9afbc67877d 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -9664,6 +9664,17 @@ an attempt to provide more quoting characters. If you see something like @code{\222} or @code{\264} where you're expecting some kind of apostrophe or quotation mark, then try this wash. +@item W A +@kindex W A (Summary) +@findex gnus-article-treat-non-ascii +@cindex Unicode +@cindex Non-@acronym{ASCII} +Translate many non-@acronym{ASCII} characters into their +@acronym{ASCII} equivalents (@code{gnus-article-treat-non-ascii}). +This is mostly useful if you're on a terminal that has a limited font +and does't show accented characters, ``advanced'' punctuation, and the +like. For instance, @samp{»} is tranlated into @samp{>>}, and so on. + @item W Y f @kindex W Y f (Summary) @findex gnus-article-outlook-deuglify-article -- cgit v1.2.1 From 6f8fc60c41b69cfbf1ff4340978ca3a9ce43e551 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Wed, 10 Nov 2010 09:41:53 +0100 Subject: * dbus.texi (Type Conversion): Introduce `:unix-fd' type mapping. --- doc/misc/ChangeLog | 4 ++++ doc/misc/dbus.texi | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 0d1d0e2cc2e..1ecdd8fd777 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2010-11-10 Michael Albinus + + * dbus.texi (Type Conversion): Introduce `:unix-fd' type mapping. + 2010-11-09 Lars Magne Ingebrigtsen * gnus.texi (Article Washing): Document gnus-article-treat-non-ascii. diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi index f4f96d55391..6f6a897e6dc 100644 --- a/doc/misc/dbus.texi +++ b/doc/misc/dbus.texi @@ -890,7 +890,8 @@ symbol can be preceeded to the corresponding Lisp object. Basic D-Bus types are represented by the type symbols @code{:byte}, @code{:boolean}, @code{:int16}, @code{:uint16}, @code{:int32}, @code{:uint32}, @code{:int64}, @code{:uint64}, @code{:double}, -@code{:string}, @code{:object-path} and @code{:signature}. +@code{:string}, @code{:object-path}, @code{:signature} and +@code{:unix-fd}. @noindent Example: @@ -1009,6 +1010,7 @@ objects. @item DBUS_TYPE_UINT16 @tab @expansion{} @tab natural number @item DBUS_TYPE_INT16 @tab @expansion{} @tab integer @item DBUS_TYPE_UINT32 @tab @expansion{} @tab natural number or float +@item DBUS_TYPE_UNIX_FD @tab @expansion{} @tab natural number or float @item DBUS_TYPE_INT32 @tab @expansion{} @tab integer or float @item DBUS_TYPE_UINT64 @tab @expansion{} @tab natural number or float @item DBUS_TYPE_INT64 @tab @expansion{} @tab integer or float @@ -1024,9 +1026,9 @@ objects. @end example A float object in case of @code{DBUS_TYPE_UINT32}, -@code{DBUS_TYPE_INT32}, @code{DBUS_TYPE_UINT64} and -@code{DBUS_TYPE_INT6432} is returned, when the C value exceeds the -Emacs number size range. +@code{DBUS_TYPE_INT32}, @code{DBUS_TYPE_UINT64}, +@code{DBUS_TYPE_INT64} and @code{DBUS_TYPE_UNIX_FD} is returned, when +the C value exceeds the Emacs number size range. The resulting list of the last 4 D-Bus compound types contains as elements the elements of the D-Bus container, mapped according to the -- cgit v1.2.1 From cde08ac929c7c9eb9f6bf75345d56f84b9eaa1fb Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 10 Nov 2010 00:42:42 -0800 Subject: * doc/lispref/text.texi (Kill Functions, Low-Level Kill Ring): Small fixes. --- doc/lispref/ChangeLog | 4 ++++ doc/lispref/text.texi | 16 +++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) (limited to 'doc') diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 5974893288a..5f67371f3a6 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2010-11-10 Glenn Morris + + * text.texi (Kill Functions, Low-Level Kill Ring): Small fixes. + 2010-10-27 Glenn Morris * maps.texi (Standard Keymaps): Update File menu description. diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index a7c4a3e62f4..2510607475b 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi @@ -900,10 +900,10 @@ from the buffer. It returns @code{nil}. The command does not set @code{this-command} to @code{kill-region}, so a subsequent kill command does not append to the same kill ring entry. -Don't call @code{copy-region-as-kill} in Lisp programs unless you aim to -support Emacs 18. For newer Emacs versions, it is better to use -@code{kill-new} or @code{kill-append} instead. @xref{Low-Level Kill -Ring}. +@c FIXME Why is it better? Why isn't copy-region-as-kill obsolete then? +@c Why is it used in many places in Emacs? +In Lisp programs, it is better to use @code{kill-new} or +@code{kill-append} instead of this command. @xref{Low-Level Kill Ring}. @end deffn @node Yanking @@ -1041,8 +1041,8 @@ text property, if there is one. @subsection Low-Level Kill Ring These functions and variables provide access to the kill ring at a -lower level, but still convenient for use in Lisp programs, because they -take care of interaction with window system selections +lower level, but are still convenient for use in Lisp programs, +because they take care of interaction with window system selections (@pxref{Window System Selections}). @defun current-kill n &optional do-not-move @@ -4279,6 +4279,4 @@ code that is itself run from a modification hook, then rebind locally @code{inhibit-modification-hooks} to @code{nil}. @end defvar -@ignore - arch-tag: 3721e738-a1cb-4085-bc1a-6cb8d8e1d32b -@end ignore + -- cgit v1.2.1 From 2098928531c8dd5d930ed49c9b9c37f477c32771 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 10 Nov 2010 00:48:15 -0800 Subject: * doc/misc/edt.texi: Remove information about Emacs 19. --- doc/misc/ChangeLog | 4 ++++ doc/misc/edt.texi | 21 +++++++-------------- 2 files changed, 11 insertions(+), 14 deletions(-) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 11da421603e..a47dff59e93 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2010-11-10 Glenn Morris + + * edt.texi: Remove information about Emacs 19. + 2010-11-05 Michael Albinus * trampver.texi: Update release number. diff --git a/doc/misc/edt.texi b/doc/misc/edt.texi index d394137d76b..f3d0eacc0f3 100644 --- a/doc/misc/edt.texi +++ b/doc/misc/edt.texi @@ -63,8 +63,8 @@ of DEC's EDT editor. @node Overview @chapter Overview of the EDT Package -This manual describes version 4.0 of the EDT Emulation for Emacs 19 and -above. It comes with special functions which replicate nearly all of +This manual describes version 4.0 of the EDT Emulation for Emacs. +It comes with special functions which replicate nearly all of EDT's keypad mode behavior. It sets up default keypad and function key bindings which closely match those found in EDT. Support is provided so that users may reconfigure most keypad and function key bindings to @@ -152,9 +152,8 @@ You can also invoke @code{edt-set-scroll-margins} interactively while EDT Emulation is active to change the settings for that session. @strong{Please note:} Another way to set the scroll margins is to use -the Emacs customization feature (not available in Emacs 19) to set the -following two variables directly: @code{edt-top-scroll-margin} and -@code{edt-bottom-scroll-margin}. +the Emacs customization feature to set the following two variables +directly: @code{edt-top-scroll-margin} and @code{edt-bottom-scroll-margin}. Enter the Emacs @code{customize} command. First select the @samp{Editing} group and then select the @samp{Emulations} group. @@ -239,8 +238,7 @@ Provide an easy way to restore @strong{all} original Emacs key bindings, just as they existed before the EDT emulation was first invoked. @item -Support GNU Emacs 19 and higher. (GNU Emacs 18 and below is no longer -supported.) XEmacs 19, and above, is also supported. +Support GNU Emacs 19 and higher. XEmacs 19, and above, is also supported. @item Supports highlighting of marked text within the EDT emulation on all @@ -933,9 +931,8 @@ You can also invoke @code{edt-set-scroll-margins} interactively while EDT Emulation is active to change the settings for that session. @strong{Please note:} Another way to set the scroll margins is to use -the Emacs customization feature (not available in Emacs 19) to set the -following two variables directly: @code{edt-top-scroll-margin} and -@code{edt-bottom-scroll-margin}. +the Emacs customization feature to set the following two variables +directly: @code{edt-top-scroll-margin} and @code{edt-bottom-scroll-margin}. Enter the Emacs @code{customize} command. First select the @samp{Editing} group and then select the @samp{Emulations} group. @@ -946,7 +943,3 @@ Finally, select the @samp{Edt} group and follow the directions. @include doclicense.texi @bye - -@ignore - arch-tag: 1b7ebe01-754b-4834-a12b-f152ef7db9e0 -@end ignore -- cgit v1.2.1 From 90639ceacd6842d168bad3a18090a00b8b140c87 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 11 Nov 2010 00:41:30 -0800 Subject: * doc/misc/msdog.texi (ls in Lisp): Update for ls-lisp.el changes. --- doc/emacs/ChangeLog | 4 ++++ doc/emacs/msdog.texi | 14 ++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) (limited to 'doc') diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index fe9cd8a73b4..1438cb4f030 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2010-11-11 Glenn Morris + + * msdog.texi (ls in Lisp): Update for ls-lisp changes. + 2010-11-09 Eli Zaretskii * msdog.texi (Windows HOME): Add information regarding startup diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi index 3e8d5ef57c1..4be67aa31de 100644 --- a/doc/emacs/msdog.texi +++ b/doc/emacs/msdog.texi @@ -285,11 +285,12 @@ on Windows, since many users of Emacs on those platforms prefer the @end table @noindent -Any other value of @code{ls-lisp-emulation} means the same as -@code{GNU}. Note that this option needs to be set @emph{before} -@file{ls-lisp.el} is loaded, which means that on MS-Windows and MS-DOS -you will have to set the value from your @file{.emacs} file and then -restart Emacs, since @file{ls-lisp.el} is preloaded. +Any other value of @code{ls-lisp-emulation} means the same as @code{GNU}. +Customizing this option calls the function @code{ls-lisp-set-options} to +update the 3 dependent options as needed. If you change the value of +this variable without using customize after @file{ls-lisp.el} is loaded +(note that it is preloaded on MS-Windows and MS-DOS), you can call that +function manually for the same result. @vindex ls-lisp-support-shell-wildcards The variable @code{ls-lisp-support-shell-wildcards} controls how @@ -925,6 +926,3 @@ click-to-focus policy. @include msdog-xtra.texi @end ifnottex -@ignore - arch-tag: f39d2590-5dcc-4318-88d9-0eb73ca10fa2 -@end ignore -- cgit v1.2.1 From afe98dfa700de5cf0493e8bf95b7d894e2734e47 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Thu, 11 Nov 2010 22:10:19 -0600 Subject: Install org-mode version 7.3 --- doc/misc/ChangeLog | 141 ++++++++ doc/misc/org.texi | 963 +++++++++++++++++++++++++++++++++-------------------- 2 files changed, 740 insertions(+), 364 deletions(-) (limited to 'doc') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 1ecdd8fd777..d878a017855 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,144 @@ +2010-11-11 Noorul Islam + + * org.texi: Fix typo + +2010-11-11 Carsten Dominik + + * org.texi (Using capture): Explain that refiling is + sensitive to cursor position. + +2010-11-11 Carsten Dominik + + * org.texi (Images and tables): Add cross reference to + link section. + +2010-11-11 Carsten Dominik + + * org.texi: Document the cookie. + +2010-11-11 Eric Schulte + + * multi-line header arguments :PROPERTIES: :ID: + b77c8857-6c76-4ea9-8a61-ddc2648d96c4 :END: + +2010-11-11 Carsten Dominik + + * org.texi (CSS support): Document :HTML_CONTAINER_CLASS: + property + +2010-11-11 Carsten Dominik + + * org.texi (Project alist): Mention that this is a + property list + +2010-11-11 Carsten Dominik + + * org.texi (Setting up the staging area): Document that + file names remain visible when encrypting the MobileOrg files. + +2010-11-11 Carsten Dominik + + * org.texi (Setting up the staging area): Document which + versions are needed for encryption. + +2010-11-11 Eric Schulte + + * org.texi (noweb): updating :noweb documentation to + reflect the new "tangle" argument + +2010-11-11 Sebastian Rose, Hannover, Germany + + * org-test-which-func: New function. Find name of defun + around point. + +2010-11-11 Eric Schulte + + * org.texi (Batch execution): improved tangling script in + documentation + +2010-11-11 Carsten Dominik + + * org.texi (Handling links): + (In-buffer settings): Document inlining images on startup. + +2010-11-11 Carsten Dominik + + * org.texi (Setting up the staging area): Document use of + crypt password. + +2010-11-11 David Maus + + * org.texi (Template expansion): Add date related link + type escapes + +2010-11-11 David Maus + + * org.texi (Template expansion): Add mew in table for + link type escapes. + +2010-11-11 David Maus + + * org.texi (Template expansion): Fix typo in link type + escapes. + +2010-11-11 Eric Schulte + + * org.texi (Structure of code blocks): another + documentation tweak + +2010-11-11 Eric Schulte + + * org.texi (Structure of code blocks): documentation + tweak + +2010-11-11 Eric Schulte + + * org.texi (Structure of code blocks): updating + documentation to mention inline code block syntax + +2010-11-11 Eric Schulte + + * org.texi (comments): improved wording + +2010-11-11 Eric Schulte + + * org.texi (comments): documenting the new :comments + header arguments + +2010-11-11 Carsten Dominik + + * org.texi (Installation): Remove the special + installation instructions for XEmacs. + +2010-11-11 Jambunathan K (tiny change) + + * org.texi (Easy Templates): New section. Documents quick + insertion of empty structural elements. + +2010-11-11 Noorul Islam + + * org.texi: Fix doc + +2010-11-11 Jambunathan K (tiny change) + + * org.texi (The date/time prompt): Document specification + of time ranges. + +2010-11-11 Carsten Dominik + + * org.texi (Internal links): Document the changes in + internal links. + +2010-11-11 Carsten Dominik + + * org.texi (Agenda commands): Document the limitation for + the filter preset - it can only be used for an entire agenda + view, not in an individual block in a block agenda. + +2010-11-11 Eric S Fraga + + * org.texi (iCalendar export): Document alarm creation. + 2010-11-10 Michael Albinus * dbus.texi (Type Conversion): Introduce `:unix-fd' type mapping. diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 97b8d3ebc03..af7a4b48032 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -4,8 +4,8 @@ @setfilename ../../info/org @settitle The Org Manual -@set VERSION 7.01 -@set DATE July 2010 +@set VERSION 7.3 +@set DATE November 2010 @c Use proper quote and backtick for code sections in PDF output @c Cf. Texinfo manual 14.2 @@ -22,6 +22,24 @@ @finalout @c Macro definitions +@macro orgcmd{key,command} +@iftex +@kindex \key\ +@findex \command\ +@item @kbd{\key\} @hskip 0pt plus 1filll @code{\command\} +@end iftex +@ifnottex +@kindex \key\ +@findex \command\ +@item @kbd{\key\} @tie{}@tie{}@tie{}@tie{}(@code{\command\}) +@end ifnottex +@end macro + +@macro orgkey{key} +@kindex \key\ +@item @kbd{\key\} +@end macro + @iftex @c @hyphenation{time-stamp time-stamps time-stamp-ing time-stamp-ed} @end iftex @@ -122,6 +140,7 @@ with contributions by David O'Toole, Bastien Guerry, Philip Rooke, Dan Davison, * History and Acknowledgments:: How Org came into being * Main Index:: An index of Org's concepts and features * Key Index:: Key bindings and where they are described +* Command and Function Index:: Command names and some internal functions * Variable Index:: Variables mentioned in the manual @detailmenu @@ -244,6 +263,7 @@ Dates and times * Resolving idle time:: Resolving time if you've been idle * Effort estimates:: Planning work effort in advance * Relative timer:: Notes with a running timer +* Countdown timer:: Starting a countdown timer for a task Creating timestamps @@ -364,6 +384,7 @@ HTML export * Links in HTML export:: How links will be interpreted and formatted * Tables in HTML export:: How to modify the formatting of tables * Images in HTML export:: How to insert figures into HTML output +* Math formatting in HTML export:: Beautiful math also on the web * Text areas in HTML export:: An alternative way to show an example * CSS support:: Changing the appearance of the output * JavaScript support:: Info and Folding in a web browser @@ -436,16 +457,22 @@ Using header arguments * Buffer-wide header arguments:: Set default values for a specific buffer * Header arguments in Org-mode properties:: Set default values for a buffer or heading * Code block specific header arguments:: The most common way to set values +* Header arguments in function calls:: The most specific level Specific header arguments * var:: Pass arguments to code blocks -* results:: Specify the type of results and how they will be collected and handled +* results:: Specify the type of results and how they will + be collected and handled * file:: Specify a path for file output -* dir:: Specify the default directory for code block execution +* dir:: Specify the default (possibly remote) + directory for code block execution * exports:: Export code and/or results * tangle:: Toggle tangling and specify file name -* no-expand:: Turn off variable assignment and noweb expansion during tangling +* comments:: Toggle insertion of comments in tangled + code files +* no-expand:: Turn off variable assignment and noweb + expansion during tangling * session:: Preserve the state of code evaluation * noweb:: Toggle expansion of noweb references * cache:: Avoid re-evaluating unchanged code blocks @@ -453,10 +480,12 @@ Specific header arguments * colnames:: Handle column names in tables * rownames:: Handle row names in tables * shebang:: Make tangled files executable +* eval:: Limit evaluation of specific code blocks Miscellaneous * Completion:: M-TAB knows what you need +* Easy Templates:: Quick insertion of structural elements * Speed keys:: Electric commands at the beginning of a headline * Code evaluation security:: Org mode files evaluate inline code * Customization:: Adapting Org to your taste @@ -608,18 +637,6 @@ step for this directory: (setq load-path (cons "~/path/to/orgdir/contrib/lisp" load-path)) @end example -@sp 2 -@cartouche -XEmacs users now need to install the file @file{noutline.el} from -the @file{xemacs} sub-directory of the Org distribution. Use the -command: - -@example - make install-noutline -@end example -@end cartouche -@sp 2 - @noindent Now byte-compile the Lisp files with the shell command: @example @@ -720,10 +737,15 @@ active region by using the mouse to select a region, or pressing If you find problems with Org, or if you have questions, remarks, or ideas about it, please mail to the Org mailing list @email{emacs-orgmode@@gnu.org}. If you are not a member of the mailing list, your mail will be passed to the -list after a moderator has approved it. - -For bug reports, please provide as much information as possible, including -the version information of Emacs (@kbd{M-x emacs-version @key{RET}}) and Org +list after a moderator has approved it@footnote{Please consider subscribing +to the mailing list, in order to minimize the work the mailing list +moderators have to do.}. + +For bug reports, please first try to reproduce the bug with the latest +version of Org available - if you are running an outdated version, it is +quite possible that the bug has been fixed already. If the bug persists, +prepare a report and provide as much information as possible, including the +version information of Emacs (@kbd{M-x emacs-version @key{RET}}) and Org (@kbd{M-x org-version @key{RET}}), as well as the Org related setup in @file{.emacs}. The easiest way to do this is to use the command @example @@ -742,7 +764,7 @@ about: @item What did you expect to happen? @item What happened instead? @end enumerate -@noindent Thank you for helping to improve this mode. +@noindent Thank you for helping to improve this program. @subsubheading How to create a useful backtrace @@ -886,9 +908,8 @@ Org uses just two commands, bound to @key{TAB} and @cindex folded, subtree visibility state @cindex children, subtree visibility state @cindex subtree, subtree visibility state -@table @kbd -@kindex @key{TAB} -@item @key{TAB} +@table @asis +@orgcmd{@key{TAB},org-cycle} @emph{Subtree cycling}: Rotate current subtree among the states @example @@ -910,8 +931,7 @@ argument (@kbd{C-u @key{TAB}}), global cycling is invoked. @cindex overview, global visibility state @cindex contents, global visibility state @cindex show all, global visibility state -@kindex S-@key{TAB} -@item S-@key{TAB} +@orgcmd{S-@key{TAB},org-global-cycle} @itemx C-u @key{TAB} @emph{Global cycling}: Rotate the entire buffer among the states @@ -925,22 +945,18 @@ CONTENTS view up to headlines of level N will be shown. Note that inside tables, @kbd{S-@key{TAB}} jumps to the previous field. @cindex show all, command -@kindex C-u C-u C-u @key{TAB} -@item C-u C-u C-u @key{TAB} +@orgcmd{C-u C-u C-u @key{TAB},show-all} Show all, including drawers. -@kindex C-c C-r -@item C-c C-r +@orgcmd{C-c C-r,org-reveal} Reveal context around point, showing the current entry, the following heading and the hierarchy above. Useful for working near a location that has been exposed by a sparse tree command (@pxref{Sparse trees}) or an agenda command (@pxref{Agenda commands}). With a prefix argument show, on each level, all sibling headings. With double prefix arg, also show the entire subtree of the parent. -@kindex C-c C-k -@item C-c C-k +@orgcmd{C-c C-k,show-branches} Expose all the headings of the subtree, CONTENT view for just one subtree. -@kindex C-c C-x b -@item C-c C-x b +@orgcmd{C-c C-x b,org-tree-to-indirect-buffer} Show the current subtree in an indirect buffer@footnote{The indirect buffer @ifinfo @@ -982,9 +998,8 @@ Furthermore, any entries with a @samp{VISIBILITY} property (@pxref{Properties and Columns}) will get their visibility adapted accordingly. Allowed values for this property are @code{folded}, @code{children}, @code{content}, and @code{all}. -@table @kbd -@kindex C-u C-u @key{TAB} -@item C-u C-u @key{TAB} +@table @asis +@orgcmd{C-u C-u @key{TAB},org-set-startup-visibility} Switch back to the startup visibility of the buffer, i.e. whatever is requested by startup options and @samp{VISIBILITY} properties in individual entries. @@ -997,24 +1012,18 @@ entries. @cindex headline navigation The following commands jump to other headlines in the buffer. -@table @kbd -@kindex C-c C-n -@item C-c C-n +@table @asis +@orgcmd{C-c C-n,outline-next-visible-heading} Next heading. -@kindex C-c C-p -@item C-c C-p +@orgcmd{C-c C-p,outline-previous-visible-heading} Previous heading. -@kindex C-c C-f -@item C-c C-f +@orgcmd{C-c C-f,org-forward-same-level} Next heading same level. -@kindex C-c C-b -@item C-c C-b +@orgcmd{C-c C-b,org-backward-same-level} Previous heading same level. -@kindex C-c C-u -@item C-c C-u +@orgcmd{C-c C-u,outline-up-heading} Backward to higher level heading. -@kindex C-c C-j -@item C-c C-j +@orgcmd{C-c C-j,org-goto} Jump to a different place without changing the current outline visibility. Shows the document structure in a temporary buffer, where you can use the following keys to find your destination: @@ -1049,9 +1058,8 @@ See also the variable @code{org-goto-interface}. @cindex sorting, of subtrees @cindex subtrees, cut and paste -@table @kbd -@kindex M-@key{RET} -@item M-@key{RET} +@table @asis +@orgcmd{M-@key{RET},org-insert-heading} @vindex org-M-RET-may-split-line Insert new heading with same level as current. If the cursor is in a plain list item, a new item is created (@pxref{Plain lists}). To force @@ -1066,62 +1074,48 @@ the content of that line is made the new heading. If the command is used at the end of a folded subtree (i.e. behind the ellipses at the end of a headline), then a headline like the current one will be inserted after the end of the subtree. -@kindex C-@key{RET} -@item C-@key{RET} +@orgcmd{C-@key{RET},org-insert-heading-respect-content} Just like @kbd{M-@key{RET}}, except when adding a new heading below the current heading, the new heading is placed after the body instead of before it. This command works from anywhere in the entry. -@kindex M-S-@key{RET} -@item M-S-@key{RET} +@orgcmd{M-S-@key{RET},org-insert-todo-heading} @vindex org-treat-insert-todo-heading-as-state-change Insert new TODO entry with same level as current heading. See also the variable @code{org-treat-insert-todo-heading-as-state-change}. -@kindex C-S-@key{RET} -@item C-S-@key{RET} +@orgcmd{C-S-@key{RET},org-insert-todo-heading-respect-content} Insert new TODO entry with same level as current heading. Like @kbd{C-@key{RET}}, the new headline will be inserted after the current subtree. -@kindex @key{TAB} -@item @key{TAB} @r{in new, empty entry} +@orgcmd{@key{TAB},org-cycle} In a new entry with no text yet, the first @key{TAB} demotes the entry to become a child of the previous one. The next @key{TAB} makes it a parent, and so on, all the way to top level. Yet another @key{TAB}, and you are back to the initial level. -@kindex M-@key{left} -@item M-@key{left} +@orgcmd{M-@key{left},org-do-promote} Promote current heading by one level. -@kindex M-@key{right} -@item M-@key{right} +@orgcmd{M-@key{right},org-do-demote} Demote current heading by one level. -@kindex M-S-@key{left} -@item M-S-@key{left} +@orgcmd{M-S-@key{left},org-promote-subtree} Promote the current subtree by one level. -@kindex M-S-@key{right} -@item M-S-@key{right} +@orgcmd{M-S-@key{right},org-demote-subtree} Demote the current subtree by one level. -@kindex M-S-@key{up} -@item M-S-@key{up} +@orgcmd{M-S-@key{up},org-move-subtree-up} Move subtree up (swap with previous subtree of same level). -@kindex M-S-@key{down} -@item M-S-@key{down} +@orgcmd{M-S-@key{down},org-move-subtree-down} Move subtree down (swap with next subtree of same level). -@kindex C-c C-x C-w -@item C-c C-x C-w +@orgcmd{C-c C-x C-w,org-cut-subtree} Kill subtree, i.e. remove it from buffer but save in kill ring. With a numeric prefix argument N, kill N sequential subtrees. -@kindex C-c C-x M-w -@item C-c C-x M-w +@orgcmd{C-c C-x M-w,org-copy-subtree} Copy subtree to kill ring. With a numeric prefix argument N, copy the N sequential subtrees. -@kindex C-c C-x C-y -@item C-c C-x C-y +@orgcmd{C-c C-x C-y,org-paste-subtree} Yank subtree from kill ring. This does modify the level of the subtree to make sure the tree fits in nicely at the yank position. The yank level can also be specified with a numeric prefix argument, or by yanking after a headline marker like @samp{****}. -@kindex C-y -@item C-y +@orgcmd{C-y,org-yank} @vindex org-yank-adjusted-subtrees @vindex org-yank-folded-subtrees Depending on the variables @code{org-yank-adjusted-subtrees} and @@ -1134,19 +1128,16 @@ previously visible. Any prefix argument to this command will force a normal force a normal yank is @kbd{C-u C-y}. If you use @code{yank-pop} after a yank, it will yank previous kill items plainly, without adjustment and folding. -@kindex C-c C-x c -@item C-c C-x c +@orgcmd{C-c C-x c,org-clone-subtree-with-time-shift} Clone a subtree by making a number of sibling copies of it. You will be prompted for the number of copies to make, and you can also specify if any timestamps in the entry should be shifted. This can be useful, for example, to create a number of tasks related to a series of lectures to prepare. For more details, see the docstring of the command @code{org-clone-subtree-with-time-shift}. -@kindex C-c C-w -@item C-c C-w +@orgcmd{C-c C-w,org-refile} Refile entry or region to a different location. @xref{Refiling notes}. -@kindex C-c ^ -@item C-c ^ +@orgcmd{C-c ^,org-sort-entries-or-items} Sort same-level entries. When there is an active region, all entries in the region will be sorted. Otherwise the children of the current headline are sorted. The command prompts for the sorting method, which can be @@ -1157,14 +1148,11 @@ of a property. Reverse sorting is possible as well. You can also supply your own function to extract the sorting key. With a @kbd{C-u} prefix, sorting will be case-sensitive. With two @kbd{C-u C-u} prefixes, duplicate entries will also be removed. -@kindex C-x n s -@item C-x n s +@orgcmd{C-x n s,org-narrow-to-subtree} Narrow buffer to current subtree. -@kindex C-x n w -@item C-x n w +@orgcmd{C-x n w,widen} Widen buffer to remove narrowing. -@kindex C-c * -@item C-c * +@orgcmd{C-c *,org-toggle-heading} Turn a normal line or plain list item into a headline (so that it becomes a subheading at its location). Also turn a headline into a normal line by removing the stars. If there is an active region, turn all lines in the @@ -1208,9 +1196,8 @@ and you will see immediately how it works. Org-mode contains several commands creating such trees, all these commands can be accessed through a dispatcher: -@table @kbd -@kindex C-c / -@item C-c / +@table @asis +@orgcmd{C-c /,org-sparse-tree} This prompts for an extra key to select a sparse-tree creating command. @kindex C-c / r @item C-c / r @@ -1264,9 +1251,9 @@ part of the document and print the resulting file. @cindex ordered lists Within an entry of the outline tree, hand-formatted lists can provide -additional structure. They also provide a way to create lists of -checkboxes (@pxref{Checkboxes}). Org supports editing such lists, -and the HTML exporter (@pxref{Exporting}) parses and formats them. +additional structure. They also provide a way to create lists of checkboxes +(@pxref{Checkboxes}). Org supports editing such lists, and every exporter +(@pxref{Exporting}) can parse and format them. Org knows ordered lists, unordered lists, and description lists. @itemize @bullet @@ -1279,26 +1266,39 @@ visually indistinguishable from true headlines. In short: even though @samp{*} is supported, it may be better to not use it for plain list items.} as bullets. @item +@vindex org-plain-list-ordered-item-terminator @emph{Ordered} list items start with a numeral followed by either a period or -a right parenthesis, such as @samp{1.} or @samp{1)}. If you want a list to -start a different value (e.g. 20), start the text of the item with -@code{[@@start:20]}. +a right parenthesis@footnote{You can filter out any of them by configuring +@code{org-plain-list-ordered-item-terminator}.}, such as @samp{1.} or +@samp{1)}. If you want a list to start a different value (e.g. 20), start +the text of the item with @code{[@@20]}@footnote{If there's a checkbox in the +item, the cookie must be put @emph{before} the checkbox.}. Those constructs +can be used in any item of the list in order to enforce a particular +numbering. @item @emph{Description} list items are unordered list items, and contain the separator @samp{ :: } to separate the description @emph{term} from the description. @end itemize -@vindex org-empty-line-terminates-plain-lists Items belonging to the same list must have the same indentation on the first line. In particular, if an ordered list reaches number @samp{10.}, then the 2--digit numbers must be written left-aligned with the other numbers in the -list. Indentation also determines the end of a list item. It ends before -the next line that is indented like the bullet/number, or less. Empty lines -are part of the previous item, so you can have several paragraphs in one -item. If you would like an empty line to terminate all currently open plain -lists, configure the variable @code{org-empty-line-terminates-plain-lists}. -Here is an example: +list. + +@vindex org-list-ending-method +@vindex org-list-end-regexp +@vindex org-empty-line-terminates-plain-lists +Two methods@footnote{To disable either of them, configure +@code{org-list-ending-method}.} are provided to terminate lists. A list ends +before the next line that is indented like the bullet/number or less, or it +ends before two blank lines@footnote{See also +@code{org-empty-line-terminates-plain-lists}.}. In both cases, all levels of +the list are closed@footnote{So you cannot have a sublist, some text and then +another sublist while still in the same top-level list item. This used to be +possible, but it was only supported in the HTML exporter and difficult to +manage with automatic indentation.}. For finer control, you can end lists +with any pattern set in @code{org-list-end-regexp}. Here is an example: @example @group @@ -1309,8 +1309,8 @@ Here is an example: + this was already my favorite scene in the book + I really like Miranda Otto. 3. Peter Jackson being shot by Legolas - - on DVD only He makes a really funny face when it happens. + - on DVD only But in the end, no individual scenes matter but the film as a whole. Important actors in this film are: - @b{Elijah Wood} :: He plays Frodo @@ -1325,19 +1325,23 @@ XEmacs, you should use Kyle E. Jones' @file{filladapt.el}. To turn this on, put into @file{.emacs}: @code{(require 'filladapt)}}, and by exporting them properly (@pxref{Exporting}). Since indentation is what governs the structure of these lists, many structural constructs like @code{#+BEGIN_...} -blocks can be indented to signal that they should be part of a list item. +blocks can be indented to signal that they should be considered of a list +item. @vindex org-list-demote-modify-bullet If you find that using a different bullet for a sub-list (than that used for the current list-level) improves readability, customize the variable @code{org-list-demote-modify-bullet}. -The following commands act on items when the cursor is in the first line -of an item (the line with the bullet or number). +@vindex org-list-automatic-rules +The following commands act on items when the cursor is in the first line of +an item (the line with the bullet or number). Some of them imply the +application of automatic rules to keep list structure in tact. If some of +these actions get in your way, configure @code{org-list-automatic-rules} +to disable them individually. -@table @kbd -@kindex @key{TAB} -@item @key{TAB} +@table @asis +@orgcmd{@key{TAB},org-cycle} @vindex org-cycle-include-plain-lists Items can be folded just like headline levels. Normally this works only if the cursor is on a plain list item. For more details, see the variable @@ -1345,31 +1349,29 @@ the cursor is on a plain list item. For more details, see the variable will be treated like low-level. The level of an item is then given by the indentation of the bullet/number. Items are always subordinate to real headlines, however; the hierarchies remain completely separated. - -If @code{org-cycle-include-plain-lists} has not been set, @key{TAB} -fixes the indentation of the current line in a heuristic way. -@kindex M-@key{RET} -@item M-@key{RET} +@orgcmd{M-@key{RET},org-insert-heading} @vindex org-M-RET-may-split-line +@vindex org-list-automatic-rules Insert new item at current level. With a prefix argument, force a new heading (@pxref{Structure editing}). If this command is used in the middle of a line, the line is @emph{split} and the rest of the line becomes the new item@footnote{If you do not want the line to be split, customize the variable -@code{org-M-RET-may-split-line}.}. If this command is executed in the -@emph{whitespace before a bullet or number}, the new item is created -@emph{before} the current item. If the command is executed in the white -space before the text that is part of an item but does not contain the -bullet, a bullet is added to the current line. +@code{org-M-RET-may-split-line}.}. If this command is executed @emph{before +item's body}, the new item is created @emph{before} the current item. If the +command is executed in the white space before the text that is part of an +item but does not contain the bullet, a bullet is added to the current line. + +As a new item cannot be inserted in a structural construct (like an example +or source code block) within a list, Org will instead insert it right before +the structure, or return an error. @kindex M-S-@key{RET} @item M-S-@key{RET} Insert a new item with a checkbox (@pxref{Checkboxes}). -@kindex @key{TAB} -@item @key{TAB} @r{in new, empty item} +@orgcmd{@key{TAB},org-cycle} In a new item with no text yet, the first @key{TAB} demotes the item to -become a child of the previous one. The next @key{TAB} makes it a parent, -and so on, all the way to the left margin. Yet another @key{TAB}, and you -are back to the initial level. -@kindex S-@key{up} +become a child of the previous one. Subsequents @key{TAB} move the item to +meaningful levels in the list and eventually get it back to its initial +position. @kindex S-@key{down} @item S-@key{up} @itemx S-@key{down} @@ -1396,25 +1398,35 @@ Decrease/increase the indentation of an item, leaving children alone. @item M-S-@key{left} @itemx M-S-@key{right} Decrease/increase the indentation of the item, including subitems. -Initially, the item tree is selected based on current indentation. -When these commands are executed several times in direct succession, -the initially selected region is used, even if the new indentation -would imply a different hierarchy. To use the new hierarchy, break -the command chain with a cursor motion or so. +Initially, the item tree is selected based on current indentation. When +these commands are executed several times in direct succession, the initially +selected region is used, even if the new indentation would imply a different +hierarchy. To use the new hierarchy, break the command chain with a cursor +motion or so. + +As a special case, using this command on the very first item of a list will +move the whole list. This behavior can be disabled by configuring +@code{org-list-automatic-rules}. The global indentation of a list has no +influence on the text @emph{after} the list. @kindex C-c C-c @item C-c C-c If there is a checkbox (@pxref{Checkboxes}) in the item line, toggle the -state of the checkbox. If not, this command makes sure that all the -items on this list level use the same bullet. Furthermore, if this is -an ordered list, make sure the numbering is OK. +state of the checkbox. Also, makes sure that all the +items on this list level use the same bullet and that the numbering of list +items (if applicable) is correct. @kindex C-c - +@vindex org-plain-list-ordered-item-terminator +@vindex org-list-automatic-rules @item C-c - Cycle the entire list level through the different itemize/enumerate bullets -(@samp{-}, @samp{+}, @samp{*}, @samp{1.}, @samp{1)}). With a numeric prefix -argument N, select the Nth bullet from this list. If there is an active -region when calling this, all lines will be converted to list items. If the -first line already was a list item, any item markers will be removed from the -list. Finally, even without an active region, a normal line will be +(@samp{-}, @samp{+}, @samp{*}, @samp{1.}, @samp{1)}) or a subset of them, +depending on @code{org-plain-list-ordered-item-terminator}, the type of list, +and its position@footnote{See @code{bullet} rule in +@code{org-list-automatic-rules} for more information.}. With a numeric +prefix argument N, select the Nth bullet from this list. If there is an +active region when calling this, all lines will be converted to list items. +If the first line already was a list item, any item markers will be removed +from the list. Finally, even without an active region, a normal line will be converted into a list item. @kindex C-c * @item C-c * @@ -1696,8 +1708,7 @@ unpredictable for you, configure the variables @table @kbd @tsubheading{Creation and conversion} -@kindex C-c | -@item C-c | +@orgcmd{C-c |,org-table-create-or-convert-from-region} Convert the active region to table. If every line contains at least one TAB character, the function assumes that the material is tab separated. If every line contains a comma, comma-separated values (CSV) are assumed. @@ -1711,21 +1722,17 @@ table. But it's easier just to start typing, like @kbd{|Name|Phone|Age @key{RET} |- @key{TAB}}. @tsubheading{Re-aligning and field motion} -@kindex C-c C-c -@item C-c C-c +@orgcmd{C-c C-c,org-ctrl-c-ctrl-c} Re-align the table without moving the cursor. @c -@kindex @key{TAB} -@item @key{TAB} +@orgcmd{,org-cycle} Re-align the table, move to the next field. Creates a new row if necessary. @c -@kindex S-@key{TAB} -@item S-@key{TAB} +@orgcmd{S-@key{TAB},org-shifttab} Re-align, move to previous field. @c -@kindex @key{RET} -@item @key{RET} +@orgcmd{@key{RET},org-return} Re-align the table and move down to next row. Creates a new row if necessary. At the beginning or end of a line, @key{RET} still does NEWLINE, so it can be used to split a table. @@ -1940,9 +1947,10 @@ on a per-file basis with: @end example If you would like to overrule the automatic alignment of number-rich columns -to the right and of string-rich column to the left, you and use @samp{} or -@samp{} in a similar fashion. You may also combine alignment and field -width like this: @samp{}. +to the right and of string-rich column to the left, you and use @samp{}, +@samp{c}@footnote{Centering does not work inside Emacs, but it does have an +effect when exporting to HTML.} or @samp{} in a similar fashion. You may +also combine alignment and field width like this: @samp{}. Lines which only contain these formatting cookies will be removed automatically when exporting the document. @@ -2807,23 +2815,13 @@ text before the first headline is usually not exported, so the first such target should be after the first headline, or in the line directly before the first headline.}. -If no dedicated target exists, Org will search for the words in the link. In -the above example the search would be for @samp{my target}. Links starting -with a star like @samp{*My Target} restrict the search to -headlines@footnote{To insert a link targeting a headline, in-buffer -completion can be used. Just type a star followed by a few optional letters -into the buffer and press @kbd{M-@key{TAB}}. All headlines in the current -buffer will be offered as completions. @xref{Handling links}, for more -commands creating links.}. When searching, Org-mode will first try an -exact match, but then move on to more and more lenient searches. For -example, the link @samp{[[*My Targets]]} will find any of the following: - -@example -** My targets -** TODO my targets are bright -** my 20 targets are -@end example - +If no dedicated target exists, Org will search for a headline that is exactly +the link text but may also include a TODO keyword and tags@footnote{To insert +a link targeting a headline, in-buffer completion can be used. Just type a +star followed by a few optional letters into the buffer and press +@kbd{M-@key{TAB}}. All headlines in the current buffer will be offered as +completions.}. In non-Org files, the search will look for the words in the +link text, in the above example the search would be for @samp{my target}. Following a link pushes a mark onto Org's own mark ring. You can return to the previous position with @kbd{C-c &}. Using this command @@ -3087,11 +3085,17 @@ variable @code{org-display-internal-link-with-indirect-buffer}}. @cindex inlining images @cindex images, inlining @kindex C-c C-x C-v +@vindex org-startup-with-inline-images +@cindex @code{inlineimages}, STARTUP keyword +@cindex @code{noinlineimages}, STARTUP keyword @item C-c C-x C-v Toggle the inline display of linked images. Normally this will only inline images that have no description part in the link, i.e. images that will also be inlined during export. When called with a prefix argument, also display -images that do have a link description. +images that do have a link description. You can ask for inline images to be +displayed at startup by configuring the variable +@code{org-startup-with-inline-images}@footnote{with corresponding +@code{#+STARTUP} keywords @code{inlineimages} and @code{inlineimages}}. @cindex mark ring @kindex C-c % @item C-c % @@ -3157,15 +3161,16 @@ letters, numbers, @samp{-}, and @samp{_}. Abbreviations are resolved according to the information in the variable @code{org-link-abbrev-alist} that relates the linkwords to replacement text. Here is an example: -@lisp +@smalllisp @group (setq org-link-abbrev-alist '(("bugzilla" . "http://10.1.2.9/bugzilla/show_bug.cgi?id=") ("google" . "http://www.google.com/search?q=") - ("ads" . "http://adsabs.harvard.edu/cgi-bin/ - nph-abs_connect?author=%s&db_key=AST"))) + ("gmap" . "http://maps.google.com/maps?q=%s") + ("omap" . "http://nominatim.openstreetmap.org/search?q=%s&polygon=1") + ("ads" . "http://adsabs.harvard.edu/cgi-bin/nph-abs_connect?author=%s&db_key=AST"))) @end group -@end lisp +@end smalllisp If the replacement text contains the string @samp{%s}, it will be replaced with the tag. Otherwise the tag will be appended to the string @@ -3174,8 +3179,11 @@ be called with the tag as the only argument to create the link. With the above setting, you could link to a specific bug with @code{[[bugzilla:129]]}, search the web for @samp{OrgMode} with -@code{[[google:OrgMode]]} and find out what the Org author is -doing besides Emacs hacking with @code{[[ads:Dominik,C]]}. +@code{[[google:OrgMode]]}, show the map location of the Free Software +Foundation @code{[[gmap:51 Franklin Street, Boston]]} or of Carsten office +@code{[[omap:Science Park 904, Amsterdam, The Netherlands]]} and find out +what the Org author is doing besides Emacs hacking with +@code{[[ads:Dominik,C]]}. If you need special abbreviations just for a single Org buffer, you can define them in the file with @@ -3810,7 +3818,10 @@ The habit is a TODO, with a TODO keyword representing an open state. @item The property @code{STYLE} is set to the value @code{habit}. @item -The TODO has a scheduled date, with a @code{.+} style repeat interval. +The TODO has a scheduled date, usually with a @code{.+} style repeat +interval. A @code{++} style may be appropriate for habits with time +constraints, e.g., must be done on weekends, or a @code{+} style for an +unusual habit that can have a backlog, e.g., weekly reports. @item The TODO may also have minimum and maximum ranges specified by using the syntax @samp{.+2d/3d}, which says that you want to do the task at least every @@ -3908,13 +3919,13 @@ placing a @emph{priority cookie} into the headline of a TODO item, like this @vindex org-priority-faces By default, Org-mode supports three priorities: @samp{A}, @samp{B}, and @samp{C}. @samp{A} is the highest priority. An entry without a cookie is -treated as priority @samp{B}. Priorities make a difference only in the -agenda (@pxref{Weekly/daily agenda}); outside the agenda, they have no -inherent meaning to Org-mode. The cookies can be highlighted with special -faces by customizing the variable @code{org-priority-faces}. +treated just like priority @samp{B}. Priorities make a difference only for +sorting in the agenda (@pxref{Weekly/daily agenda}); outside the agenda, they +have no inherent meaning to Org-mode. The cookies can be highlighted with +special faces by customizing the variable @code{org-priority-faces}. -Priorities can be attached to any outline tree entries; they do not need -to be TODO items. +Priorities can be attached to any outline node; they do not need to be TODO +items. @table @kbd @kindex @kbd{C-c ,} @@ -4017,13 +4028,16 @@ large number of subtasks (@pxref{Checkboxes}). @section Checkboxes @cindex checkboxes -Every item in a plain list (@pxref{Plain lists}) can be made into a -checkbox by starting it with the string @samp{[ ]}. This feature is -similar to TODO items (@pxref{TODO Items}), but is more lightweight. -Checkboxes are not included into the global TODO list, so they are often -great to split a task into a number of simple steps. Or you can use -them in a shopping list. To toggle a checkbox, use @kbd{C-c C-c}, or -use the mouse (thanks to Piotr Zielinski's @file{org-mouse.el}). +@vindex org-list-automatic-rules +Every item in a plain list@footnote{With the exception of description +lists. But you can allow it by modifying @code{org-list-automatic-rules} +accordingly.} (@pxref{Plain lists}) can be made into a checkbox by starting +it with the string @samp{[ ]}. This feature is similar to TODO items +(@pxref{TODO Items}), but is more lightweight. Checkboxes are not included +into the global TODO list, so they are often great to split a task into a +number of simple steps. Or you can use them in a shopping list. To toggle a +checkbox, use @kbd{C-c C-c}, or use the mouse (thanks to Piotr Zielinski's +@file{org-mouse.el}). Here is an example of a checkbox list. @@ -4738,8 +4752,8 @@ optional. The individual parts have the following meaning: @var{property} @r{The property that should be edited in this column.} @r{Special properties representing meta data are allowed here} @r{as well (@pxref{Special properties})} -(title) @r{The header text for the column. If omitted, the} - @r{property name is used.} +@var{title} @r{The header text for the column. If omitted, the property} + @r{name is used.} @{@var{summary-type}@} @r{The summary type. If specified, the column values for} @r{parent nodes are computed from the children.} @r{Supported summary types are:} @@ -4756,9 +4770,10 @@ optional. The individual parts have the following meaning: @{:min@} @r{Smallest time value in column.} @{:max@} @r{Largest time value.} @{:mean@} @r{Arithmetic mean of time values.} - @{@@min@} @r{Minimum age (in days/hours/mins/seconds).} - @{@@max@} @r{Maximum age (in days/hours/mins/seconds).} - @{@@mean@} @r{Arithmetic mean of ages (in days/hours/mins/seconds).} + @{@@min@} @r{Minimum age (in days/hours/mins/seconds).} + @{@@max@} @r{Maximum age (in days/hours/mins/seconds).} + @{@@mean@} @r{Arithmetic mean of ages (in days/hours/mins/seconds).} + @{est+@} @r{Add low-high estimates.} @end example @noindent @@ -4766,6 +4781,22 @@ Be aware that you can only have one summary type for any property you include. Subsequent columns referencing the same property will all display the same summary information. +The @code{est+} summary type requires further explanation. It is used for +combining estimates, expressed as low-high ranges. For example, instead +of estimating a particular task will take 5 days, you might estimate it as +5-6 days if you're fairly confident you know how much woark is required, or +1-10 days if you don't really know what needs to be done. Both ranges +average at 5.5 days, but the first represents a more predictable delivery. + +When combining a set of such estimates, simply adding the lows and highs +produces an unrealistically wide result. Instead, @code{est+} adds the +statistical mean and variance of the sub-tasks, generating a final estimate +from the sum. For example, suppose you had ten tasks, each of which was +estimated at 0.5 to 2 days of work. Straight addition produces an estimate +of 5 to 20 days, representing what to expect if everything goes either +extremely well or extremely poorly. In contrast, @code{est+} estimates the +full job more realistically, at 10-15 days. + Here is an example for a complete columns definition, along with allowed values. @@ -4978,6 +5009,7 @@ is used in a much wider sense. * Resolving idle time:: Resolving time if you've been idle * Effort estimates:: Planning work effort in advance * Relative timer:: Notes with a running timer +* Countdown timer:: Starting a countdown timer for a task @end menu @@ -5067,15 +5099,13 @@ format. All commands listed below produce timestamps in the correct format. @table @kbd -@kindex C-c . -@item C-c . +@orgcmd{C-c .,org-time-stamp} Prompt for a date and insert a corresponding timestamp. When the cursor is at an existing timestamp in the buffer, the command is used to modify this timestamp instead of inserting a new one. When this command is used twice in succession, a time range is inserted. @c -@kindex C-c ! -@item C-c ! +@orgcmd{C-c !,org-time-stamp-inactive} Like @kbd{C-c .}, but insert an inactive timestamp that will not cause an agenda entry. @c @@ -5088,18 +5118,15 @@ Like @kbd{C-c .} and @kbd{C-c !}, but use the alternative format which contains date and time. The default time can be rounded to multiples of 5 minutes, see the option @code{org-time-stamp-rounding-minutes}. @c -@kindex C-c < -@item C-c < +@orgcmd{C-c <,org-date-from-calendar} Insert a timestamp corresponding to the cursor date in the Calendar. @c -@kindex C-c > -@item C-c > +@orgcmd{C-c >,org-goto-calendar} Access the Emacs calendar for the current date. If there is a timestamp in the current line, go to the corresponding date instead. @c -@kindex C-c C-o -@item C-c C-o +@orgcmd{C-c C-o,org-open-at-point} Access the agenda for the date given by the timestamp or -range at point (@pxref{Weekly/daily agenda}). @c @@ -5206,6 +5233,16 @@ The function understands English month and weekday abbreviations. If you want to use unabbreviated names and/or other languages, configure the variables @code{parse-time-months} and @code{parse-time-weekdays}. +You can specify a time range by giving start and end times or by giving a +start time and a duration (in HH:MM format). Use '-' or '--' as the separator +in the former case and use '+' as the separator in the latter case. E.g. + +@example +11am-1:15pm --> 11:00-13:15 +11am--1:15pm --> same as above +11am+2:15 --> same as above +@end example + @cindex calendar, for selecting date @vindex org-popup-calendar-for-date-prompt Parallel to the minibuffer prompt, a calendar is popped up@footnote{If @@ -5593,9 +5630,8 @@ Cancel the current clock. This is useful if a clock was started by mistake, or if you ended up working on something else. @kindex C-c C-x C-j @item C-c C-x C-j -Jump to the entry that contains the currently running clock. With a -@kbd{C-u} prefix arg, select the target task from a list of recently clocked -tasks. +Jump to the headline of the currently clocked in task. With a @kbd{C-u} +prefix arg, select the target task from a list of recently clocked tasks. @kindex C-c C-x C-d @item C-c C-x C-d @vindex org-remove-highlights-with-change @@ -5835,7 +5871,7 @@ with the @kbd{/} key in the agenda (@pxref{Agenda commands}). If you have these estimates defined consistently, two or three key presses will narrow down the list to stuff that fits into an available time slot. -@node Relative timer, , Effort estimates, Dates and Times +@node Relative timer, Countdown timer, Effort estimates, Dates and Times @section Taking notes with a relative timer @cindex relative timer @@ -5877,6 +5913,20 @@ by a certain amount. This can be used to fix timer strings if the timer was not started at exactly the right moment. @end table +@node Countdown timer, , Relative timer, Dates and Times +@section Countdown timer +@cindex Countdown timer +@kindex C-c C-x ; +@kindex ; + +Calling @code{org-timer-set-timer} from an Org-mode buffer runs a countdown +timer. Use @key{;} from agenda buffers, @key{C-c C-x ;} everwhere else. + +@code{org-timer-set-timer} prompts the user for a duration and displays a +countdown timer in the modeline. @code{org-timer-default-timer} sets the +default countdown value. Giving a prefix numeric argument overrides this +default value. + @node Capture - Refile - Archive, Agenda Views, Dates and Times, Top @chapter Capture - Refile - Archive @cindex capture @@ -5934,6 +5984,7 @@ The following customization sets a default target file for notes, and defines a global key@footnote{Please select your own key, @kbd{C-c c} is only a suggestion.} for capturing new material. +@vindex org-default-notes-file @example (setq org-default-notes-file (concat org-directory "/notes.org")) (define-key global-map "\C-cc" 'org-capture) @@ -5960,7 +6011,10 @@ process, so that you can resume your work without further distraction. @kindex C-c C-w @item C-c C-w Finalize the capture process by refiling (@pxref{Refiling notes}) the note to -a different place. +a different place. Please realize that this is a normal refiling command +that will be executed - so the cursor position at the moment you run this +command is important. If you have inserted a tree with a parent and +children, first move the cursor back to the parent. @kindex C-c C-k @item C-c C-k @@ -6067,10 +6121,12 @@ Text to be inserted as it is. @end table @item target -Specification of where the captured item should be placed. -In Org-mode files, targets usually define a node. Entries will become -children of this node, other types will be added to the table or list in the -body of this node. +@vindex org-default-notes-file +Specification of where the captured item should be placed. In Org-mode +files, targets usually define a node. Entries will become children of this +node, other types will be added to the table or list in the body of this +node. Most target specifications contain a file name. If that file name is +the empty string, it defaults to @code{org-default-notes-file}. Valid values are: @table @code @@ -6139,6 +6195,10 @@ with the capture. @item :unnarrowed Do not narrow the target buffer, simply show the full buffer. Default is to narrow it so that you only see the new material. + +@item :kill-buffer +If the target file was not yet visited when capture was invoked, kill the +buffer again after capture is completed. @end table @end table @@ -6191,16 +6251,19 @@ similar way.}: @smallexample Link type | Available keywords -------------------+---------------------------------------------- -bbdb | %:name %:company -bbdb | %::server %:port %:nick -vm, wl, mh, rmail | %:type %:subject %:message-id - | %:from %:fromname %:fromaddress - | %:to %:toname %:toaddress - | %:fromto @r{(either "to NAME" or "from NAME")@footnote{This will always be the other, not the user. See the variable @code{org-from-is-user-regexp}.}} -gnus | %:group, @r{for messages also all email fields} -w3, w3m | %:url -info | %:file %:node -calendar | %:date +bbdb | %:name %:company +irc | %:server %:port %:nick +vm, wl, mh, mew, rmail | %:type %:subject %:message-id + | %:from %:fromname %:fromaddress + | %:to %:toname %:toaddress + | %:date @r{(message date header field)} + | %:date-timestamp @r{(date as active timestamp)} + | %:date-timestamp-inactive @r{(date as inactive timestamp)} + | %:fromto @r{(either "to NAME" or "from NAME")@footnote{This will always be the other, not the user. See the variable @code{org-from-is-user-regexp}.}} +gnus | %:group, @r{for messages also all email fields} +w3, w3m | %:url +info | %:file %:node +calendar | %:date @end smallexample @noindent @@ -7247,6 +7310,7 @@ associated with the item. @subsection Categories @cindex category +@cindex #+CATEGORY The category is a broad label assigned to each agenda item. By default, the category is simply derived from the file name, but you can also specify it with a special line in the buffer, like this@footnote{For @@ -7474,6 +7538,10 @@ Go to today. @item j Prompt for a date and go there. @c +@kindex J +@item J +Go to the currently clocked in task in the agenda buffer. +@c @kindex D @item D Toggle the inclusion of diary entries. See @ref{Weekly/daily agenda}. @@ -7584,7 +7652,9 @@ very fast, so that you can switch quickly between different filters without having to recreate the agenda@footnote{Custom commands can preset a filter by binding the variable @code{org-agenda-filter-preset} as an option. This filter will then be applied to the view and persist as a basic filter through -refreshes and more secondary filtering.} +refreshes and more secondary filtering. The filter is a global property of +the entire agenda view - in a block agenda, you should only set this in the +global options section, not in the section of an individual block.} You will be prompted for a tag selection letter, SPC will mean any tag at all. Pressing @key{TAB} at that prompt will offer use completion to select a @@ -8600,6 +8670,7 @@ You may also define additional attributes for the figure. As this is backend-specific, see the sections about the individual backends for more information. +@xref{Handling links,the discussion of image links}. @node Literal examples, Include files, Images and tables, Markup @section Literal examples @@ -8631,13 +8702,24 @@ Here is an example @cindex formatting source code, markup rules If the example is source code from a programming language, or any other text that can be marked up by font-lock in Emacs, you can ask for the example to -look like the fontified Emacs buffer@footnote{Currently this works for the -HTML backend, and requires the @file{htmlize.el} package version 1.34 or -later. It also works for LaTeX with the listings package, if you turn on the -option @code{org-export-latex-listings} and make sure that the listings -package is included by the LaTeX header.}. This is done with the @samp{src} -block, where you also need to specify the name of the major mode that should -be used to fontify the example: +look like the fontified Emacs buffer@footnote{This works automatically for +the HTML backend (it requires version 1.34 of the @file{htmlize.el} package, +which is distributed with Org.) Fontified code chunks in LaTeX can be +achieved using either the listings or the +@url{http://code.google.com/p/minted, minted,} package. To use listings, turn +on the variable @code{org-export-latex-listings} and ensure that the listings +package is included by the LaTeX header (e.g. by configuring +@code{org-export-latex-packages-alist}). See the listings documentation for +configuration options, including obtaining colored output. For minted it is +necessary to install the program @url{http://pygments.org, pygments}, in +addition to setting @code{org-export-latex-minted}, ensuring that the minted +package is included by the LaTeX header, and ensuring that the +@code{-shell-escape} option is passed to @file{pdflatex} (see +@code{org-latex-to-pdf-process}). See the documentation of the variables +@code{org-export-latex-listings} and @code{org-export-latex-minted} for +further details.}. This is done with the @samp{src} block, where you also +need to specify the name of the major mode that should be used to fontify the +example: @cindex #+BEGIN_SRC @example @@ -8794,12 +8876,9 @@ is a macro system based on Donald E. Knuth's @TeX{} system. Many of the features described here as ``La@TeX{}'' are really from @TeX{}, but for simplicity I am blurring this distinction.} is widely used to typeset scientific documents. Org-mode supports embedding La@TeX{} code into its -files, because many academics are used to reading La@TeX{} source code, and -because it can be readily processed into images for HTML production. - -It is not necessary to mark La@TeX{} macros and code in any special way. -If you observe a few conventions, Org-mode knows how to find it and what -to do with it. +files, because many academics are used to writing and reading La@TeX{} source +code, and because it can be readily processed to produce pretty output for a +number of export backends. @menu * Special symbols:: Greek letters and other symbols @@ -8843,7 +8922,7 @@ La@TeX{}, see the variable @code{org-entities} for the complete list. @samp{...} are all converted into special commands creating hyphens of different lengths or a compact set of dots. -If you would like to see entities displayed as utf8 characters, use the +If you would like to see entities displayed as UTF8 characters, use the following command@footnote{You can turn this on by default by setting the variable @code{org-pretty-entities}, or on a per-file base with the @code{#+STARTUP} option @code{entitiespretty}.}: @@ -8884,6 +8963,9 @@ convention, or use, on a per-file basis: #+OPTIONS: ^:@{@} @end example +@noindent With this setting, @samp{a_b} will not be interpreted as a +subscript, but @samp{a_@{b@}} will. + @table @kbd @kindex C-c C-x \ @item C-c C-x \ @@ -8896,31 +8978,31 @@ format sub- and superscripts in a WYSIWYM way. @cindex La@TeX{} fragments @vindex org-format-latex-header -With symbols, sub- and superscripts, HTML is pretty much at its end when -it comes to representing mathematical formulas@footnote{Yes, there is -MathML, but that is not yet fully supported by many browsers, and there -is no decent converter for turning La@TeX{} or ASCII representations of -formulas into MathML. So for the time being, converting formulas into -images seems the way to go.}. More complex expressions need a dedicated -formula processor. To this end, Org-mode can contain arbitrary La@TeX{} -fragments. It provides commands to preview the typeset result of these -fragments, and upon export to HTML, all fragments will be converted to -images and inlined into the HTML document@footnote{The La@TeX{} export -will not use images for displaying La@TeX{} fragments but include these -fragments directly into the La@TeX{} code.}. For this to work you -need to be on a system with a working La@TeX{} installation. You also -need the @file{dvipng} program, available at -@url{http://sourceforge.net/projects/dvipng/}. The La@TeX{} header that -will be used when processing a fragment can be configured with the -variable @code{org-format-latex-header}. +Going beyond symbols and sub- and superscripts, a full formula language is +needed. Org-mode can contain La@TeX{} math fragments, and it supports ways +to process these for several export backends. When exporting to La@TeX{}, +the code is obviously left as it is. When exporting to HTML, Org invokes the +@uref{http://www.mathjax.org, MathJax library} (@pxref{Math formatting in +HTML export}) to process and display the math@footnote{If you plan to use +this regularly or on pages with significant page views, you should install +@file{MathJax} on your own server in order to limit the load of our server.}. +Finally, it can also process the mathematical expressions into +images@footnote{For this to work you need to be on a system with a working +La@TeX{} installation. You also need the @file{dvipng} program, available at +@url{http://sourceforge.net/projects/dvipng/}. The La@TeX{} header that will +be used when processing a fragment can be configured with the variable +@code{org-format-latex-header}.} that can be displayed in a browser or in +DocBook documents. La@TeX{} fragments don't need any special marking at all. The following snippets will be identified as La@TeX{} source code: @itemize @bullet @item -Environments of any kind. The only requirement is that the -@code{\begin} statement appears on a new line, preceded by only -whitespace. +Environments of any kind@footnote{When @file{MathJax} is used, only the +environment recognized by @file{MathJax} will be processed. When dvipng is +used to create images, any La@TeX{} environments will be handled.}. The only +requirement is that the @code{\begin} statement appears on a new line, +preceded by only whitespace. @item Text within the usual La@TeX{} math delimiters. To avoid conflicts with currency specifications, single @samp{$} characters are only recognized as @@ -8948,12 +9030,26 @@ If you need any of the delimiter ASCII sequences for other purposes, you can configure the option @code{org-format-latex-options} to deselect the ones you do not wish to have interpreted by the La@TeX{} converter. +@vindex org-export-with-LaTeX-fragments +LaTeX processing can be configured with the variable +@code{org-export-with-LaTeX-fragments}. The default setting is @code{t} +which means @file{MathJax} for HTML, and no processing for DocBook, ASCII and +LaTeX backends. You can also set this variable on a per-file basis using one +of these lines: + +@example +#+OPTIONS: LaTeX:t @r{Do the right thing automatically (MathJax)} +#+OPTIONS: LaTeX:dvipng @r{Force using dvipng images} +#+OPTIONS: LaTeX:nil @r{Do not process La@TeX{} fragments at all} +#+OPTIONS: LaTeX:verbatim @r{Verbatim export, for jsMath or so} +@end example + @node Previewing LaTeX fragments, CDLaTeX mode, LaTeX fragments, Embedded LaTeX @subsection Previewing LaTeX fragments @cindex LaTeX fragments, preview -La@TeX{} fragments can be processed to produce preview images of the -typeset expressions: +If you have @file{dvipng} installed, La@TeX{} fragments can be processed to +produce preview images of the typeset expressions: @table @kbd @kindex C-c C-x C-l @@ -8975,14 +9071,6 @@ some aspects of the preview. In particular, the @code{:scale} (and for HTML export, @code{:html-scale}) property can be used to adjust the size of the preview images. -During HTML export (@pxref{HTML export}), all La@TeX{} fragments are -converted into images and inlined into the document if the following -setting is active: - -@lisp -(setq org-export-with-LaTeX-fragments t) -@end lisp - @node CDLaTeX mode, , Previewing LaTeX fragments, Embedded LaTeX @subsection Using CDLa@TeX{} to enter math @cindex CDLa@TeX{} @@ -9200,7 +9288,7 @@ tags: @r{turn on/off inclusion of tags, may also be @code{not-in-toc}} <: @r{turn on/off inclusion of any time/date stamps like DEADLINES} *: @r{turn on/off emphasized text (bold, italic, underlined)} TeX: @r{turn on/off simple @TeX{} macros in plain text} -LaTeX: @r{turn on/off La@TeX{} fragments} +LaTeX: @r{configure export of La@TeX{} fragments. Default @code{auto}} skip: @r{turn on/off skipping the text before the first heading} author: @r{turn on/off inclusion of author name/email into exported file} email: @r{turn on/off inclusion of author email into exported file} @@ -9333,6 +9421,7 @@ language, but with additional support for tables. * Links in HTML export:: How links will be interpreted and formatted * Tables in HTML export:: How to modify the formatting of tables * Images in HTML export:: How to insert figures into HTML output +* Math formatting in HTML export:: Beautiful math also on the web * Text areas in HTML export:: An alternative way to show an example * CSS support:: Changing the appearance of the output * JavaScript support:: Info and Folding in a web browser @@ -9468,7 +9557,7 @@ tables, place something like the following before the table: #+ATTR_HTML: border="2" rules="all" frame="all" @end example -@node Images in HTML export, Text areas in HTML export, Tables in HTML export, HTML export +@node Images in HTML export, Math formatting in HTML export, Tables in HTML export, HTML export @subsection Images in HTML export @cindex images, inline in HTML @@ -9505,7 +9594,41 @@ support text viewers and accessibility, and align it to the right. @noindent and you could use @code{http} addresses just as well. -@node Text areas in HTML export, CSS support, Images in HTML export, HTML export +@node Math formatting in HTML export, Text areas in HTML export, Images in HTML export, HTML export +@subsection Math formatting in HTML export +@cindex MathJax +@cindex dvipng + +La@TeX{} math snippets (@pxref{LaTeX fragments}) can be displayed in two +different ways on HTML pages. The default is to use the +@uref{http://www.mathjax.org, MathJax system} which should work out of the +box with Org mode installation because @code{http://orgmode.org} serves +@file{MathJax} for Org-mode users for small applications and for testing +purposes. @b{If you plan to use this regularly or on pages with significant +page views, you should install MathJax on your own server in order to limit +the load of our server.} To configure @file{MathJax}, use the variable +@code{org-export-html-mathjax-options} or insert something like the following +into the buffer: + +@example +#+MATHJAX: align:"left" mathml:t path:"/MathJax/MathJax.js" +@end example + +@noindent See the docstring of the variable +@code{org-export-html-mathjax-options} for the meaning of the parameters in +this line. + +If you prefer, you can also request that La@TeX{} are processed into small +images that will be inserted into the browser page. Before the availability +of MathJax, this was the default method for Org files. This method requires +that the @file{dvipng} program is available on your system. You can still +get this processing with + +@example +#+OPTIONS: LaTeX:dvipng +@end example + +@node Text areas in HTML export, CSS support, Math formatting in HTML export, HTML export @subsection Text areas in HTML export @cindex text areas, in HTML @@ -9595,6 +9718,11 @@ For longer style definitions, you can use several such lines. You could also directly write a @code{} section in this way, without referring to an external file. +In order to add styles to a subtree, use the @code{:HTML_CONTAINER_CLASS:} +property to assign a class to the tree. In order to specify CSS styles for a +particular headline, you can use the id specified in a @code{:CUSTOM_ID:} +property. + @c FIXME: More about header and footer styles @c FIXME: Talk about links and targets. @@ -9890,9 +10018,9 @@ different level - then the hierarchy above frames will produce the sectioning structure of the presentation. A template for useful in-buffer settings or properties can be inserted into -the buffer with @kbd{M-x org-beamer-settings-template}. Among other things, -this will install a column view format which is very handy for editing -special properties used by beamer. +the buffer with @kbd{M-x org-insert-beamer-options-template}. Among other +things, this will install a column view format which is very handy for +editing special properties used by beamer. You can influence the structure of the presentation using the following properties: @@ -9957,7 +10085,7 @@ environment or the @code{BEAMER_col} property. Column view provides a great way to set the environment of a node and other important parameters. Make sure you are using a COLUMN format that is geared toward this special purpose. The command @kbd{M-x -org-beamer-settings-template} defines such a format. +org-insert-beamer-options-template} defines such a format. Here is a simple example Org document that is intended for beamer export. @@ -10366,6 +10494,7 @@ Export only the visible part of the document. @vindex org-icalendar-use-deadline @vindex org-icalendar-use-scheduled @vindex org-icalendar-categories +@vindex org-icalendar-alarm-time Some people use Org-mode for keeping track of projects, but still prefer a standard calendar application for anniversaries and appointments. In this case it can be useful to show deadlines and other time-stamped items in Org @@ -10379,7 +10508,9 @@ to set the start and due dates for the TODO entry@footnote{See the variables @code{org-icalendar-use-deadline} and @code{org-icalendar-use-scheduled}.}. As categories, it will use the tags locally defined in the heading, and the file/tree category@footnote{To add inherited tags or the TODO state, -configure the variable @code{org-icalendar-categories}.}. +configure the variable @code{org-icalendar-categories}.}. See the variable +@code{org-icalendar-alarm-time} for a way to assign alarms to entries with a +time. @vindex org-icalendar-store-UID @cindex property, ID @@ -10477,7 +10608,8 @@ variable, called @code{org-publish-project-alist}. Each element of the list configures one project, and may be in one of the two following forms: @lisp - ("project-name" :property value :property value ...) + ("project-name" :property value :property value ...) + @r{i.e. a well-formed property list with alternating keys and values} @r{or} ("project-name" :components ("project-name" "project-name" ...)) @@ -10553,20 +10685,20 @@ possibly transformed in the process. The default transformation is to export Org files as HTML files, and this is done by the function @code{org-publish-org-to-html} which calls the HTML exporter (@pxref{HTML export}). But you also can publish your content as PDF files using -@code{org-publish-org-to-pdf}. If you want to publish the Org file itself, -but with @i{archived}, @i{commented}, and @i{tag-excluded} trees removed, use -@code{org-publish-org-to-org} and set the parameters @code{:plain-source} -and/or @code{:htmlized-source}. This will produce @file{file.org} and -@file{file.org.html} in the publishing +@code{org-publish-org-to-pdf}, or as @code{ascii}, @code{latin1} or +@code{utf8} encoded files using the corresponding functions. If you want to +publish the Org file itself, but with @i{archived}, @i{commented}, and +@i{tag-excluded} trees removed, use @code{org-publish-org-to-org} and set the +parameters @code{:plain-source} and/or @code{:htmlized-source}. This will +produce @file{file.org} and @file{file.org.html} in the publishing directory@footnote{@file{file-source.org} and @file{file-source.org.html} if source and publishing directories are equal. Note that with this kind of setup, you need to add @code{:exclude "-source\\.org"} to the project definition in @code{org-publish-project-alist} to avoid that the published source files will be considered as new org files the next time the project is -published.}. Other files like images only -need to be copied to the publishing destination, for this you may use -@code{org-publish-attachment}. For non-Org files, you always need to -specify the publishing function: +published.}. Other files like images only need to be copied to the +publishing destination, for this you may use @code{org-publish-attachment}. +For non-Org files, you always need to specify the publishing function: @multitable @columnfractions 0.3 0.7 @item @code{:publishing-function} @@ -10960,9 +11092,9 @@ e.g. Org-mode provides a number of features for working with live source code, including editing of code blocks in their native major-mode, evaluation of -code blocks, tangling of code blocks, and exporting code blocks and -their results in several formats. This functionality was contributed by Dan -Davison and Eric Schulte, and was originally named Org-babel. +code blocks, tangling of code blocks, and exporting code blocks and their +results in several formats. This functionality was contributed by Eric +Schulte and Dan Davison, and was originally named Org-babel. The following sections describe Org-mode's code block handling facilities. @@ -10998,6 +11130,18 @@ The structure of code blocks is as follows: #+end_src @end example +code blocks can also be embedded in text as so called inline code blocks as + +@example +src_@{@} +@end example + +or + +@example +src_[
]@{@} +@end example + @table @code @item This name is associated with the code block. This is similar to the @@ -11124,10 +11268,10 @@ Include the code block in the tangled output to file @samp{filename}. @kindex C-c C-v t @subsubheading Functions @table @code -@item org-babel-tangle @kbd{C-c C-v t} -Tangle the current file. +@item org-babel-tangle +Tangle the current file. Bound to @kbd{C-c C-v t}. @item org-babel-tangle-file -Choose a file to tangle. +Choose a file to tangle. Bound to @kbd{C-c C-v f}. @end table @subsubheading Hooks @@ -11200,10 +11344,10 @@ Code blocks defined in the ``Library of Babel'' can be called remotely as if they were in the current Org-mode buffer (see @ref{Evaluating code blocks} for information on the syntax of remote code block evaluation). -@kindex C-c C-v l +@kindex C-c C-v i Code blocks located in any Org-mode file can be loaded into the ``Library of Babel'' with the @code{org-babel-lob-ingest} function, bound to @kbd{C-c C-v -l}. +i}. @node Languages, Header arguments, Library of Babel, Working With Source Code @section Languages @@ -11279,7 +11423,7 @@ describes each header argument in detail. @node Using header arguments, Specific header arguments, Header arguments, Header arguments @subsection Using header arguments -The values of header arguments can be set in five different ways, each more +The values of header arguments can be set in six different ways, each more specific (and having higher priority) than the last. @menu * System-wide header arguments:: Set global default values @@ -11287,6 +11431,7 @@ specific (and having higher priority) than the last. * Buffer-wide header arguments:: Set default values for a specific buffer * Header arguments in Org-mode properties:: Set default values for a buffer or heading * Code block specific header arguments:: The most common way to set values +* Header arguments in function calls:: The most specific level @end menu @@ -11381,7 +11526,7 @@ Properties defined in this way override the properties set in @code{org-set-property} function bound to @kbd{C-c C-x p} to set properties in Org-mode documents. -@node Code block specific header arguments, , Header arguments in Org-mode properties, Using header arguments +@node Code block specific header arguments, Header arguments in function calls, Header arguments in Org-mode properties, Using header arguments @subsubheading Code block specific header arguments The most common way to assign values to header arguments is at the @@ -11402,14 +11547,18 @@ fac 0 = 1 fac n = n * fac (n-1) #+end_src @end example - Similarly, it is possible to set header arguments for inline code blocks: @example src_haskell[:exports both]@{fac 5@} @end example -Header arguments for ``Library of Babel'' or function call lines can be set as shown below: +@node Header arguments in function calls, , Code block specific header arguments, Using header arguments +@comment node-name, next, previous, up +@subsubheading Header arguments in function calls + +At the most specific level, header arguments for ``Library of Babel'' or +function call lines can be set as shown below: @example #+call: factorial(n=5) :exports results @@ -11428,10 +11577,10 @@ The following header arguments are defined: directory for code block execution * exports:: Export code and/or results * tangle:: Toggle tangling and specify file name -* no-expand:: Turn off variable assignment and noweb - expansion during tangling * comments:: Toggle insertion of comments in tangled code files +* no-expand:: Turn off variable assignment and noweb + expansion during tangling * session:: Preserve the state of code evaluation * noweb:: Toggle expansion of noweb references * cache:: Avoid re-evaluating unchanged code blocks @@ -11842,10 +11991,25 @@ basename}. @subsubsection @code{:comments} By default code blocks are tangled to source-code files without any insertion of comments beyond those which may already exist in the body of the code -block. The @code{:comments} header argument can be set to ``yes'' -e.g. @code{:comments yes} to enable the insertion of comments around code -blocks during tangling. The inserted comments contain pointers back to the -original Org file from which the comment was tangled. +block. The @code{:comments} header argument can be set as follows to control +the insertion of extra comments into the tangled code file. + +@itemize @bullet +@item @code{no} +The default. No extra comments are inserted during tangling. +@item @code{link} +The code block is wrapped in comments which contain pointers back to the +original Org file from which the code was tangled. +@item @code{yes} +A synonym for ``link'' to maintain backwards compatibility. +@item @code{org} +Include text from the org-mode file as a comment. + +The text is picked from the leading context of the tangled code and is +limited by the nearest headline or source block as the case may be. +@item @code{both} +Turns on both the ``link'' and ``org'' comment options. +@end itemize @node no-expand, session, comments, Specific header arguments @subsubsection @code{:no-expand} @@ -11873,16 +12037,20 @@ interpreted language. The @code{:noweb} header argument controls expansion of ``noweb'' style (see @ref{Noweb reference syntax}) references in a code block. This header -argument can have one of two values: @code{yes} or @code{no}. +argument can have one of three values: @code{yes} @code{no} or @code{tangle}. @itemize @bullet +@item @code{yes} +All ``noweb'' syntax references in the body of the code block will be +expanded before the block is evaluated, tangled or exported. @item @code{no} The default. No ``noweb'' syntax specific action is taken on evaluating code blocks, However, noweb references will still be expanded during tangling. @item @code{yes} All ``noweb'' syntax references in the body of the code block will be -expanded before the block is evaluated. +expanded before the block is tangled, however ``noweb'' references will not +be expanded when the block is evaluated or exported. @end itemize @subsubheading Noweb prefix lines @@ -12067,7 +12235,7 @@ Setting the @code{:shebang} header argument to a string value first line of any tangled file holding the code block, and the file permissions of the tangled file are set to make it executable. -@node eval, , shebang, Specific header arguments +@node eval, , shebang, Specific header arguments @subsubsection @code{:eval} The @code{:eval} header argument can be used to limit the evaluation of specific code blocks. @code{:eval} accepts two arguments ``never'' and @@ -12268,17 +12436,18 @@ Be sure to adjust the paths to fit your system. #!/bin/sh # -*- mode: shell-script -*- # -# tangle a file with org-mode +# tangle files with org-mode # DIR=`pwd` FILES="" +ORGINSTALL="~/src/org/lisp/org-install.el" # wrap each argument in the code required to call tangle on it for i in $@@; do -FILES="$FILES \"$i\"" + FILES="$FILES \"$i\"" done -emacsclient \ +emacs -Q --batch -l $ORGINSTALL \ --eval "(progn (add-to-list 'load-path (expand-file-name \"~/src/org/lisp/\")) (add-to-list 'load-path (expand-file-name \"~/src/org/contrib/lisp/\")) @@ -12286,7 +12455,7 @@ emacsclient \ (mapc (lambda (file) (find-file (expand-file-name file \"$DIR\")) (org-babel-tangle) - (kill-buffer)) '($FILES)))" + (kill-buffer)) '($FILES)))" 2>&1 |grep tangled @end example @node Miscellaneous, Hacking, Working With Source Code, Top @@ -12294,6 +12463,7 @@ emacsclient \ @menu * Completion:: M-TAB knows what you need +* Easy Templates:: Quick insertion of structural elements * Speed keys:: Electric commands at the beginning of a headline * Code evaluation security:: Org mode files evaluate inline code * Customization:: Adapting Org to your taste @@ -12305,7 +12475,7 @@ emacsclient \ @end menu -@node Completion, Speed keys, Miscellaneous, Miscellaneous +@node Completion, Easy Templates, Miscellaneous, Miscellaneous @section Completion @cindex completion, of @TeX{} symbols @cindex completion, of TODO keywords @@ -12367,7 +12537,46 @@ Elsewhere, complete dictionary words using Ispell. @end itemize @end table -@node Speed keys, Code evaluation security, Completion, Miscellaneous +@node Easy Templates, Speed keys, Completion, Miscellaneous +@section Easy Templates +@cindex template insertion +@cindex insertion, of templates + +Org-mode supports insertion of empty structural elements (like +@code{#+BEGIN_SRC} and @code{#+END_SRC} pairs) with just a few key +strokes. This is achieved through a native template expansion mechanism. +Note that Emacs has several other template mechanisms which could be used in +a similar way, for example @file{yasnippet}. + +To insert a structural element, type a @samp{<}, followed by a template +selector and @kbd{@key{TAB}}. Completion takes effect only when the above +keystrokes are typed on a line by itself. + +The following template selectors are currently supported. + +@multitable @columnfractions 0.1 0.9 +@item @kbd{s} @tab @code{#+begin_src ... #+end_src} +@item @kbd{e} @tab @code{#+begin_example ... #+end_example} +@item @kbd{q} @tab @code{#+begin_quote ... #+end_quote} +@item @kbd{v} @tab @code{#+begin_verse ... #+end_verse} +@item @kbd{c} @tab @code{#+begin_center ... #+end_center} +@item @kbd{l} @tab @code{#+begin_latex ... #+end_latex} +@item @kbd{L} @tab @code{#+latex:} +@item @kbd{h} @tab @code{#+begin_html ... #+end_html} +@item @kbd{H} @tab @code{#+html:} +@item @kbd{a} @tab @code{#+begin_ascii ... #+end_ascii} +@item @kbd{A} @tab @code{#+ascii:} +@item @kbd{i} @tab @code{#+include:} line +@end multitable + +For example, on an empty line, typing "