From e0c1855dba120e62924324b5bd862645a1fded98 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Sat, 22 Oct 2011 15:04:33 +0200 Subject: [PATCH] Silent byte-compiler about `category-pos'. * org-agenda.el: Replace `category-pos' by `org-category-pos' to silent byte-compiler. --- lisp/org-agenda.el | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index a5f58b7b9..2cc76d78d 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -3804,7 +3804,7 @@ in `org-agenda-text-search-extra-files'." (full-words org-agenda-search-view-force-full-words) (org-agenda-text-search-extra-files org-agenda-text-search-extra-files) regexp rtn rtnall files file pos - marker category category-pos tags c neg re boolean + marker category org-category-pos tags c neg re boolean ee txt beg end words regexps+ regexps- hdl-only buffer beg1 str) (unless (and (not edit-at) (stringp string) @@ -3948,7 +3948,7 @@ in `org-agenda-text-search-extra-files'." (goto-char beg) (setq marker (org-agenda-new-marker (point)) category (org-get-category) - category-pos (get-text-property (point) 'org-category-position) + org-category-pos (get-text-property (point) 'org-category-position) tags (org-get-tags-at (point)) txt (org-format-agenda-item "" @@ -3960,7 +3960,7 @@ in `org-agenda-text-search-extra-files'." 'org-todo-regexp org-todo-regexp 'org-complex-heading-regexp org-complex-heading-regexp 'priority 1000 'org-category category - 'org-category-position category-pos + 'org-category-position org-category-pos 'type "search") (push txt ee) (goto-char (1- end)))))))))) @@ -4604,7 +4604,7 @@ the documentation of `org-diary'." "\\)\\>")) org-not-done-regexp) "[^\n\r]*\\)")) - marker priority category category-pos tags todo-state ee txt beg end) + marker priority category org-category-pos tags todo-state ee txt beg end) (goto-char (point-min)) (while (re-search-forward regexp nil t) (catch :skip @@ -4619,7 +4619,7 @@ the documentation of `org-diary'." (goto-char (match-beginning 1)) (setq marker (org-agenda-new-marker (match-beginning 0)) category (org-get-category) - category-pos (get-text-property (point) 'org-category-position) + org-category-pos (get-text-property (point) 'org-category-position) txt (match-string 1) tags (org-get-tags-at (point)) txt (org-format-agenda-item "" txt category tags) @@ -4628,7 +4628,7 @@ the documentation of `org-diary'." (org-add-props txt props 'org-marker marker 'org-hd-marker marker 'priority priority 'org-category category - 'org-category-position category-pos + 'org-category-position org-category-pos 'type "todo" 'todo-state todo-state) (push txt ee) (if org-agenda-todo-list-sublevels @@ -4743,7 +4743,7 @@ This function is invoked if `org-agenda-todo-ignore-deadlines', "\\|\\(<[0-9]+-[0-9]+-[0-9]+[^>\n]+?\\+[0-9]+[dwmy]>\\)" "\\|\\(<%%\\(([^>\n]+)\\)>\\)")) marker hdmarker deadlinep scheduledp clockp closedp inactivep - donep tmp priority category category-pos ee txt timestr tags + donep tmp priority category org-category-pos ee txt timestr tags b0 b3 e3 head todo-state end-of-match show-all) (goto-char (point-min)) (while (setq end-of-match (re-search-forward regexp nil t)) @@ -4785,7 +4785,7 @@ This function is invoked if `org-agenda-todo-ignore-deadlines', (setq timestr (substring timestr 0 (match-end 0)))) (setq marker (org-agenda-new-marker b0) category (org-get-category b0) - category-pos (get-text-property b0 'org-category-position)) + org-category-pos (get-text-property b0 'org-category-position)) (save-excursion (if (not (re-search-backward org-outline-regexp-bol nil t)) (setq txt org-agenda-no-heading-message) @@ -4803,7 +4803,7 @@ This function is invoked if `org-agenda-todo-ignore-deadlines', 'org-marker marker 'org-hd-marker hdmarker) (org-add-props txt nil 'priority priority 'org-category category 'date date - 'org-category-position category-pos + 'org-category-position org-category-pos 'todo-state todo-state 'type "timestamp") (push txt ee)) @@ -4820,7 +4820,7 @@ This function is invoked if `org-agenda-todo-ignore-deadlines', (format "mouse-2 or RET jump to org file %s" (abbreviate-file-name buffer-file-name)))) (regexp "^&?%%(") - marker category category-pos ee txt tags entry + marker category org-category-pos ee txt tags entry result beg b sexp sexp-entry todo-state) (goto-char (point-min)) (while (re-search-forward regexp nil t) @@ -4838,7 +4838,7 @@ This function is invoked if `org-agenda-todo-ignore-deadlines', (when result (setq marker (org-agenda-new-marker beg) category (org-get-category beg) - category-pos (get-text-property beg 'org-category-position) + org-category-pos (get-text-property beg 'org-category-position) todo-state (org-get-todo-state)) (dolist (r (if (stringp result) @@ -4853,7 +4853,7 @@ This function is invoked if `org-agenda-todo-ignore-deadlines', (org-add-props txt props 'org-marker marker) (org-add-props txt nil 'org-category category 'date date 'todo-state todo-state - 'org-category-position category-pos + 'org-category-position org-category-pos 'type "sexp") (push txt ee))))) (nreverse ee))) @@ -4957,7 +4957,7 @@ please use `org-class' instead." (list 0 0 0 (nth 1 date) (car date) (nth 2 date)))) 1 11)))) (org-agenda-search-headline-for-time nil) - marker hdmarker priority category category-pos tags closedp + marker hdmarker priority category org-category-pos tags closedp statep clockp state ee txt extra timestr rest clocked) (goto-char (point-min)) (while (re-search-forward regexp nil t) @@ -4969,7 +4969,7 @@ please use `org-class' instead." clockp (not (or closedp statep)) state (and statep (match-string 2)) category (org-get-category (match-beginning 0)) - category-pos (get-text-property (match-beginning 0) 'org-category-position) + org-category-pos (get-text-property (match-beginning 0) 'org-category-position) timestr (buffer-substring (match-beginning 0) (point-at-eol))) (when (string-match "\\]" timestr) ;; substring should only run to end of time stamp @@ -5014,7 +5014,7 @@ please use `org-class' instead." (org-add-props txt props 'org-marker marker 'org-hd-marker hdmarker 'face 'org-agenda-done 'priority priority 'org-category category - 'org-category-position category-pos + 'org-category-position org-category-pos 'type "closed" 'date date 'undone-face 'org-warning 'done-face 'org-agenda-done) (push txt ee)) @@ -5152,7 +5152,7 @@ See also the user option `org-agenda-clock-consistency-checks'." (regexp org-deadline-time-regexp) (todayp (org-agenda-todayp date)) ; DATE bound by calendar (d1 (calendar-absolute-from-gregorian date)) ; DATE bound by calendar - d2 diff dfrac wdays pos pos1 category category-pos + d2 diff dfrac wdays pos pos1 category org-category-pos tags suppress-prewarning ee txt head face s todo-state show-all upcomingp donep timestr) (goto-char (point-min)) @@ -5200,7 +5200,7 @@ See also the user option `org-agenda-clock-consistency-checks'." (not (= diff 0)))) (setq txt nil) (setq category (org-get-category) - category-pos (get-text-property (point) 'org-category-position)) + org-category-pos (get-text-property (point) 'org-category-position)) (if (not (re-search-backward "^\\*+[ \t]+" nil t)) (setq txt org-agenda-no-heading-message) (goto-char (match-end 0)) @@ -5234,7 +5234,7 @@ See also the user option `org-agenda-clock-consistency-checks'." 'priority (+ (- diff) (org-get-priority txt)) 'org-category category - 'org-category-position category-pos + 'org-category-position org-category-pos 'todo-state todo-state 'type (if upcomingp "upcoming-deadline" "deadline") 'date (if upcomingp date d2) @@ -5270,7 +5270,7 @@ FRACTION is what fraction of the head-warning time has passed." 0 'org-hd-marker a)) (cons (marker-position mm) a))) deadline-results)) - d2 diff pos pos1 category category-pos tags donep + d2 diff pos pos1 category org-category-pos tags donep ee txt head pastschedp todo-state face timestr s habitp show-all) (goto-char (point-min)) (while (re-search-forward regexp nil t) @@ -5305,7 +5305,7 @@ FRACTION is what fraction of the head-warning time has passed." (setq habitp (and (functionp 'org-is-habit-p) (org-is-habit-p))) (setq category (org-get-category) - category-pos (get-text-property (point) 'org-category-position)) + org-category-pos (get-text-property (point) 'org-category-position)) (if (not (re-search-backward "^\\*+[ \t]+" nil t)) (setq txt org-agenda-no-heading-message) (goto-char (match-end 0)) @@ -5356,7 +5356,7 @@ FRACTION is what fraction of the head-warning time has passed." (org-habit-get-priority habitp) (+ 94 (- 5 diff) (org-get-priority txt))) 'org-category category - 'org-category-position category-pos + 'org-category-position org-category-pos 'org-habit-p habitp 'todo-state todo-state) (push txt ee)))))) @@ -5397,7 +5397,7 @@ FRACTION is what fraction of the head-warning time has passed." (throw :skip t)) (setq marker (org-agenda-new-marker (point))) (setq category (org-get-category) - category-pos (get-text-property (point) 'org-category-position)) + org-category-pos (get-text-property (point) 'org-category-position)) (if (not (re-search-backward org-outline-regexp-bol nil t)) (setq txt org-agenda-no-heading-message) (goto-char (match-beginning 0)) @@ -5431,7 +5431,7 @@ FRACTION is what fraction of the head-warning time has passed." 'type "block" 'date date 'todo-state todo-state 'priority (org-get-priority txt) 'org-category category - 'org-category-position category-pos) + 'org-category-position org-category-pos) (push txt ee)))) (goto-char pos))) ;; Sort the entries by expiration date. -- 2.11.4.GIT