mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-30 04:10:54 -08:00
* org-protocol.el (org-protocol-store-link) (org-protocol-remember, org-protocol-open-source): Add autoloads. * org-compat.el (org-float-time): New function. * org.el (org-clock-update-time-maybe) (org-sort-entries-or-items, org-do-sort) (org-evaluate-time-range, org-time-string-to-seconds) (org-closed-in-range): Use `org-float-time'. * org-timer.el (org-timer-start, org-timer-pause-or-continue) (org-timer-seconds): Use `org-float-time'. * org-clock.el (org-clock-get-clocked-time, org-clock-out) (org-clock-sum, org-dblock-write:clocktable) (org-clocktable-steps): Use `org-float-time'. * org-agenda.el (org-agenda-last-marker-time) (org-agenda-new-marker, org-diary): Use `org-float-time'. * org-compat.el (w32-focus-frame): Declare the w32-focus-frame function. * org-exp.el (org-get-file-contents): Only protect lines that really need it. * org-html.el (require): Require cl for compilation. * org.el: Avoid using `default-major-mode'. * org-plot.el (require): Require CL only at compile time. * org-exp.el (require): Require CL only at compile time. * org-agenda.el (org-agenda-quit): When the agenda window is dedicated, remove other windows before exiting, so that the frame really will be killed. * org-exp.el (org-export-handle-include-files): Reset START and END for each loop cycle. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-eval-in-calendar): Use `org-select-frame-set-input-focus'. * org-compat.el (org-select-frame-set-input-focus): New function. * org.el (org-update-statistics-cookies): New function. (org-mode-map): Bind `C-c #' to `org-update-statistics-cookies'. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-src.el (org-edit-fixed-width-region): Set org-src-mode only after the local variables are set. * org-latex.el (org-export-latex-protect-amp): New function. (org-export-latex-links): Protect link ampersands in tables. * org-exp.el (org-export-select-backend-specific-text): Match in two steps, to avoid regexp problems. * org.el (org-offer-links-in-entry): Improve working with many and duplicate links. * org-agenda.el (org-agenda-show-1): Make more consistent with normal cycling. (org-agenda-cycle-show): Make more consistent with normal cycling. * org-gnus.el (org-gnus-store-link): Restore the linking to a website. 2009-09-02 Bastien Guerry <bzg@altern.org> * org-latex.el (org-export-latex-first-lines): Bugfix. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-clock.el (org-clock-modify-effort-estimate): Emit message about new effort. * org.el (org-set-effort): New function. (org-mode-map): New key for effort setting command. * org-agenda.el (org-agenda): Keep window setup when calling agenda from within agenda window. (org-agenda-mode-map): New keys for effort setting commands. (org-agenda-menu): Add effort setting commands to menu. (org-agenda-set-property, org-agenda-set-effort): New functions. * org-latex.el (org-export-latex-tables): Fix `org-table-last-alignment' and `org-table-last-column-widths' if the first column has been removed. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-remove-timestamp-with-keyword): Only remove in entry, not in subtree. * org-src.el (org-src-lang-modes): Add abbreviation elisp for emacs lisp. * org.el (org-open-at-point): When on headline, offer all strings in entry. * org-remember.el (org-remember-templates): Documentation fix. * org.el (org-move-subtree-down): Use `org-get-next-sibling' and `org-get-last-sibling' instead of the outline versions of these functions. (org-get-last-sibling): New function. (org-refile): Use `org-get-next-sibling' instead of the outline version of this function. (org-clean-visibility-after-subtree-move): Use `org-get-next-sibling' and `org-get-last-sibling' instead of the outline versions of these functions. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-prepare-agenda): When creating a new frame for the agenda, make the window dedicated. * org-agenda.el (org-agenda-mode-map): New keys for time motion. * org-table.el (org-table-align): Change the order of reinsertion and deletion, to avoid problems with overlays following the table. * org.el (org-parse-time-string): Better error message. (org-show-subtree): Use org-end-of-subtree. * org-macs.el (org-goto-line): New defsubst. * org.el (org-open-file, org-change-tag-in-region) (org-fast-tag-show-exit): Don't use `goto-line'. * org-table.el (org-table-align, org-table-insert-column) (org-table-delete-column, org-table-move-column) (org-table-sort-lines, org-table-copy-region) (org-table-paste-rectangle, org-table-wrap-region) (org-table-get-specials, org-table-rotate-recalc-marks) (org-table-get-range, org-table-recalculate) (org-table-edit-formulas, org-table-fedit-convert-buffer) (org-table-show-reference, org-table-highlight-rectangle): Don't use `goto-line'. * org-src.el (org-edit-src-code, org-edit-fixed-width-region) (org-edit-src-exit): Don't use `goto-line'. * org-macs.el (org-preserve-lc): Don't use `goto-line'. * org-list.el (org-renumber-ordered-list, org-fix-bullet-type): Don't use `goto-line'. * org-exp.el (org-export-number-lines): Don't use `goto-line'. * org-colview.el (org-columns, org-columns-redo) (org-agenda-columns): Don't use `goto-line'. * org-colview-xemacs.el (org-columns, org-agenda-columns): Don't use `goto-line'. * org-agenda.el (org-agenda-mode): Force visual line motion off. (org-agenda-add-entry-text-maxlines): Improve docstring. (org-agenda-start-with-entry-text-mode): New option. (org-agenda-entry-text-maxlines): New option. (org-agenda-entry-text-mode): New variable. (org-agenda-mode): Set initial value of `org-agenda-entry-text-mode'. (org-agenda-mode-map): Add the `E' key. (org-agenda-menu): Add entry text mode to the menu. (org-agenda-get-some-entry-text): Fix line count bug. (org-finalize-agenda): Apply entry text mode if appropriate. (org-agenda-entry-text-show-here): New function. (org-agenda-entry-text-show): New function. (org-agenda-entry-text-hide): New function. (org-agenda-view-mode-dispatch): Add entry text mode to the view key menu. (org-agenda-entry-text-mode): New command. (org-agenda-set-mode-name): Add entry text mode to the mode line string. (org-agenda-undo, org-agenda-get-restriction-and-command) (org-agenda-get-some-entry-text, org-agenda-redo): Don't use `goto-line'. 2009-09-02 Bernt Hansen <bernt@norang.ca> * org-clock.el (org-notify): Bugfix. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-agenda-open-link): Handle multiple links and check for after-string. * org-gnus.el (org-gnus-store-link): Simplify. * org.el (org-latex-regexps): Don't add extra empty lines for display formulas. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-agenda-get-some-entry-text): New function. (org-agenda-add-entry-text): Use `org-agenda-get-some-entry-text'. * org.el (org-cycle-separator-lines): Update docstring. (org-cycle-show-empty-lines): Handle negative values for `org-cycle-show-empty-lines'. * org-exp.el (org-export-protect-sub-super): New function. (org-export-normalize-links): Protect the url of plain links from supscript and superscript processing. * org-remember.el (org-remember-escaped-%): New function. (org-remember-apply-template): Use `org-remember-escaped-%' to detect escaped % signs. 2009-09-02 Bastien Guerry <bzg@altern.org> * org-timer.el (org-timer-set-timer): Use `org-notify' and play a sound when showing the notification. * org-clock.el (org-notify): New function. (org-clock-notify-once-if-expired): Use `org-notify'. * org-gnus.el (org-gnus-store-link): Handle `gnus-summary-mode' and `gnus-article-mode' separately. (gnus-summary-article-header): Fix the declare-function. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-export-format-source-code-or-example): Translate language. * org-src.el (org-src-lang-modes): New variable (org-edit-src-code): Translate language. * org-exp.el (org-export-format-source-code-or-example): Deal wit the new structure of the `org-export-latex-listings-langs' variable. * org-latex.el (org-export-latex-listings-langs): Change structure of the variable from plist to alist. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-in-commented-line): New function. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-hide-block-toggle): Make folded blocks searchable. 2009-09-02 Friedrich Delgado Friedrichs <friedel@nomaden.org> (tiny change) * org.el (org-flag-drawer): More useful error. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-remember.el (org-remember-apply-template): Use org-icompleting-read. * org-publish.el (org-publish): Use org-icompleting-read. * org-colview.el (org-columns-edit-value, org-columns-new) (org-insert-columns-dblock): Use org-icompleting-read. * org-colview-xemacs.el (org-columns-edit-value) (org-columns-new, org-insert-columns-dblock): Use org-icompleting-read. * org-attach.el (org-attach-delete-one, org-attach-open): Use org-icompleting-read. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-hierarchical-todo-statistics): Improve docstring. (org-version): Return the version text. (org-org-menu): Add a menu entry for the new bug reporter. (org-submit-bug-report): New command. * org-list.el (org-hierarchical-checkbox-statistics): Improve docstring. * org.el (org-emphasis-regexp-components): Add "`" to set of pre-emphasis characters. * org-latex.el (org-export-latex-classes): Always include the soul package. (org-export-latex-emphasis-alist): Use \st for strikethough. * org-exp-blocks.el (org-export-blocks-preprocess): Use `indent-code-rigidly' to indent. * org-agenda.el (org-agenda-get-restriction-and-command): Remove properties only if MATCH really is a string. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-latex.el (org-export-latex-packages-alist): Fix customization type. * org.el (org-create-formula-image): Also use `org-export-latex-packages-alist'. * org-html.el (org-export-as-html): Fix bug in footnote regexp. (org-export-as-html): Format footnotes correctly. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-fast-tag-selection): Avoid text properties on tags in the alist. * org-agenda.el (org-agenda-get-restriction-and-command): Avoid text properties on the match element. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-set-regexps-and-options): Make sure the list of done keywords is not invalid. * org-exp.el (org-export-interpolate-newlines): New function. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-format-latex): Avoid nested overlays. * org-latex.el (org-export-latex-listings-langs): Add a few more languages. * org-exp.el (org-export-preprocess-apply-macros): Make sure to ignore newlines and space before the first macro argument. * org-latex.el (org-export-latex-tables): Remove save-excursion around `org-table-align'. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-export-html-special-string-regexps): Definition moved into org.el * org-exp.el (org-export-preprocess-apply-macros): Allow newlines in macro calls. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-latex.el (org-export-latex-listings) (org-export-latex-listings-langs): New options. * org-exp.el (org-export-format-source-code-or-example): Use listing package if requested by the user. 2009-09-02 Bastien Guerry <bzg@altern.org> * org.el (org-iswitchb): Fix bug when aborting the `org-iswitchb' command before actually switching to a buffer. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-get-file-contents): Only quote org lines when the markup is src or example. * org-agenda.el (org-agenda-skip-scheduled-if-deadline-is-shown): New option (org-agenda-get-day-entries): Remember deadline results and pass them on into the function getting the scheduling information. (org-agenda-get-scheduled): Accept deadline results as parameters and maybe skip some entries. (org-agenda-skip-scheduled-if-deadline-is-shown): New option. * org.el (org-insert-heading): When respecting content, do not convert current line to headline. * org-clock.el (org-clock-save-markers-for-cut-and-paste): Also cheeeeeck the hd marker (org-clock-in): Also set the hd marker. (org-clock-out): Also set the hd marker. (org-clock-cancel): Reset markers. * org.el (org-clock-hd-marker): New marker. * org-faces.el (org-agenda-clocking): New face. * org-agenda.el (org-agenda-mark-clocking-task): New function. (org-finalize-agenda): call `org-agenda-mark-clocking-task'. * org.el (org-modules): Add org-track.el. * org-agenda.el (org-agenda-bulk-marked-p): New function. (org-agenda-bulk-mark, org-agenda-bulk-unmark): Use `org-agenda-bulk-marked-p'. (org-agenda-bulk-toggle): New command. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-move-subtree-down): Hide subtree if it was folded, not just the body. * org-remember.el (org-remember-finalize): Avoid buffer-modified messages.
220 lines
8.9 KiB
EmacsLisp
220 lines
8.9 KiB
EmacsLisp
;;; org-mac-message.el --- Links to Apple Mail.app messages from within Org-mode
|
|
|
|
;; Copyright (C) 2008, 2009 Free Software Foundation, Inc.
|
|
|
|
;; Author: John Wiegley <johnw@gnu.org>
|
|
;; Christopher Suckling <suckling at gmail dot com>
|
|
|
|
;; Version: 6.30c
|
|
;; Keywords: outlines, hypermedia, calendar, wp
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
;; This file implements links to Apple Mail.app messages from within Org-mode.
|
|
;; Org-mode does not load this module by default - if you would actually like
|
|
;; this to happen then configure the variable `org-modules'.
|
|
|
|
;; If you would like to create links to all flagged messages in an
|
|
;; Apple Mail.app account, please customize the variable
|
|
;; `org-mac-mail-account' and then call one of the following functions:
|
|
|
|
;; (org-mac-message-insert-selected) copies a formatted list of links to
|
|
;; the kill ring.
|
|
|
|
;; (org-mac-message-insert-selected) inserts at point links to any
|
|
;; messages selected in Mail.app.
|
|
|
|
;; (org-mac-message-insert-flagged) searches within an org-mode buffer
|
|
;; for a specific heading, creating it if it doesn't exist. Any
|
|
;; message:// links within the first level of the heading are deleted
|
|
;; and replaced with links to flagged messages.
|
|
|
|
;;; Code:
|
|
|
|
(require 'org)
|
|
|
|
(defgroup org-mac-flagged-mail nil
|
|
"Options concerning linking to flagged Mail.app messages"
|
|
:tag "Org Mail.app"
|
|
:group 'org-link)
|
|
|
|
(defcustom org-mac-mail-account "customize"
|
|
"The Mail.app account in which to search for flagged messages"
|
|
:group 'org-mac-flagged-mail
|
|
:type 'string)
|
|
|
|
(org-add-link-type "message" 'org-mac-message-open)
|
|
|
|
;; In mac.c, removed in Emacs 23.
|
|
(declare-function do-applescript "org-mac-message" (script))
|
|
(unless (fboundp 'do-applescript)
|
|
;; Need to fake this using shell-command-to-string
|
|
(defun do-applescript (script)
|
|
(let (start cmd return)
|
|
(while (string-match "\n" script)
|
|
(setq script (replace-match "\r" t t script)))
|
|
(while (string-match "'" script start)
|
|
(setq start (+ 2 (match-beginning 0))
|
|
script (replace-match "\\'" t t script)))
|
|
(setq cmd (concat "osascript -e '" script "'"))
|
|
(setq return (shell-command-to-string cmd))
|
|
(concat "\"" (org-trim return) "\""))))
|
|
|
|
(defun org-mac-message-open (message-id)
|
|
"Visit the message with the given MESSAGE-ID.
|
|
This will use the command `open' with the message URL."
|
|
(start-process (concat "open message:" message-id) nil
|
|
"open" (concat "message://<" (substring message-id 2) ">")))
|
|
|
|
(defun as-get-selected-mail ()
|
|
"AppleScript to create links to selected messages in Mail.app"
|
|
(do-applescript
|
|
(concat
|
|
"tell application \"Mail\"\n"
|
|
"set theLinkList to {}\n"
|
|
"set theSelection to selection\n"
|
|
"repeat with theMessage in theSelection\n"
|
|
"set theID to message id of theMessage\n"
|
|
"set theSubject to subject of theMessage\n"
|
|
"set theLink to \"message://\" & theID & \"::split::\" & theSubject & \"\n\"\n"
|
|
"copy theLink to end of theLinkList\n"
|
|
"end repeat\n"
|
|
"return theLinkList as string\n"
|
|
"end tell")))
|
|
|
|
(defun as-get-flagged-mail ()
|
|
"AppleScript to create links to flagged messages in Mail.app"
|
|
(do-applescript
|
|
(concat
|
|
;; Is Growl installed?
|
|
"tell application \"System Events\"\n"
|
|
"set growlHelpers to the name of every process whose creator type contains \"GRRR\"\n"
|
|
"if (count of growlHelpers) > 0 then\n"
|
|
"set growlHelperApp to item 1 of growlHelpers\n"
|
|
"else\n"
|
|
"set growlHelperApp to \"\"\n"
|
|
"end if\n"
|
|
"end tell\n"
|
|
|
|
;; Get links
|
|
"tell application \"Mail\"\n"
|
|
"set theMailboxes to every mailbox of account \"" org-mac-mail-account "\"\n"
|
|
"set theLinkList to {}\n"
|
|
"repeat with aMailbox in theMailboxes\n"
|
|
"set theSelection to (every message in aMailbox whose flagged status = true)\n"
|
|
"repeat with theMessage in theSelection\n"
|
|
"set theID to message id of theMessage\n"
|
|
"set theSubject to subject of theMessage\n"
|
|
"set theLink to \"message://\" & theID & \"::split::\" & theSubject & \"\n\"\n"
|
|
"copy theLink to end of theLinkList\n"
|
|
|
|
;; Report progress through Growl
|
|
;; This "double tell" idiom is described in detail at
|
|
;; http://macscripter.net/viewtopic.php?id=24570 The
|
|
;; script compiler needs static knowledge of the
|
|
;; growlHelperApp. Hmm, since we're compiling
|
|
;; on-the-fly here, this is likely to be way less
|
|
;; portable than I'd hoped. It'll work when the name
|
|
;; is still "GrowlHelperApp", though.
|
|
"if growlHelperApp is not \"\" then\n"
|
|
"tell application \"GrowlHelperApp\"\n"
|
|
"tell application growlHelperApp\n"
|
|
"set the allNotificationsList to {\"FlaggedMail\"}\n"
|
|
"set the enabledNotificationsList to allNotificationsList\n"
|
|
"register as application \"FlaggedMail\" all notifications allNotificationsList default notifications enabledNotificationsList icon of application \"Mail\"\n"
|
|
"notify with name \"FlaggedMail\" title \"Importing flagged message\" description theSubject application name \"FlaggedMail\"\n"
|
|
"end tell\n"
|
|
"end tell\n"
|
|
"end if\n"
|
|
"end repeat\n"
|
|
"end repeat\n"
|
|
"return theLinkList as string\n"
|
|
"end tell")))
|
|
|
|
(defun org-mac-message-get-links (&optional select-or-flag)
|
|
"Create links to the messages currently selected or flagged in Mail.app.
|
|
This will use AppleScript to get the message-id and the subject of the
|
|
messages in Mail.app and make a link out of it.
|
|
When SELECT-OR-FLAG is \"s\", get the selected messages (this is also
|
|
the default). When SELECT-OR-FLAG is \"f\", get the flagged messages.
|
|
The Org-syntax text will be pushed to the kill ring, and also returned."
|
|
(interactive "sLink to (s)elected or (f)lagged messages: ")
|
|
(setq select-or-flag (or select-or-flag "s"))
|
|
(message "AppleScript: searching mailboxes...")
|
|
(let* ((as-link-list
|
|
(if (string= select-or-flag "s")
|
|
(as-get-selected-mail)
|
|
(if (string= select-or-flag "f")
|
|
(as-get-flagged-mail)
|
|
(error "Please select \"s\" or \"f\""))))
|
|
(link-list
|
|
(mapcar
|
|
(lambda (x) (if (string-match "\\`\"\\(.*\\)\"\\'" x) (setq x (match-string 1 x))) x)
|
|
(split-string as-link-list "[\r\n]+")))
|
|
split-link URL description orglink orglink-insert rtn orglink-list)
|
|
(while link-list
|
|
(setq split-link (split-string (pop link-list) "::split::"))
|
|
(setq URL (car split-link))
|
|
(setq description (cadr split-link))
|
|
(when (not (string= URL ""))
|
|
(setq orglink (org-make-link-string URL description))
|
|
(push orglink orglink-list)))
|
|
(setq rtn (mapconcat 'identity orglink-list "\n"))
|
|
(kill-new rtn)
|
|
rtn))
|
|
|
|
(defun org-mac-message-insert-selected ()
|
|
"Insert a link to the messages currently selected in Mail.app.
|
|
This will use applescript to get the message-id and the subject of the
|
|
active mail in Mail.app and make a link out of it."
|
|
(interactive)
|
|
(insert (org-mac-message-get-links "s")))
|
|
|
|
;; The following line is for backward compatibility
|
|
(defalias 'org-mac-message-insert-link 'org-mac-message-insert-selected)
|
|
|
|
(defun org-mac-message-insert-flagged (org-buffer org-heading)
|
|
"Asks for an org buffer and a heading within it, and replace message links.
|
|
If heading exists, delete all message:// links within heading's first
|
|
level. If heading doesn't exist, create it at point-max. Insert
|
|
list of message:// links to flagged mail after heading."
|
|
(interactive "bBuffer in which to insert links: \nsHeading after which to insert links: ")
|
|
(save-excursion
|
|
(set-buffer org-buffer)
|
|
(goto-char (point-min))
|
|
(let ((isearch-forward t)
|
|
(message-re "\\[\\[\\(message:\\)\\([^]]+\\)\\]\\(\\[\\([^]]+\\)\\]\\)?\\]"))
|
|
(if (org-goto-local-search-headings org-heading nil t)
|
|
(if (not (eobp))
|
|
(progn
|
|
(save-excursion
|
|
(while (re-search-forward
|
|
message-re (save-excursion (outline-next-heading)) t)
|
|
(delete-region (match-beginning 0) (match-end 0)))
|
|
(insert "\n" (org-mac-message-get-links "f")))
|
|
(flush-lines "^$" (point) (outline-next-heading)))
|
|
(insert "\n" (org-mac-message-get-links "f")))
|
|
(goto-char (point-max))
|
|
(insert "\n")
|
|
(org-insert-heading)
|
|
(insert org-heading "\n" (org-mac-message-get-links "f"))))))
|
|
|
|
(provide 'org-mac-message)
|
|
|
|
;; arch-tag: 3806d0c1-abe1-4db6-9c31-f3ed7d4a9b32
|
|
|
|
;;; org-mac-message.el ends here
|