diff options
author | Carsten Dominik <carsten.dominik@gmail.com> | 2008-04-19 07:21:33 +0200 |
---|---|---|
committer | Carsten Dominik <carsten.dominik@gmail.com> | 2008-04-19 07:21:33 +0200 |
commit | 4d98decbac9bec40d3c890f2ac82d2b1c2d5f437 (patch) | |
tree | a62ea6a85141a703b6faa366280d1ed3d1f30dba | |
parent | 3798fbb8f5575a8ecad620a5f2a5be22b7fc20c3 (diff) | |
download | org-mode-4d98decbac9bec40d3c890f2ac82d2b1c2d5f437.tar.gz |
Install fixes from Thomas Baumann to org-bbdb.el.
-rw-r--r-- | doc/org.texi | 2 | ||||
-rw-r--r-- | lisp/org-bbdb.el | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/doc/org.texi b/doc/org.texi index fdfb766..f5a046a 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -4618,7 +4618,7 @@ you want to clock your time). For a specific buffer you can use @example #+PROPERTY: Effort_ALL 0 0:10 0:30 1:00 2:00 3:00 4:00 5:00 6:00 7:00 8:00 -#+COLUMNS: %40ITEM(Task) %17Effort(Estimated Effort){:} %CLOCKSUM +#+COLUMNS: %40ITEM(Task) %17Effort(Estimated Effort)@{:@} %CLOCKSUM @end example @noindent diff --git a/lisp/org-bbdb.el b/lisp/org-bbdb.el index 82f9209..c403111 100644 --- a/lisp/org-bbdb.el +++ b/lisp/org-bbdb.el @@ -33,11 +33,12 @@ ;; configure the variable `org-modules'. -;; It also implements an interface 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'd better include the anniversaries in -;; the diary using bbdb-anniv.el +;; 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` @@ -98,14 +99,13 @@ (&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-extract-day "calendar" (date)) -(declare-function calendar-extract-month "calendar" (date)) -(declare-function calendar-extract-year "calendar" (date)) (declare-function calendar-leap-year-p "calendar" (year)) (declare-function diary-ordinal-suffix "diary-lib" (n)) (defvar date) +;; Customization + (defgroup org-bbdb-anniversaries nil "Customizations for including anniversaries from BBDB into Agenda." :group 'org-bbdb) @@ -235,9 +235,9 @@ Argument STR is the anniversary field in BBDB." (defun org-bbdb-anniversaries () "Extract anniversaries from BBDB for display in the agenda." (require 'diary-lib) - (let ((dates (list (cons (cons (calendar-extract-month date) - (calendar-extract-day date)) - (calendar-extract-year date)))) + (let ((dates (list (cons (cons (car date) ; month + (nth 1 date)) ; day + (nth 2 date)))) ; year (text ()) annivs date years split class form) |