[elpa] master 990d508: New option gnorb-org-log-add-link

[Eric Abrahamsen]

branch: master
commit 990d508978ce5aae51228eae37186d50cedb8583
Author: Eric Abrahamsen <address@hidden>
Commit: Eric Abrahamsen <address@hidden>

    New option gnorb-org-log-add-link
    
    * packages/gnorb/gnorb-org.el (gnorb-org-log-add-link): When non-nil,
      a message link will be added to any log note that is taken as part
      of the trigger process.
    * packages/gnorb/gnorb-utils.el (gnorb-trigger-todo-action): Maybe add
      link to log note.
      (gnorb-msg-id-to-link): Adjust calling signature to allow passing
      the group in.
    * packages/gnorb/gnorb.org: Document.
---
 packages/gnorb/gnorb-org.el   |  10 +++
 packages/gnorb/gnorb-utils.el |  22 ++++--
 packages/gnorb/gnorb.info     | 159 ++++++++++++++++++++----------------------
 packages/gnorb/gnorb.org      |  13 ++--
 packages/gnorb/gnorb.texi     |  56 +++++++--------
 5 files changed, 132 insertions(+), 128 deletions(-)

diff --git a/packages/gnorb/gnorb-org.el b/packages/gnorb/gnorb-org.el
index 6790078..324f646 100644
--- a/packages/gnorb/gnorb-org.el
+++ b/packages/gnorb/gnorb-org.el
@@ -89,6 +89,16 @@ information about the message from which we're triggering."
   :type 'list
   :package-version '(gnorb . "1.1.3"))
 
