mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-15 17:00:26 +00:00
621f83e4c1
* org.el (org-edit-fixed-width-region): Exclude final newline from picture area. * org-export-latex.el (org-export-latex-subcontent): Add labels to sections, to make internal links work. (org-export-latex-fontify-headline): Do not remove all text properties, to make sure that target properties survive this process. * org-exp.el (org-export-preprocess-string): Change sequence of modifications, to make sure links are prepared before the LaTeX conversions do happen. * org-attach.el (org-attach-delete-all): Renamed from `org-attch-delete'. Add a security query before deleting the entire directory. New optional argument FORCE can overrule the security query. (org-attach-delete-one): New command. * org-attach.el (org-attach-file-list): Fix bug with directory. * org.el (org-apps-regexp-alist): New function. (org-file-apps): Add auto-mode to the default value. (org-open-file): Use the new structure of org-file-apps. * org-attach.el (org-attach): Support the new keys. (org-attach-method): New option. * org-bbdb.el (org-bbdb-anniversaries): Fix but with 29 Feb/1 March. * org.el (org-remove-uniherited-tags): Fix reverse interpretation of the list value o `org-use-tag-inheritance'. * org-attach.el (org-attach-auto-tag): New option. (org-attach-tag, org-attach-untag): New functions. (org-attach-attach, org-attach-new, org-attach-sync): Call `org-attach-tag'. (org-attach-delete): Call `org-attach-untag'. * org-attach.el: New file. * org-table.el (orgtbl-self-insert-command): Make this work for the keypad as well. * org.el (org-add-log-setup): Limit searc for drawers to entry text, not to subtree. * org-clock.el (org-clock-heading-for-remember): New variable. (org-clock-in): Set `org-clock-heading-for-remember'. 2008-10-12 James TD Smith <ahktenzero@mohorovi.cc> * org-remember.el (org-remember-apply-template): Add new expansions: %k, %K for currently clocked task and a link to the currently clocked task, and %< to file notes in the currently clocked task. 2008-10-12 Carsten Dominik <dominik@science.uva.nl> * org-export-latex.el (org-export-latex-make-header): Also insert the content of the property :latex-header-extra. * org-exp.el (org-infile-export-plist): Put the content of #+LATEX_HEADER: into the property :latex-header-extra. * org-colview.el (org-columns-get-format-and-top-level): Remove resetting the marker. * org-colview-xemacs.el (org-columns-get-format-and-top-level): Remove resetting the marker. * org.el (org-entry-property-inherited-from): Improve docstring. (org-entry-get-with-inheritance): Reset marker before starting the search. * org-exp.el (org-infile-export-plist): Allow multiple STYLE lines. * org.el (org-entry-get-multivalued-property) (org-entry-protect-space, org-entry-restore-space): New functions. (org-file-apps-defaults-macosx): Let postscript files be opened by preview. (org-time-stamp-inactive): Call `org-time-stamp'. (org-time-stamp): New argument `inactive'. Also edit inacive stamps. Convert time stamp type. (org-open-file): Interpret the `default' value for the `command' in `org-file-apps'. * org-id.el (org-id-int-to-b36-one-digit) (org-id-b36-to-int-one-digit, org-id-int-to-b36) (org-id-b36-to-int, org-id-time-to-b36): Modified from b62 to b36. * org-id.el (org-id-reverse-string): New function. (org-id-new): Use `org-id-reverse-string' to make sure the beginning chars of the ID are mutating fast. This allows to use a directory structure to spread things better. (org-id-prefix): Changed default to nil. * org-list.el (org-move-item-down, org-move-item-up): Remember and restore the column of the cursor position. * org-remember.el (org-remember-apply-template): Remove properties from `initial'. * org-wl.el (org-wl-open): Remove useless call to `wl-thread-open-all'. * org-remember.el (org-remember-handler): Fix bug with `bottom' location. * org-bbdb.el (org-bbdb-anniversaries): Require bbdb in `org-bbdb-anniversaries'. * org.el (org-get-next-sibling, org-forward-same-level): New functions, similar to the outline versions, but invisible headings are OK. 2008-10-12 Bastien Guerry <bzg@altern.org> * org.el (org-auto-repeat-maybe): Insert a space between the timestamp's type and the timestamp itself. 2008-10-12 Carsten Dominik <dominik@science.uva.nl> * org-table.el (org-table-sum): Do not format the result with %g, it does rounding when there are too many digits. * org.el (org-map-entries): Protect the keyword-selecting variables. 2008-10-12 Bastien Guerry <bzg@altern.org> * org-agenda.el (org-agenda-to-appt): Make sure the function check against all agenda files. 2008-10-12 Carsten Dominik <dominik@science.uva.nl> * org-list.el: New file, aggregating list functions from org.el and org-export-latex.el. * org.el (org-edit-src-region-extra): New option. * org-agenda.el (org-agenda-to-appt): Fix bug with appointment time before 1am. 2008-10-12 Bastien Guerry <bzg@altern.org> * org-export-latex.el (org-export-latex-keywords-maybe): Bug fix. 2008-10-12 James TA Smith <ahktenzero@mohorovi.cc> * org-plot.el (org-plot/gnuplot): Make tables starting with a hline work correctly. (org-plot/gnuplot-script): Put commas at the end of each script line. * org.el (org-get-refile-targets): Replace links with their descriptions (org-imenu-get-tree): Replace links with their descriptions. * org-remember.el (org-remember-apply-template): Add a new expansion for adding properties to remember items. * org.el (org-add-log-setup): Skip over drawers (properties, clocks etc) when adding notes. * org-agenda.el (org-agenda-get-closed): show durations of clocked items as well as the start and end times. * org-compat.el (org-get-x-clipboard-compat): Add a compat function for fetching the X clipboard on XEmacs and GNU Emacs 21. * org-remember.el (org-get-x-clipboard): Use the compat function to get clipboard values when x-selection-value is unavailable. Use substring-no-properties instead of set-text-properties to remove text properties from the clipboard value. * lisp/org-clock.el (org-update-mode-line): Support limiting the modeline clock string, and display the full todo value in the tooltip. Set a local keymap so mouse-3 on the clock string goes to the currently clocked task. (org-clock-string-limit): Add a custom value for the maximum length of the clock string in the modeline. (org-clock-mode-map): Add a keymap for the modeline string 2008-10-12 Carsten Dominik <dominik@science.uva.nl> * org-compat.el (org-propertize): New function. 2008-10-12 Bastien Guerry <bzg@altern.org> * org-export-latex.el (org-export-latex-tables): protect exported tables from further special chars conversion. (org-export-latex-preprocess): Preserve LaTeX environments. (org-list-parse-list): Parse descriptive lists. (org-list-to-generic, org-list-to-latex, org-list-to-html) (org-list-to-texinfo): Export descriptive lists. (org-quote-chars): Remove. (org-export-latex-keywords-maybe): Use `replace-regexp-in-string'. (org-export-latex-list-beginning-re): Rename to `org-list-beginning-re' (org-list-item-begin): Rename to `org-list-item-beginning' 2008-10-12 Carsten Dominik <dominik@science.uva.nl> * org.el (org-refile): Allow refiling to the last entry in the buffer. (org-get-tags-at): Fix bug when inheritance is turned off. * org.el (org-indent-line-function): No longer check for src regions, this is too much overhead. * org-agenda.el (org-agenda-highlight-todo): Fix bugs with keyword matching. * org.el (org-scan-tags): Make sure that tags matching is not case sensitive. TODO keyword matching is case sensitive, however, to avoid confusion with similar words that are not meant to be keywords. * org.el (org-get-local-tags-at): New function. (org-get-local-tags): New function. * org-exp.el (org-export-get-categories): New function. * org-agenda.el (org-sorting-choice) (org-agenda-sorting-strategy, org-agenda-get-todos) (org-agenda-get-timestamps, org-agenda-get-deadlines) (org-agenda-get-scheduled, org-agenda-get-blocks) (org-entries-lessp): Implement sorting by TODO state. (org-cmp-todo-state): New defsubst. * org-colview.el (org-colview-construct-allowed-dates): New function. (org-columns-next-allowed-value): Use `org-colview-construct-allowed-dates'. * org-colview-xemacs.el (org-colview-construct-allowed-dates): New function. (org-columns-next-allowed-value): Use `org-colview-construct-allowed-dates'. * org.el (org-protect-slash): New function. (org-get-refile-targets): Use `org-protect-slash'. * org-agenda.el (org-global-tags-completion-table): New variable. * org-exp.el (org-export-handle-export-tags): New function. (org-export-preprocess-string): Call `org-export-handle-export-tags'. * org-plot.el: New file. * org-publish.el (org-publish-expand-components): Function removed. (org-publish-expand-projects): Allow components to have components. * org.el (org-indent-line-function): Do not indent in regions that are external source code. (org-yank-and-fold-if-subtree): New function. * org-agenda.el (org-agenda-todayp): New function. (org-agenda-get-deadlines, org-agenda-get-scheduled): Use `org-agenda-todayp'. * org.el (org-insert-heading-respect-content) (org-insert-todo-heading-respect-content): New commands. (org-insert-heading-respect-content): New option. (org-insert-heading): Respect `org-insert-heading-respect-content'. * org-clock.el (org-clock-find-position): Make sure the note after the clock line gets moved into the new clock drawer. * org-id.el (org-id-new): New option. * org-table.el (org-table-copy-down): Avoid overflow during increment. Use prefix argument 0 to temporarily disable the increment. * org-exp.el (org-export-as-html): Do not turn on the major mode if the buffer will be killed anyway. (org-get-current-options): Exclude the #+TEXT field. (org-export-as-html): Make sure text before the first headline is a paragraph. * org-publish.el (org-publish-org-to): Tell the exporter that this buffer will be killed, so it is not necessary to do major mode initialization. * org-archive.el (org-archive-to-archive-sibling): Show empty lines after folding the archive sibling. * org.el (org-log-note-extra): New variable. 2008-10-12 Bastien Guerry <bzg@altern.org> * org.el (org-additional-option-like-keywords): Added keywords for the _QUOTE, _VERSE and _SRC environments. * org-export-latex.el (org-export-latex-preprocess): Fix bug when exporting _QUOTE and _VERSE environments. 2008-10-12 Carsten Dominik <dominik@science.uva.nl> * org-agenda.el (org-agenda-filter-by-tag): New command. * org-exp.el (org-get-current-options): Remove angular brackets from the date entry. * org.el (org-edit-fixed-width-region): New function. (org-edit-fixed-width-region): Also try `org-edit-fixed-width-region'. (org-edit-fixed-width-region-mode): New option. (org-activate-code): Only interprete lines starting with colon plus a space as example lines. * org-remember.el (org-remember-templates): Add nil instead of empty strings to fix the length of remember templates. * org-table.el (org-calc-default-modes): Fix the time format for calc, from 12 hour to 24 hour clock. * org-agenda.el (org-agenda-get-deadlines) (org-agenda-get-scheduled): Avoid `time-of-day' extraction for entries that are pre-warnings of deadlines or reminders. * org.el (org-sort-entries-or-items): Make numeric and alpha comparisons ignore any TODO keyword and priority cookie. * org-remember.el (org-remember-handler): Reinterpretation of the prefix argument. * org-agenda.el (org-agenda-get-scheduled): Use new `org-scheduled' face. * org-faces.el (org-scheduled): New face. * org-wl.el (org-wl-open): Remove incorrect declaration. * org-gnus.el (org-gnus-store-link): Support for :to information in gnus links. * org-exp.el (org-export-as-html): Fixed typo in creator information. (org-export-protect-examples): New parameter indent. Insert extra spaces only when this parameter is specified. (org-export-preprocess-string): Call `org-export-protect-examples' with an indentation parameter when exporting to ASCII. * org-remember.el (org-remember-templates) (org-remember-apply-template): Allow the file component to be a function. * org.el (org-goto-local-search-headings): Renamed from `org-goto-local-search-forward-headings'. Added the possibility to search backwards. * org-export-latex.el (org-export-latex): New customization group. * org-agenda.el (org-write-agenda): Erase buffer for txt export. * org-exp.el (org-html-do-expand): Allow {} to terminate tex macro * org.el (org-buffer-list): Select buffers based on major mode, not on file name. * org-agenda.el (org-agenda-align-tags): Fix bug with malformed face property. * org-colview.el (org-columns-display-here): Use `org-columns-modify-value-for-display-function'. * org-colview-xemacs.el (org-columns-display-here): Use `org-columns-modify-value-for-display-function'. * org.el (org-columns-modify-value-for-display-function): New option. * org-publish.el (org-publish-file): Make sure the directory match for the publishing directory works correctly. * org-agenda.el (org-agenda-execute-calendar-command) (org-agenda-diary-entry): Additional optional argument.
333 lines
12 KiB
EmacsLisp
333 lines
12 KiB
EmacsLisp
;;; org-bbdb.el --- Support for links to BBDB entries from within Org-mode
|
|
|
|
;; Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
|
|
;; Author: Carsten Dominik <carsten at orgmode dot org>,
|
|
;; Thomas Baumann <thomas dot baumann at ch dot tum dot de>
|
|
;; Keywords: outlines, hypermedia, calendar, wp
|
|
;; Homepage: http://orgmode.org
|
|
;; Version: 6.09a
|
|
;;
|
|
;; 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 BBDB database entries from within Org-mode.
|
|
;; Org-mode loads this module by default - if this is not what you want,
|
|
;; configure the variable `org-modules'.
|
|
|
|
;; It also implements an interface (based on Ivar Rummelhoff's
|
|
;; bbdb-anniv.el) for those org-mode users, who do not use the diary
|
|
;; but who do want to include the anniversaries stored in the BBDB
|
|
;; into the org-agenda. If you already include the `diary' into the
|
|
;; agenda, you might want to prefer to include the anniversaries in
|
|
;; the diary using bbdb-anniv.el.
|
|
;;
|
|
;; Put the following in /somewhere/at/home/diary.org and make sure
|
|
;; that this file is in `org-agenda-files`
|
|
;;
|
|
;; %%(org-bbdb-anniversaries)
|
|
;;
|
|
;; For example my diary.org looks like:
|
|
;; * Anniversaries
|
|
;; #+CATEGORY: Anniv
|
|
;; %%(org-bbdb-anniversaries)
|
|
;;
|
|
;;
|
|
;; The anniversaries are stored in BBDB in the field `anniversary'
|
|
;; in the format
|
|
;;
|
|
;; YYYY-MM-DD{ CLASS-OR-FORMAT-STRING}*
|
|
;; {\nYYYY-MM-DD CLASS-OR-FORMAT-STRING}*
|
|
;;
|
|
;; CLASS-OR-FORMAT-STRING is one of two things:
|
|
;;
|
|
;; * an identifier for a class of anniversaries (eg. birthday or
|
|
;; wedding) from `org-bbdb-anniversary-format-alist'.
|
|
;; * the (format) string displayed in the diary.
|
|
;;
|
|
;; It defaults to the value of `org-bbdb-default-anniversary-format'
|
|
;; ("birthday" by default).
|
|
;;
|
|
;; The substitutions in the format string are (in order):
|
|
;; * the name of the record containing this anniversary
|
|
;; * the number of years
|
|
;; * an ordinal suffix (st, nd, rd, th) for the year
|
|
;;
|
|
;; See the documentation of `org-bbdb-anniversary-format-alist' for
|
|
;; further options.
|
|
;;
|
|
;; Example
|
|
;;
|
|
;; 1973-06-22
|
|
;; 20??-??-?? wedding
|
|
;; 1998-03-12 %s created bbdb-anniv.el %d years ago
|
|
;;
|
|
;; From Org's agenda, you can use `C-c C-o' to jump to the BBDB
|
|
;; link from which the entry at point originates.
|
|
;;
|
|
;;; Code:
|
|
|
|
(require 'org)
|
|
(eval-when-compile
|
|
(require 'cl))
|
|
|
|
;; Declare external functions and variables
|
|
|
|
(declare-function bbdb "ext:bbdb-com" (string elidep))
|
|
(declare-function bbdb-company "ext:bbdb-com" (string elidep))
|
|
(declare-function bbdb-current-record "ext:bbdb-com"
|
|
(&optional planning-on-modifying))
|
|
(declare-function bbdb-name "ext:bbdb-com" (string elidep))
|
|
(declare-function bbdb-record-getprop "ext:bbdb" (record property))
|
|
(declare-function bbdb-record-name "ext:bbdb" (record))
|
|
(declare-function bbdb-records "ext:bbdb"
|
|
(&optional dont-check-disk already-in-db-buffer))
|
|
(declare-function bbdb-split "ext:bbdb" (string separators))
|
|
(declare-function bbdb-string-trim "ext:bbdb" (string))
|
|
(declare-function calendar-leap-year-p "calendar" (year))
|
|
(declare-function diary-ordinal-suffix "diary-lib" (n))
|
|
|
|
(defvar date) ;; dynamically scoped from Org
|
|
|
|
;; Customization
|
|
|
|
(defgroup org-bbdb-anniversaries nil
|
|
"Customizations for including anniversaries from BBDB into Agenda."
|
|
:group 'org-bbdb)
|
|
|
|
(defcustom org-bbdb-default-anniversary-format "birthday"
|
|
"Default anniversary class."
|
|
:type 'string
|
|
:group 'org-bbdb-anniversaries
|
|
:require 'bbdb)
|
|
|
|
(defcustom org-bbdb-anniversary-format-alist
|
|
'(("birthday" lambda
|
|
(name years suffix)
|
|
(concat "Birthday: [[bbdb:" name "][" name " ("
|
|
(number-to-string years)
|
|
suffix ")]]"))
|
|
("wedding" lambda
|
|
(name years suffix)
|
|
(concat "[[bbdb:" name "][" name "'s "
|
|
(number-to-string years)
|
|
suffix " wedding anniversary]]")))
|
|
"How different types of anniversaries should be formatted.
|
|
An alist of elements (STRING . FORMAT) where STRING is the name of an
|
|
anniversary class and format is either:
|
|
1) A format string with the following substitutions (in order):
|
|
* the name of the record containing this anniversary
|
|
* the number of years
|
|
* an ordinal suffix (st, nd, rd, th) for the year
|
|
|
|
2) A function to be called with three arguments: NAME YEARS SUFFIX
|
|
(string int string) returning a string for the diary or nil.
|
|
|
|
3) An Emacs Lisp form that should evaluate to a string (or nil) in the
|
|
scope of variables NAME, YEARS and SUFFIX (among others)."
|
|
:type 'sexp
|
|
:group 'org-bbdb-anniversaries
|
|
:require 'bbdb)
|
|
|
|
(defcustom org-bbdb-anniversary-field 'anniversary
|
|
"The BBDB field which contains anniversaries.
|
|
The anniversaries are stored in the following format
|
|
|
|
YYYY-MM-DD Class-or-Format-String
|
|
|
|
where class is one of the customized classes for anniversaries;
|
|
birthday and wedding are predefined. Format-String can take three
|
|
substitutions 1) the name of the record containing this
|
|
anniversary, 2) the number of years, and 3) an ordinal suffix for
|
|
the year.
|
|
|
|
Multiple anniversaries can be separated by \\n."
|
|
:type 'symbol
|
|
:group 'org-bbdb-anniversaries
|
|
:require 'bbdb)
|
|
|
|
(defcustom org-bbdb-extract-date-fun 'org-bbdb-anniv-extract-date
|
|
"How to retrieve `month date year' from the anniversary field.
|
|
|
|
Customize if you have already filled your BBDB with dates
|
|
different from YYYY-MM-DD. The function must return a list (month
|
|
date year)."
|
|
:type 'function
|
|
:group 'org-bbdb-anniversaries
|
|
:require 'bbdb)
|
|
|
|
|
|
;; Install the link type
|
|
(org-add-link-type "bbdb" 'org-bbdb-open 'org-bbdb-export)
|
|
(add-hook 'org-store-link-functions 'org-bbdb-store-link)
|
|
|
|
;; Implementation
|
|
(defun org-bbdb-store-link ()
|
|
"Store a link to a BBDB database entry."
|
|
(when (eq major-mode 'bbdb-mode)
|
|
;; This is BBDB, we make this link!
|
|
(let* ((name (bbdb-record-name (bbdb-current-record)))
|
|
(company (bbdb-record-getprop (bbdb-current-record) 'company))
|
|
(link (org-make-link "bbdb:" name)))
|
|
(org-store-link-props :type "bbdb" :name name :company company
|
|
:link link :description name)
|
|
link)))
|
|
|
|
(defun org-bbdb-export (path desc format)
|
|
"Create the export version of a BBDB link specified by PATH or DESC.
|
|
If exporting to either HTML or LaTeX FORMAT the link will be
|
|
italicised, in all other cases it is left unchanged."
|
|
(cond
|
|
((eq format 'html) (format "<i>%s</i>" (or desc path)))
|
|
((eq format 'latex) (format "\\textit{%s}" (or desc path)))
|
|
(t (or desc path))))
|
|
|
|
(defun org-bbdb-open (name)
|
|
"Follow a BBDB link to NAME."
|
|
(require 'bbdb)
|
|
(let ((inhibit-redisplay (not debug-on-error))
|
|
(bbdb-electric-p nil))
|
|
(catch 'exit
|
|
;; Exact match on name
|
|
(bbdb-name (concat "\\`" name "\\'") nil)
|
|
(if (< 0 (buffer-size (get-buffer "*BBDB*"))) (throw 'exit nil))
|
|
;; Exact match on name
|
|
(bbdb-company (concat "\\`" name "\\'") nil)
|
|
(if (< 0 (buffer-size (get-buffer "*BBDB*"))) (throw 'exit nil))
|
|
;; Partial match on name
|
|
(bbdb-name name nil)
|
|
(if (< 0 (buffer-size (get-buffer "*BBDB*"))) (throw 'exit nil))
|
|
;; Partial match on company
|
|
(bbdb-company name nil)
|
|
(if (< 0 (buffer-size (get-buffer "*BBDB*"))) (throw 'exit nil))
|
|
;; General match including network address and notes
|
|
(bbdb name nil)
|
|
(when (= 0 (buffer-size (get-buffer "*BBDB*")))
|
|
(delete-window (get-buffer-window "*BBDB*"))
|
|
(error "No matching BBDB record")))))
|
|
|
|
(defun org-bbdb-anniv-extract-date (time-str)
|
|
"Convert YYYY-MM-DD to (month date year).
|
|
Argument TIME-STR is the value retrieved from BBDB."
|
|
(multiple-value-bind (y m d) (bbdb-split time-str "-")
|
|
(list (string-to-number m)
|
|
(string-to-number d)
|
|
(string-to-number y))))
|
|
|
|
(defun org-bbdb-anniv-split (str)
|
|
"Split multiple entries in the BBDB anniversary field.
|
|
Argument STR is the anniversary field in BBDB."
|
|
(let ((pos (string-match "[ \t]" str)))
|
|
(if pos (list (substring str 0 pos)
|
|
(bbdb-string-trim (substring str pos)))
|
|
(list str nil))))
|
|
|
|
(defvar org-bbdb-anniv-hash nil
|
|
"A hash holding anniversaries extracted from BBDB.
|
|
The hash table is created on first use.")
|
|
|
|
(defvar org-bbdb-updated-p t
|
|
"This is non-nil if BBDB has been updated since we last built the hash.")
|
|
|
|
(defun org-bbdb-make-anniv-hash ()
|
|
"Create a hash with anniversaries extracted from BBDB, for fast access.
|
|
The anniversaries are assumed to be stored `org-bbdb-anniversary-field'."
|
|
|
|
(let (split tmp annivs)
|
|
(clrhash org-bbdb-anniv-hash)
|
|
(dolist (rec (bbdb-records))
|
|
(when (setq annivs (bbdb-record-getprop
|
|
rec org-bbdb-anniversary-field))
|
|
(setq annivs (bbdb-split annivs "\n"))
|
|
(while annivs
|
|
(setq split (org-bbdb-anniv-split (pop annivs)))
|
|
(multiple-value-bind (m d y)
|
|
(funcall org-bbdb-extract-date-fun (car split))
|
|
(setq tmp (gethash (list m d) org-bbdb-anniv-hash))
|
|
(puthash (list m d) (cons (list y
|
|
(bbdb-record-name rec)
|
|
(cadr split))
|
|
tmp)
|
|
org-bbdb-anniv-hash))))))
|
|
(setq org-bbdb-updated-p nil))
|
|
|
|
(defun org-bbdb-updated (rec)
|
|
"Record the fact that BBDB has been updated.
|
|
This is used by Org to re-create the anniversary hash table."
|
|
(setq org-bbdb-updated-p t))
|
|
|
|
(add-hook 'bbdb-after-change-hook 'org-bbdb-updated)
|
|
|
|
;;;###autoload
|
|
(defun org-bbdb-anniversaries()
|
|
"Extract anniversaries from BBDB for display in the agenda."
|
|
(require 'bbdb)
|
|
(require 'diary-lib)
|
|
(unless (hash-table-p org-bbdb-anniv-hash)
|
|
(setq org-bbdb-anniv-hash
|
|
(make-hash-table :test 'equal :size 366)))
|
|
|
|
(when (or org-bbdb-updated-p
|
|
(= 0 (hash-table-count org-bbdb-anniv-hash)))
|
|
(org-bbdb-make-anniv-hash))
|
|
|
|
(let* ((m (car date)) ; month
|
|
(d (nth 1 date)) ; day
|
|
(y (nth 2 date)) ; year
|
|
(annivs (gethash (list m d) org-bbdb-anniv-hash))
|
|
(text ())
|
|
split class form rec recs)
|
|
|
|
;; we don't want to miss people born on Feb. 29th
|
|
(when (and (= m 3) (= d 1)
|
|
(not (null (gethash (list 2 29) org-bbdb-anniv-hash)))
|
|
(not (calendar-leap-year-p y)))
|
|
(setq recs (gethash (list 2 29) org-bbdb-anniv-hash))
|
|
(while (setq rec (pop recs))
|
|
(push rec annivs)))
|
|
|
|
(when annivs
|
|
(while (setq rec (pop annivs))
|
|
(when rec
|
|
(let* ((class (or (nth 2 rec)
|
|
org-bbdb-default-anniversary-format))
|
|
(form (or (cdr (assoc class
|
|
org-bbdb-anniversary-format-alist))
|
|
class)) ; (as format string)
|
|
(name (nth 1 rec))
|
|
(years (- y (car rec)))
|
|
(suffix (diary-ordinal-suffix years))
|
|
(tmp (cond
|
|
((functionp form)
|
|
(funcall form name years suffix))
|
|
((listp form) (eval form))
|
|
(t (format form name years suffix)))))
|
|
(org-add-props tmp nil 'org-bbdb-name name)
|
|
(if text
|
|
(setq text (append text (list tmp)))
|
|
(setq text (list tmp)))))
|
|
))
|
|
(when text
|
|
(mapconcat 'identity text "; "))))
|
|
|
|
(provide 'org-bbdb)
|
|
|
|
;; arch-tag: 9e4f275d-d080-48c1-b040-62247f66b5c2
|
|
|
|
;;; org-bbdb.el ends here
|