소스 검색

Install fixes from Thomas Baumann to org-bbdb.el.

Carsten Dominik 17 년 전
부모
커밋
4d98decbac
2개의 변경된 파일12개의 추가작업 그리고 12개의 파일을 삭제
  1. 1 1
      doc/org.texi
  2. 11 11
      lisp/org-bbdb.el

+ 1 - 1
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

+ 11 - 11
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)