+(defcustom gnorb-org-log-add-link t
+  "When non-nil, add a message link in a heading's LOGBOOK.
+When triggering an Org heading from a message, and adding a log
+note, the message id will be added to the text of the log note.
+When later viewing the messages, call `gnorb-org-view' with point
+on a particular logbook item to automatically go to the linked
+message."
+  :group 'gnorb-org
+  :type 'boolean)
+
 (defcustom gnorb-org-msg-id-key "GNORB_MSG_ID"
   "The name of the org property used to store the Message-IDs
   from relevant messages. This is no longer used, and will be
diff --git a/packages/gnorb/gnorb-utils.el b/packages/gnorb/gnorb-utils.el
index 36bab54..8810a18 100644
--- a/packages/gnorb/gnorb-utils.el
+++ b/packages/gnorb/gnorb-utils.el
@@ -346,7 +346,12 @@ agenda. Then let the user choose an action from the value 
of
                  (format
                   "Trigger action on %s: "
                   (gnorb-pretty-outline id))
-                 gnorb-org-trigger-actions)))
+                 gnorb-org-trigger-actions))
+        (link (when gnorb-org-log-add-link
+                (format "[[gnus:%s][message]] "
+                        (gnorb-msg-id-to-link
+                         (plist-get gnorb-gnus-message-info :msg-id)
+                         (plist-get gnorb-gnus-message-info :group))))))
     (unless agenda-p
       (org-reveal))
     (cl-labels
@@ -367,7 +372,7 @@ agenda. Then let the user choose an action from the value of
          (note
           (org-with-point-at root-marker
             (make-entry (org-id-get-create))
-            (call-interactively 'org-add-note)))
+            (org-add-log-setup 'note nil nil nil (or link nil))))
          (todo
           (if agenda-p
               (progn
@@ -376,7 +381,9 @@ agenda. Then let the user choose an action from the value of
                 (call-interactively 'org-agenda-todo))
             (org-with-point-at root-marker
               (make-entry (org-id-get-create))
-              (call-interactively 'org-todo))))
+              (call-interactively 'org-todo)
+              (when link
+               (setq org-log-note-extra link)))))
          (no-associate
           nil)
          (associate
@@ -385,7 +392,7 @@ agenda. Then let the user choose an action from the value of
          ;; We're going to capture a new heading
          ((cap-child cap-sib)
           (org-with-point-at root-marker
-               (setq gnorb-trigger-capture-location (point-marker)))
+            (setq gnorb-trigger-capture-location (point-marker)))
           (let ((entry
                  ;; Pick a template.
                  (copy-sequence (org-capture-select-template))))
@@ -483,10 +490,11 @@ to those symbols."
            (push link (alist-get sym alist)))))
       alist)))
 
-(defun gnorb-msg-id-to-link (msg-id)
+(defun gnorb-msg-id-to-link (msg-id &optional server-group)
   "Create a full Org link to the message MSG-ID.
-The main work is figuring out which group the message is in."
-  (let ((server-group (car (gnorb-msg-id-request-head msg-id))))
+If SERVER-GROUP isn't given, try to figure it out."
+  (let ((server-group (or server-group
+                         (car (gnorb-msg-id-request-head msg-id)))))
     (when server-group
       (org-link-escape
        (concat server-group "#"
diff --git a/packages/gnorb/gnorb.info b/packages/gnorb/gnorb.info
index 09fc886..c1a54f3 100644
--- a/packages/gnorb/gnorb.info
+++ b/packages/gnorb/gnorb.info
@@ -1,4 +1,4 @@
-This is gnorb.info, produced by makeinfo version 6.3 from gnorb.texi.
+This is gnorb.info, produced by makeinfo version 6.5 from gnorb.texi.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -28,9 +28,6 @@ Gnorb Manual
 
 — The Detailed Node Listing —
 
-
-
-
 Email Tracking
 
 * Tracking Setup::
@@ -42,30 +39,21 @@ Email Tracking
 * Registry Usage::
 * Likely Workflow::
 
-
-
-
-
-
-
 Misc BBDB
 
 * Searching for messages from BBDB contacts::
 * Citing BBDB contacts::
 * User Options::
 
-
-
 Misc Org
 
 * Inserting BBDB links::
-* User Options: User Optionsx. 
-
-
+* User Options: User Options 1.
 
 Misc Gnus
 
-* User Options: User Optionsxx. 
+* User Options: User Options 2.
+
 
 
 File: gnorb.info,  Node: Introduction,  Next: Installation,  Prev: Top,  Up: 
Top
@@ -224,8 +212,7 @@ conversation going.
 
      Once sent, the message will be associated with the Org heading, and
      you’ll be brought back to the heading and asked to trigger an
-     action on it.  See *note Trigger Actions: Trigger Actions. for more
-     information.
+     action on it.  See *note Trigger Actions:: for more information.
 
      ‘gnorb-email-subtree’ is an alternative to ‘gnorb-org-handle-mail’.
      It does the same thing as the latter, but first exports the body of
@@ -548,30 +535,30 @@ File: gnorb.info,  Node: User Options,  Prev: Citing BBDB 
contacts,  Up: Misc BB
 9.3 User Options
 ================
 
-‘`gnorb-bbdb-org-tag-field’
+‘gnorb-bbdb-org-tag-field
      The name of the BBDB xfield, as a symbol, that holds Org-related
      tags.  Specified as a string with the “:” separator between tags,
      same as for Org headings.  Defaults to org-tag.
-‘`gnorb-bbdb-messages-field'’
+‘gnorb-bbdb-messages-field’
      The name of the BBDB xfield that holds links to recently-received
      messages from this contact.  Defaults to ’messages.
-‘`gnorb-bbdb-collect-N-messages'’
+‘gnorb-bbdb-collect-N-messages’
      Collect at most this many links to messages from this contact.
      Defaults to 5.
-‘`gnorb-bbdb-define-recent'’
+‘gnorb-bbdb-define-recent’
      What does “recently-received” mean?  Possible values are the
      symbols seen and received.  When set to seen, the most
      recently-opened messages are collected.  When set to received, the
      most recently-received (by Date header) messages are collected.
      Defaults to seen.
-‘`gnorb-bbdb-message-link-format-multi'’
+‘gnorb-bbdb-message-link-format-multi’
      How is a single message’s link formatted in the multi-line BBDB
      layout format?  Defaults to “%:count.  %D: %:subject” (see the
      docstring for details).
-‘` gnorb-bbdb-message-link-format-one'’
+‘ gnorb-bbdb-message-link-format-one’
      How is a single message’s link formatted in the one-line BBDB
      layout format?  Defaults to nil (see the docstring for details).
-‘`gnorb-bbdb-posting-styles'’
+‘gnorb-bbdb-posting-styles’
      Styles to use for influencing the format of mails composed to the
      BBDB record(s) under point (see the docstring for details).
 
@@ -584,10 +571,10 @@ File: gnorb.info,  Node: Misc Org,  Next: Misc Gnus,  
Prev: Misc BBDB,  Up: Top
 * Menu:
 
 * Inserting BBDB links::
-* User Options: User Optionsx. 
+* User Options: User Options 1.
 
 
-File: gnorb.info,  Node: Inserting BBDB links,  Next: User Optionsx,  Up: Misc 
Org
+File: gnorb.info,  Node: Inserting BBDB links,  Next: User Options 1,  Up: 
Misc Org
 
 10.1 Inserting BBDB links
 =========================
@@ -596,55 +583,59 @@ Calling ‘gnorb-org-contact-link’ will prompt for a BBDB 
record and
 insert an Org link to that record at point.
 
 
-File: gnorb.info,  Node: User Optionsx,  Prev: Inserting BBDB links,  Up: Misc 
Org
+File: gnorb.info,  Node: User Options 1,  Prev: Inserting BBDB links,  Up: 
Misc Org
 
 10.2 User Options
 =================
 
-‘`gnorb-org-after-message-setup-hook'’
+‘gnorb-org-after-message-setup-hook’
      Hook run in a message buffer after setting up the message, from
      ‘gnorb-org-handle-mail’ or ‘gnorb-org-email-subtree’.
-‘`gnorb-org-trigger-actions'’
+‘gnorb-org-trigger-actions’
      List of potential actions that can be taken on headings after a
      message is sent.  See docstring for details.
-‘`gnorb-org-mail-scan-scope'’
+‘gnorb-org-mail-scan-scope’
      The number of paragraphs to scan for mail-related links.  This
      comes into play when calling ‘gnorb-org-handle-mail’ on a heading
      with no associated messages, or when ‘gnorb-org-handle-mail’ is
      called with a prefix arg.
-‘`gnorb-org-find-candidates-match'’
+‘gnorb-org-find-candidates-match’
      When searching all Org files for headings to collect messages from,
      this option can limit which headings are searched.  It is used as
      the second argument to a call to ‘org-map-entries’, and has the
      same syntax as that used in an agenda tags view.
-‘`gnorb-org-email-subtree-text-parameters'’
+‘gnorb-org-email-subtree-text-parameters’
      A plist of export parameters corresponding to the EXT-PLIST
      argument to the export functions, for use when exporting to text.
-‘`gnorb-org-email-subtree-file-parameters'’
+‘gnorb-org-email-subtree-file-parameters’
      A plist of export parameters corresponding to the EXT-PLIST
      argument to the export functions, for use when exporting to a file.
-‘`gnorb-org-email-subtree-text-options'’
+‘gnorb-org-email-subtree-text-options’
      A list of ts and nils corresponding to Org’s export options, to be
      used when exporting to text.  The options, in order, are async,
      subtreep, visible-only, and body-only.
-‘`gnorb-org-email-subtree-file-options'’
+‘gnorb-org-email-subtree-file-options’
      A list of ts and nils corresponding to Org’s export options, to be
      used when exporting to a file.  The options, in order, are async,
      subtreep, visible-only, and body-only.
-‘`gnorb-org-export-extensions'’
+‘gnorb-org-export-extensions’
      Correspondence between export backends and their respective (usual)
      file extensions.
-‘`gnorb-org-capture-collect-link-p'’
+‘gnorb-org-capture-collect-link-p’
      When this is set to t, the capture process will always store a link
      to the Gnus message or BBDB record under point, even when the link
      isn’t part of the capture template.  It can then be added to the
      captured heading with org-insert-link, as usual.
-‘`gnorb-org-agenda-popup-bbdb'’
+‘gnorb-org-log-add-link’
+     When non-nil, any time a todo trigger action results in adding a
+     note, a link to the triggering message will be added to the log
+     note text.
+‘gnorb-org-agenda-popup-bbdb’
      Set to “t” to automatically pop up the BBDB buffer displaying
      records corresponding to the Org Agenda tags search underway.  If
      this is nil you can always do it manually with the command of the
      same name.
-‘`gnorb-org-bbdb-popup-layout'’
+‘gnorb-org-bbdb-popup-layout’
      Controls the layout of the Agenda-related BBDB popup, takes the
      same values as bbdb-pop-up-layout.
 
@@ -656,35 +647,35 @@ File: gnorb.info,  Node: Misc Gnus,  Next: Default 
Keybindings,  Prev: Misc Org,
 
 * Menu:
 
-* User Options: User Optionsxx. 
+* User Options: User Options 2.
 
 
-File: gnorb.info,  Node: User Optionsxx,  Up: Misc Gnus
+File: gnorb.info,  Node: User Options 2,  Up: Misc Gnus
 
 11.1 User Options
 =================
 
-‘`gnorb-gnus-mail-search-backend'’
+‘gnorb-gnus-mail-search-backend’
      Specifies the search backend that you use for searching mails.
      Currently supports notmuch, mairix, and namazu: set this option to
      one of those symbols.
-‘`gnorb-gnus-capture-always-attach'’
+‘gnorb-gnus-capture-always-attach’
      Treat all capture templates as if they had the :gnus-attachments
      key set to “t”.  This only has any effect if you’re capturing from
      a Gnus summary or article buffer.
-‘`gnorb-trigger-todo-default'’
+‘gnorb-trigger-todo-default’
      Set to either ’note or ’todo to tell ‘gnorb-gnus-incoming-do-todo’
      what to do by default.  You can reach the non-default behavior by
      calling that function with a prefix argument.  Alternately, set to
      ’prompt to always prompt for the appropriate action.
-‘`gnorb-gnus-trigger-refile-targets'’
+‘gnorb-gnus-trigger-refile-targets’
      If you use ‘gnorb-gnus-incoming-do-todo’ on an incoming message,
      Gnorb will try to locate a TODO heading that’s relevant to that
      message.  If it can’t, it will prompt you for one, using the refile
      interface.  This option will be used as the value of
      ‘org-refile-targets’ during that process: see the docstring of
      ‘org-refile-targets’ for the appropriate syntax.
-‘`gnorb-gnus-new-todo-capture-key'’
+‘gnorb-gnus-new-todo-capture-key’
      Set this to a single-character string pointing at an Org capture
      template to use when creating TODOs from outgoing messages.  The
      template is a regular capture template, with a few exceptions.  If
@@ -695,20 +686,20 @@ File: gnorb.info,  Node: User Optionsxx,  Up: Misc Gnus
      If you don’t archive outgoing messages, you’ll still be able to use
      the %:subject, %:to, %:toname, %:toaddress, and %:date escapes in
      the capture template.
-‘`gnorb-gnus-hint-relevant-article'’
+‘gnorb-gnus-hint-relevant-article’
      Set to “t” (the default) to have Gnorb give you a hint in the
      minibuffer when opening messages that might be relevant to existing
      Org TODOs.
-‘`gnorb-gnus-summary-mark-format-letter'’
+‘gnorb-gnus-summary-mark-format-letter’
      The formatting letter to use as part of your
      ‘gnus-summary-line-format’, to indicate messages which might be
      relevant to Org TODOs.  Defaults to “g”, meaning it should be used
      as “%ug” in the format line.
-‘`gnorb-gnus-summary-mark'’
+‘gnorb-gnus-summary-mark’
      The mark used to indicate potentially relevant messages in the
      Summary buffer, when ‘gnorb-gnus-summary-mark-format-letter’ is
      present in the format line.  Defaults to “¡”.
-‘`gnorb-gnus-summary-tracked-mark'’
+‘gnorb-gnus-summary-tracked-mark’
      The mark used to indicate already-tracked messages in the Summary
      buffer, when ‘gnorb-gnus-summary-mark-format-letter’ is present in
      the format line.  Defaults to “&”.
@@ -737,7 +728,7 @@ If you don’t like these defaults, you can always do your 
own setup.
           (setq gnorb-org-agenda-popup-bbdb t)
           (eval-after-load "org-agenda"
             '(progn (org-defkey org-agenda-mode-map (kbd "C-c t") 
#'gnorb-org-handle-mail)
-              (org-defkey org-agenda-mode-map (kbd "C-c v") 
#'gnorb-org-view)))))
+                    (org-defkey org-agenda-mode-map (kbd "C-c v") 
#'gnorb-org-view)))))
      (eval-after-load "gnorb-gnus"
        '(progn
           (define-key gnus-summary-mime-map "a" 
#'gnorb-gnus-article-org-attach)
@@ -745,14 +736,14 @@ If you don’t like these defaults, you can always do your 
own setup.
           (define-key gnus-summary-mode-map (kbd "C-c v") #'gnorb-gnus-view)
           (setq gnorb-gnus-capture-always-attach t)
           (push '("attach to org heading" . gnorb-gnus-mime-org-attach)
-          gnus-mime-action-alist)
+                gnus-mime-action-alist)
           (push '(gnorb-gnus-mime-org-attach "a" "Attach to Org heading")
-          gnus-mime-button-commands)
+                gnus-mime-button-commands)
           (setq gnus-mime-button-map
-          (let ((map (make-sparse-keymap)))
-            (dolist (c gnus-mime-button-commands)
-              (define-key map (cadr c) (car c)))
-            map))))
+                (let ((map (make-sparse-keymap)))
+                  (dolist (c gnus-mime-button-commands)
+                    (define-key map (cadr c) (car c)))
+                  map))))
      (eval-after-load "message"
        '(progn
           (define-key message-mode-map (kbd "C-c t") 
#'gnorb-gnus-outgoing-do-todo)))
@@ -761,32 +752,32 @@ If you don’t like these defaults, you can always do your 
own setup.
 
 Tag Table:
 Node: Top194
-Node: Introduction1002
-Node: Installation2327
-Node: Setup2705
-Node: Email Tracking3158
-Node: Tracking Setup4362
-Node: Beginning and Continuing the Tracking Process5618
-Node: Trigger Actions9835
-Node: Viewing Things10909
-Node: Hinting in Gnus12679
-Node: Message Attachments13744
-Node: Registry Usage14983
-Node: Likely Workflow15434
-Node: Restoring Window Layout18105
-Node: Recent Mails From BBDB Contacts18502
-Node: BBDB posting styles19498
-Node: BBDB Org tagging20414
-Node: Misc BBDB21160
-Node: Searching for messages from BBDB contacts21373
-Node: Citing BBDB contacts21819
-Node: User Options22140
-Node: Misc Org23679
-Node: Inserting BBDB links23854
-Node: User Optionsx24109
-Node: Misc Gnus26846
-Node: User Optionsxx27009
-Node: Default Keybindings29964
+Node: Introduction989
+Node: Installation2314
+Node: Setup2692
+Node: Email Tracking3145
+Node: Tracking Setup4349
+Node: Beginning and Continuing the Tracking Process5605
+Node: Trigger Actions9801
+Node: Viewing Things10875
+Node: Hinting in Gnus12645
+Node: Message Attachments13710
+Node: Registry Usage14949
+Node: Likely Workflow15400
+Node: Restoring Window Layout18071
+Node: Recent Mails From BBDB Contacts18468
+Node: BBDB posting styles19464
+Node: BBDB Org tagging20380
+Node: Misc BBDB21126
+Node: Searching for messages from BBDB contacts21339
+Node: Citing BBDB contacts21785
+Node: User Options22106
+Node: Misc Org23629
+Node: Inserting BBDB links23804
+Node: User Options 124060
+Node: Misc Gnus26958
+Node: User Options 227120
+Node: Default Keybindings30057
 
 End Tag Table
 
diff --git a/packages/gnorb/gnorb.org b/packages/gnorb/gnorb.org
index 8baf6bf..b3f71fd 100644
--- a/packages/gnorb/gnorb.org
+++ b/packages/gnorb/gnorb.org
@@ -120,11 +120,11 @@ Some more detail on the various functions:
 
    Calling the function with a double prefix arg will ignore all
    associated messages and links, and compose a blank message.
-   
+
    Once sent, the message will be associated with the Org heading, and
    you'll be brought back to the heading and asked to trigger an
    action on it. See [[id:6bc4a833-e16a-4538-a675-b8ff21c9345d][Trigger 
Actions]] for more information.
-   
+
    `gnorb-email-subtree' is an alternative to `gnorb-org-handle-mail'.
    It does the same thing as the latter, but first exports the body of
    the subtree as either text or a file, then inserts the text into
@@ -137,17 +137,17 @@ Some more detail on the various functions:
 3. `gnorb-gnus-outgoing-do-todo' ("C-c t" in message-mode) is called
    in message mode, while composing a new message. Usually this is
    only necessary when starting a new tracked conversation.
-    
+
    If called without a prefix arg, a new Org heading will be created
    after the message is sent, and the sent message associated with it.
    The new heading will be created as a capture heading, using the
    template specified by the `gnorb-gnus-new-todo-capture-key' option.
-   
+
    If you call this function with a single prefix arg, you'll be
    prompted to choose an existing Org heading instead. After the the
    message is sent, you'll be taken to that heading and prompted to
    trigger an action on it.
-   
+
    If you've called this function, and then realize you've associated
    the message with the wrong TODO, call it again with a double prefix
    to clear all associations.
@@ -445,6 +445,9 @@ insert an Org link to that record at point.
      BBDB record under point, even when the link isn't part of the
      capture template. It can then be added to the captured heading
      with org-insert-link, as usual.
+- `gnorb-org-log-add-link' :: When non-nil, any time a todo trigger
+     action results in adding a note, a link to the triggering message
+     will be added to the log note text.
 - `gnorb-org-agenda-popup-bbdb' :: Set to "t" to automatically pop up
      the BBDB buffer displaying records corresponding to the Org
      Agenda tags search underway. If this is nil you can always do it
diff --git a/packages/gnorb/gnorb.texi b/packages/gnorb/gnorb.texi
index 035a870..a4b3f09 100644
--- a/packages/gnorb/gnorb.texi
+++ b/packages/gnorb/gnorb.texi
@@ -1,6 +1,6 @@
 \input texinfo    @c -*- texinfo -*-
 @c %**start of header
address@hidden ./gnorb.info
address@hidden gnorb.info
 @settitle Gnorb Manual
 @documentencoding UTF-8
 @documentlanguage en
@@ -40,9 +40,6 @@
 @detailmenu
 --- The Detailed Node Listing ---
 
-
-
-
 Email Tracking
 
 * Tracking Setup::
@@ -54,30 +51,21 @@ Email Tracking
 * Registry Usage::
 * Likely Workflow::
 
-
-
-
-
-
-
 Misc BBDB
 
 * Searching for messages from BBDB contacts::
 * Citing BBDB contacts::
 * User Options::
 
-
-
 Misc Org
 
 * Inserting BBDB links::
-* User Options: User Optionsx. 
-
-
+* User Options: User Options 1.
 
 Misc Gnus
 
-* User Options: User Optionsxx. 
+* User Options: User Options 2.
+
 @end detailmenu
 @end menu
 
@@ -125,7 +113,7 @@ for email tracking takes a bit more setup, however -- see 
below.
 
 Gnorb doesn't bind any keys by default, but you can call
 `gnorb-install-defaults' to do a basic installation. The rest of this
-manual assumes those @ref{Default Keybindings,default keybindings}.
+manual assumes those @ref{Default Keybindings, , default keybindings}.
 
 @node Email Tracking
 @chapter Email Tracking
@@ -239,7 +227,7 @@ associated messages and links, and compose a blank message.
 
 Once sent, the message will be associated with the Org heading, and
 you'll be brought back to the heading and asked to trigger an
-action on it. See @ref{Trigger Actions,Trigger Actions} for more information.
+action on it. See @ref{Trigger Actions} for more information.
 
 `gnorb-email-subtree' is an alternative to `gnorb-org-handle-mail'.
 It does the same thing as the latter, but first exports the body of
@@ -533,7 +521,7 @@ insert a string of the type ``Bob Smith <bob@@smith.com>''.
 @node User Options
 @section User Options
 
address@hidden @samp
address@hidden @asis
 @item `gnorb-bbdb-org-tag-field
 The name of the BBDB xfield, as a
 symbol, that holds Org-related tags. Specified as a string with
@@ -571,7 +559,7 @@ the docstring for details).
 
 @menu
 * Inserting BBDB links::
-* User Options: User Optionsx. 
+* User Options: User Options 1.
 @end menu
 
 @node Inserting BBDB links
@@ -580,10 +568,10 @@ the docstring for details).
 Calling `gnorb-org-contact-link' will prompt for a BBDB record and
 insert an Org link to that record at point.
 
address@hidden User Optionsx
address@hidden User Options 1
 @section User Options
 
address@hidden @samp
address@hidden @asis
 @item `gnorb-org-after-message-setup-hook'
 Hook run in a message buffer
 after setting up the message, from `gnorb-org-handle-mail' or
@@ -630,6 +618,10 @@ capture process will always store a link to the Gnus 
message or
 BBDB record under point, even when the link isn't part of the
 capture template. It can then be added to the captured heading
 with org-insert-link, as usual.
address@hidden `gnorb-org-log-add-link'
+When non-nil, any time a todo trigger
+action results in adding a note, a link to the triggering message
+will be added to the log note text.
 @item `gnorb-org-agenda-popup-bbdb'
 Set to ``t'' to automatically pop up
 the BBDB buffer displaying records corresponding to the Org
@@ -645,13 +637,13 @@ bbdb-pop-up-layout.
 @chapter Misc Gnus
 
 @menu
-* User Options: User Optionsxx. 
+* User Options: User Options 2.
 @end menu
 
address@hidden User Optionsxx
address@hidden User Options 2
 @section User Options
 
address@hidden @samp
address@hidden @asis
 @item `gnorb-gnus-mail-search-backend'
 Specifies the search backend
 that you use for searching mails. Currently supports notmuch,
@@ -730,7 +722,7 @@ below. If you don't like these defaults, you can always do 
your own setup.
      (setq gnorb-org-agenda-popup-bbdb t)
      (eval-after-load "org-agenda"
        '(progn (org-defkey org-agenda-mode-map (kbd "C-c t") 
#'gnorb-org-handle-mail)
-              (org-defkey org-agenda-mode-map (kbd "C-c v") 
#'gnorb-org-view)))))
+               (org-defkey org-agenda-mode-map (kbd "C-c v") 
#'gnorb-org-view)))))
 (eval-after-load "gnorb-gnus"
   '(progn
      (define-key gnus-summary-mime-map "a" #'gnorb-gnus-article-org-attach)
@@ -738,14 +730,14 @@ below. If you don't like these defaults, you can always 
do your own setup.
      (define-key gnus-summary-mode-map (kbd "C-c v") #'gnorb-gnus-view)
      (setq gnorb-gnus-capture-always-attach t)
      (push '("attach to org heading" . gnorb-gnus-mime-org-attach)
-          gnus-mime-action-alist)
+           gnus-mime-action-alist)
      (push '(gnorb-gnus-mime-org-attach "a" "Attach to Org heading")
-          gnus-mime-button-commands)
+           gnus-mime-button-commands)
      (setq gnus-mime-button-map
-          (let ((map (make-sparse-keymap)))
-            (dolist (c gnus-mime-button-commands)
-              (define-key map (cadr c) (car c)))
-            map))))
+           (let ((map (make-sparse-keymap)))
+             (dolist (c gnus-mime-button-commands)
+               (define-key map (cadr c) (car c)))
+             map))))
 (eval-after-load "message"
   '(progn
      (define-key message-mode-map (kbd "C-c t") 
#'gnorb-gnus-outgoing-do-todo)))