diff options
| author | Bastien Guerry <bzg@altern.org> | 2012-04-02 16:45:47 +0200 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2012-04-02 16:45:47 +0200 |
| commit | 7ea4efd4112176cbd847c16d86a53b263fde50c0 (patch) | |
| tree | 10a74e1b3798d40267dc55e2a1f854ca627676e0 | |
| parent | 9d01ca1bf357917de0c496e86405e24c65b5761c (diff) | |
| download | org-mode-7ea4efd4112176cbd847c16d86a53b263fde50c0.tar.gz | |
Don't rename `entry' to `org-entry'.
This issue should be handled more carefully.
| -rw-r--r-- | lisp/org-agenda.el | 8 | ||||
| -rw-r--r-- | lisp/org.el | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index f706050..81377ca 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -91,7 +91,7 @@ (defvar org-agenda-buffer-name) (defvar org-agenda-overriding-header) (defvar org-agenda-title-append nil) -(defvar org-entry) +(defvar entry) (defvar date) (defvar org-agenda-undo-list) (defvar org-agenda-pending-undo-list) @@ -4530,8 +4530,8 @@ function from a program - use `org-agenda-get-day-entries' instead." (org-compile-prefix-format 'agenda) (org-set-sorting-strategy 'agenda) (setq args (or args '(:deadline :scheduled :timestamp :sexp))) - (let* ((files (if (and org-entry (stringp org-entry) (string-match "\\S-" org-entry)) - (list org-entry) + (let* ((files (if (and entry (stringp entry) (string-match "\\S-" entry)) + (list entry) (org-agenda-files t))) (time (org-float-time)) file rtn results) @@ -4936,7 +4936,7 @@ holiday will also be skipped." (not (member (car (calendar-iso-from-absolute d)) skip-weeks)))) (not (and (memq 'holidays skip-weeks) (calendar-check-holidays date))) - org-entry))) + entry))) (defun org-diary-class (m1 d1 y1 m2 d2 y2 dayname &rest skip-weeks) "Like `org-class', but honor `calendar-date-style'. diff --git a/lisp/org.el b/lisp/org.el index cc90b05..59b8e3f 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -4841,7 +4841,7 @@ This is for getting out of special buffers like remember.") ;; FIXME: Occasionally check by commenting these, to make sure ;; no other functions uses these, forgetting to let-bind them. -(defvar org-entry) +(defvar entry) (defvar org-last-state) (defvar date) @@ -10382,8 +10382,8 @@ on the system \"/user@host:\"." targets tgs txt re files f desc descre fast-path-p level pos0) (message "Getting targets...") (with-current-buffer (or default-buffer (current-buffer)) - (while (setq org-entry (pop entries)) - (setq files (car org-entry) desc (cdr org-entry)) + (while (setq entry (pop entries)) + (setq files (car entry) desc (cdr entry)) (setq fast-path-p nil) (cond ((null files) (setq files (list (current-buffer)))) |