5 files changed, 33 insertions, 9 deletions

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 4c902de8e17..0a59f1f837e 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,19 @@
+2012-01-05  Bastien Guerry  <bzg@gnu.org>
+
+        * org-eshell.el (org-eshell-open): Use (goto-char (point-max))
+        instead of (end-of-buffer).
+
+        * org-bbdb.el (name): Declare variable.
+        (bbdb-record-get-field, bbdb-search-name)
+        (bbdb-search-organization): Declare as part of ext:bbdb.
+
+        * org-agenda.el: Add an alias for `org-agenda-filter'.
+        (diary-list-entries-hook): Use the non-obsolete hook.
+        (org-agenda-filter-apply): Silent compiler warnings.
+
+        * org-mobile.el (org-mobile-push): Use `org-agenda-tag-filter'
+        instead of the obsolete `org-agenda-filter'.
+
 2012-01-03  Bastien Guerry  <bzg@gnu.org>
 
         * org.el (org-ctrl-c-ctrl-c): Preserve symmetry when adding
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 70df5a15777..d444aff4f2b 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -247,7 +247,9 @@ you can \"misuse\" it to also add other text to the header.  However,
 
 ;; Keep custom values for `org-agenda-filter-preset' compatible with
 ;; the new variable `org-agenda-tag-filter-preset'.
-(defvaralias 'org-agenda-filter-preset 'org-agenda-tag-filter-preset)
+(if (fboundp 'defvaralias)
+    (defvaralias 'org-agenda-filter-preset 'org-agenda-tag-filter-preset)
+    (defvaralias 'org-agenda-filter 'org-agenda-tag-filter))
 
 (defconst org-agenda-custom-commands-local-options
   `(repeat :tag "Local settings for this command. Remember to quote values"
@@ -1768,7 +1770,7 @@ works you probably want to add it to `org-agenda-custom-commands' for good."
         (setcdr ass (cdr entry))
       (push entry org-agenda-custom-commands))))
 
-;;; Define the Org-agenda-mode
+;;; Define the org-agenda-mode
 
 (defvar org-agenda-mode-map (make-sparse-keymap)
   "Keymap for `org-agenda-mode'.")
@@ -4375,7 +4377,7 @@ of what a project is and how to check if it stuck, customize the variable
 ;;; Diary integration
 
 (defvar org-disable-agenda-to-diary nil)          ;Dynamically-scoped param.
-(defvar list-diary-entries-hook)
+(defvar diary-list-entries-hook)
 (defvar diary-time-regexp)
 (defun org-get-entries-from-diary (date)
   "Get the (Emacs Calendar) diary entries for DATE."
@@ -4384,8 +4386,8 @@ of what a project is and how to check if it stuck, customize the variable
          (diary-display-hook '(fancy-diary-display))
          (diary-display-function 'fancy-diary-display)
          (pop-up-frames nil)
-         (list-diary-entries-hook
-          (cons 'org-diary-default-entry list-diary-entries-hook))
+         (diary-list-entries-hook
+          (cons 'org-diary-default-entry diary-list-entries-hook))
          (diary-file-name-prefix-function nil) ; turn this feature off
          (diary-modify-entry-list-string-function 'org-modify-diary-entry-string)
          entries
@@ -6180,6 +6182,7 @@ When this is the global TODO list, a prefix argument will be interpreted."
     (recenter window-line)))
 
 (defvar org-global-tags-completion-table nil)
+(defvar org-agenda-filtered-by-category nil)
 (defvar org-agenda-filter-form nil)
 
 (defun org-agenda-filter-by-category (strip)
@@ -6359,10 +6362,9 @@ If the line does not have an effort defined, return nil."
       (funcall op (or eff (if org-sort-agenda-noeffort-is-high 32767 0))
                value))))
 
-(defvar org-agenda-filtered-by-category nil)
 (defun org-agenda-filter-apply (filter type)
   "Set FILTER as the new agenda filter and apply it."
-  (let (tags)
+  (let (tags cat)
     (if (eq type 'tag)
         (setq org-agenda-tag-filter filter)
       (setq org-agenda-category-filter filter
diff --git a/lisp/org/org-bbdb.el b/lisp/org/org-bbdb.el
index e587b6ac7c0..3df4c2044e9 100644
--- a/lisp/org/org-bbdb.el
+++ b/lisp/org/org-bbdb.el
@@ -112,11 +112,17 @@
           (&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 bbdb-record-get-field "ext:bbdb"
+                  (fn file &optional arglist fileonly))
+;; These two functions below are part of BBDB3:
+(declare-function bbdb-search-name "ext:bbdb" (regexp &optional layout))
+(declare-function bbdb-search-organization "ext:bbdb" (regexp &optional layout))
 
 (declare-function calendar-leap-year-p "calendar" (year))
 (declare-function diary-ordinal-suffix "diary-lib" (n))
 
 (defvar date)   ;; dynamically scoped from Org
+(defvar name)   ;; dynamically scoped from Org
 
 ;; Support for version 2.35
 (defvar org-bbdb-old (fboundp 'bbdb-record-get-field-internal))
diff --git a/lisp/org/org-eshell.el b/lisp/org/org-eshell.el
index c386af86b8f..16b19e26d08 100644
--- a/lisp/org/org-eshell.el
+++ b/lisp/org/org-eshell.el
@@ -46,7 +46,7 @@
      (if (get-buffer eshell-buffer-name)
        (org-pop-to-buffer-same-window eshell-buffer-name)
        (eshell))
-     (end-of-buffer)
+     (goto-char (point-max))
      (eshell-kill-input)
      (insert command)
      (eshell-send-input)))
diff --git a/lisp/org/org-mobile.el b/lisp/org/org-mobile.el
index b049f4ec5e0..bcc1c90932a 100644
--- a/lisp/org/org-mobile.el
+++ b/lisp/org/org-mobile.el
@@ -303,7 +303,7 @@ create all custom agenda views, for upload to the mobile phone."
   (interactive)
   (let ((a-buffer (get-buffer org-agenda-buffer-name)))
     (let ((org-agenda-buffer-name "*SUMO*")
-          (org-agenda-filter org-agenda-filter)
+          (org-agenda-tag-filter org-agenda-tag-filter)
           (org-agenda-redo-command org-agenda-redo-command))
       (save-excursion
         (save-window-excursion