Merge ack master from github.com:leoliu/ack-el

[gnu-emacs-elpa] / packages / gnorb / gnorb-org.el

diff --git a/packages/gnorb/gnorb-org.el b/packages/gnorb/gnorb-org.el
index 6d3772d74b19c1c9a256e298ea81e244278057ed..78d636bc6c0c20204e8333737cfb7c8037d7df73 100644 (file)
--- a/packages/gnorb/gnorb-org.el
+++ b/packages/gnorb/gnorb-org.el
@@ -43,9 +43,8 @@
     ("take note" . note)
     ("don't associate" . no-associate)
     ("only associate" . associate)
     ("take note" . note)
     ("don't associate" . no-associate)
     ("only associate" . associate)

-;    ("capture to child" . cap-child)
-;    ("capture to sibling" . cap-sib)
-)
+    ("capture to child" . cap-child)
+    ("capture to sibling" . cap-sib))

   "List of potential actions that can be taken on headings.
 
 When triggering an Org heading after receiving or sending a
   "List of potential actions that can be taken on headings.
 
 When triggering an Org heading after receiving or sending a


@@ -56,8 +55,8 @@ todo state: Associate the message, and change TODO state.
 take note: Associate the message, and take a note.
 don't associate: Do nothing at all, don't connect the message and TODO.
 only associate: Associate the message with this heading, do nothing else.
 take note: Associate the message, and take a note.
 don't associate: Do nothing at all, don't connect the message and TODO.
 only associate: Associate the message with this heading, do nothing else.

-capture to child: [not yet implemented] Associate this message with a new child heading.
-capture to sibling: [not yet implemented] Associate this message with a new sibling heading.
+capture to child: Associate this message with a new child heading.
+capture to sibling: Associate this message with a new sibling heading.

 
 You can reorder this list or remove items as suits your workflow.
 The two \"capture\" options will use the value of
 
 You can reorder this list or remove items as suits your workflow.
 The two \"capture\" options will use the value of


@@ -165,7 +164,7 @@ we came from."
                 :raw-value
                 head)
                strings)
                 :raw-value
                 head)
                strings)

-         (org-element-map tree 'paragraph
+         (org-element-map tree '(paragraph drawer)

            (lambda (p)
              (push (org-element-interpret-data p)
                    strings))
            (lambda (p)
              (push (org-element-interpret-data p)
                    strings))


@@ -177,9 +176,10 @@ we came from."
            (cond ((eq gnorb-org-mail-scan-scope 'all)
                   strings)
                  ((numberp gnorb-org-mail-scan-scope)
            (cond ((eq gnorb-org-mail-scan-scope 'all)
                   strings)
                  ((numberp gnorb-org-mail-scan-scope)

-                  (delq nil
-                        (cl-subseq
-                         strings 0 (1+ gnorb-org-mail-scan-scope))))
+                  (cl-subseq
+                   strings 0 (min
+                              (length strings)
+                              (1+ gnorb-org-mail-scan-scope))))

                  ;; We could provide more options here. 'tree vs
                  ;; 'subtree, for instance.
                  (t
                  ;; We could provide more options here. 'tree vs
                  ;; 'subtree, for instance.
                  (t


@@ -271,10 +271,14 @@ headings."
     (when messages
       (insert ", "))
     (insert (mapconcat 'identity mails ", ")))
     (when messages
       (insert ", "))
     (insert (mapconcat 'identity mails ", ")))

-  ;; Return us after message is sent.
-  (add-to-list 'message-exit-actions
-              'gnorb-org-restore-after-send t)
-  ;; Set headers from MAIL_* properties (from, cc, and bcc).
+  ;; Commenting this out because
+  ;; `gnorb-gnus-check-outgoing-headers' is set unconditionally in the
+  ;; `message-send-hook, so this should be redundant.  Also, we've
+  ;; switched to using message-send-actions.
+  
+  ;; (add-to-list
+  ;; 'message-exit-actions 'gnorb-org-restore-after-send t) Set
+  ;; headers from MAIL_* properties (from, cc, and bcc).

   (cl-flet ((sh (h)
                (when (cdr h)
                  (funcall (intern (format "message-goto-%s" (car h))))
   (cl-flet ((sh (h)
                (when (cdr h)
                  (funcall (intern (format "message-goto-%s" (car h))))


@@ -614,7 +618,9 @@ search."
                        (let ((rec-tags (bbdb-record-xfield
                                         r gnorb-bbdb-org-tag-field)))
                          (and rec-tags
                        (let ((rec-tags (bbdb-record-xfield
                                         r gnorb-bbdb-org-tag-field)))
                          (and rec-tags

-                              (let ((tags-list (org-split-string rec-tags ":"))
+                              (let ((tags-list (if (stringp rec-tags)
+                                                   (org-split-string rec-tags ":")
+                                                 rec-tags))

                                     (case-fold-search t)
                                     (org-trust-scanner-tags t))
                                 (eval tag-clause)))))
                                     (case-fold-search t)
                                     (org-trust-scanner-tags t))
                                 (eval tag-clause)))))


@@ -646,14 +652,17 @@ search."
 ;;; Groups from the gnorb gnus server backend
 
 ;;;###autoload
 ;;; Groups from the gnorb gnus server backend
 
 ;;;###autoload

-(defun gnorb-org-view ()
+(defun gnorb-org-view (arg)

   "Search the subtree at point for links to gnus messages, and
   "Search the subtree at point for links to gnus messages, and

-then show them in an ephemeral group, in gnus.
+then show them in an ephemeral group, in Gnus.
+
+With a prefix arg, create a search group that will persist across
+Gnus sessions, and can be refreshed.

 
 This won't work unless you've added a \"nngnorb\" server to
 your gnus select methods."
   ;; this should also work on the active region, if there is one.
 
 This won't work unless you've added a \"nngnorb\" server to
 your gnus select methods."
   ;; this should also work on the active region, if there is one.

-  (interactive)
+  (interactive "P")

   (require 'gnorb-gnus)
   (setq gnorb-window-conf (current-window-configuration))
   (move-marker gnorb-return-marker (point))
   (require 'gnorb-gnus)
   (setq gnorb-window-conf (current-window-configuration))
   (move-marker gnorb-return-marker (point))


@@ -672,7 +681,10 @@ your gnus select methods."
       (org-back-to-heading)
       (setq id (concat "id+" (org-id-get-create)))
       (gnorb-gnus-search-messages
       (org-back-to-heading)
       (setq id (concat "id+" (org-id-get-create)))
       (gnorb-gnus-search-messages

-       id
+       id arg
+       (replace-regexp-in-string
+       org-bracket-link-regexp "\\3"
+       (nth 4 (org-heading-components)))

        `(when (and (window-configuration-p gnorb-window-conf)
                   gnorb-return-marker)
          (set-window-configuration gnorb-window-conf)
        `(when (and (window-configuration-p gnorb-window-conf)
                   gnorb-return-marker)
          (set-window-configuration gnorb-window-conf)