From 15db65ad729ee566a331a854e701921690f8aedd Mon Sep 17 00:00:00 2001
From: Carsten Dominik <carsten.dominik@gmail.com>
Date: Tue, 29 Apr 2008 07:15:41 +0200
Subject: [PATCH] Arch-tag lines and declaration fixes from upstream Emacs.

---
 lisp/org-agenda.el         |  5 +++--
 lisp/org-archive.el        |  2 ++
 lisp/org-bbdb.el           |  2 ++
 lisp/org-bibtex.el         |  2 ++
 lisp/org-clock.el          |  4 ++--
 lisp/org-colview-xemacs.el |  2 +-
 lisp/org-colview.el        |  3 ++-
 lisp/org-compat.el         |  2 ++
 lisp/org-exp.el            | 15 ++++++++-------
 lisp/org-export-latex.el   |  1 +
 lisp/org-faces.el          |  2 ++
 lisp/org-gnus.el           |  2 ++
 lisp/org-info.el           |  2 ++
 lisp/org-infojs.el         |  2 ++
 lisp/org-irc.el            |  1 +
 lisp/org-mac-message.el    |  1 +
 lisp/org-macs.el           |  2 ++
 lisp/org-mew.el            |  2 ++
 lisp/org-mhe.el            |  2 ++
 lisp/org-mouse.el          |  2 ++
 lisp/org-publish.el        |  1 +
 lisp/org-remember.el       |  3 ++-
 lisp/org-rmail.el          |  2 ++
 lisp/org-table.el          |  2 ++
 lisp/org-vm.el             |  2 ++
 lisp/org-wl.el             |  2 ++
 lisp/org.el                |  5 +++--
 27 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index f97b41a3a..8f7f97968 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -49,7 +49,7 @@
 (declare-function calendar-hebrew-date-string   "cal-hebrew" (&optional date))
 (declare-function calendar-islamic-date-string  "cal-islam"  (&optional date))
 (declare-function calendar-iso-date-string      "cal-iso"    (&optional date))
-(declare-function calendar-iso-from-absolute    "cal-iso"    (&optional date))
+(declare-function calendar-iso-from-absolute    "cal-iso"    (date))
 (declare-function calendar-julian-date-string   "cal-julian" (&optional date))
 (declare-function calendar-mayan-date-string    "cal-mayan"  (&optional date))
 (declare-function calendar-persian-date-string  "cal-persia" (&optional date))
@@ -5141,5 +5141,6 @@ belonging to the \"Work\" category."
 
 (provide 'org-agenda)
 
-;;; org-agenda.el ends here
+;; arch-tag: 77f7565d-7c4b-44af-a2df-9f6f7070cff1
 
+;;; org-agenda.el ends here
diff --git a/lisp/org-archive.el b/lisp/org-archive.el
index 95697ae6c..b815ed272 100644
--- a/lisp/org-archive.el
+++ b/lisp/org-archive.el
@@ -405,4 +405,6 @@ the children that do not contain any open TODO items."
 
 (provide 'org-archive)
 
+;; arch-tag: 0837f601-9699-43c3-8b90-631572ae6c85
+
 ;;; org-archive.el ends here
diff --git a/lisp/org-bbdb.el b/lisp/org-bbdb.el
index 9d6825f8f..1083cc438 100644
--- a/lisp/org-bbdb.el
+++ b/lisp/org-bbdb.el
@@ -277,4 +277,6 @@ Argument STR is the anniversary field in BBDB."
 
 (provide 'org-bbdb)
 
+;; arch-tag: 9e4f275d-d080-48c1-b040-62247f66b5c2
+
 ;;; org-bbdb.el ends here
diff --git a/lisp/org-bibtex.el b/lisp/org-bibtex.el
index f8bda495c..9a00a8181 100644
--- a/lisp/org-bibtex.el
+++ b/lisp/org-bibtex.el
@@ -201,4 +201,6 @@
 
 (provide 'org-bibtex)
 
+;; arch-tag: 83987d5a-01b8-41c7-85bc-77700f1285f5
+
 ;;; org-bibtex.el ends here
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 3bc555936..6060ffcbd 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -922,6 +922,6 @@ the currently selected interval size."
 
 (provide 'org-clock)
 
-;;; org-clock.el ends here
-
+;; arch-tag: 7b42c5d4-9b36-48be-97c0-66a869daed4c
 
+;;; org-clock.el ends here
diff --git a/lisp/org-colview-xemacs.el b/lisp/org-colview-xemacs.el
index 5357ef160..c81323034 100644
--- a/lisp/org-colview-xemacs.el
+++ b/lisp/org-colview-xemacs.el
@@ -1441,5 +1441,5 @@ This will add overlays to the date lines, to show the summary for each day."
 (provide 'org-colview)
 (provide 'org-colview-xemacs)
 
-;;; org-colview.el ends here
+;;; org-colview-xemacs.el ends here
 
diff --git a/lisp/org-colview.el b/lisp/org-colview.el
index 21cbfe330..83d0d18eb 100644
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@@ -1214,5 +1214,6 @@ This will add overlays to the date lines, to show the summary for each day."
 
 (provide 'org-colview)
 
-;;; org-colview.el ends here
+;; arch-tag: 61f5128d-747c-4983-9479-e3871fa3d73c
 
+;;; org-colview.el ends here
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 8c3729313..6e1e20ab0 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -251,4 +251,6 @@ that can be added."
 
 (provide 'org-compat)
 
+;; arch-tag: a0a0579f-e68c-4bdf-9e55-93768b846bbe
+
 ;;; org-compat.el ends here
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index f1a108ac5..a52606b91 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -764,6 +764,12 @@ modified) list.")
 		val)))
     dir))
 
+(defun org-export-process-option-filters (plist)
+  (let ((functions org-export-options-filters) f)
+    (while (setq f (pop functions))
+      (setq plist (funcall f plist))))
+  plist)
+
 ;;;###autoload
 (defun org-export (&optional arg)
   "Export dispatcher for Org-mode.
@@ -3765,11 +3771,6 @@ The XOXO buffer is named *xoxo-<source buffer name>*"
 
 (provide 'org-exp)
 
-;;; org-exp.el ends here
-
+;; arch-tag: 65985fe9-095c-49c7-a7b6-cb4ee15c0a95
 
-(defun org-export-process-option-filters (plist)
-  (let ((functions org-export-options-filters) f)
-    (while (setq f (pop functions))
-      (setq plist (funcall f plist))))
-  plist)
\ No newline at end of file
+;;; org-exp.el ends here
diff --git a/lisp/org-export-latex.el b/lisp/org-export-latex.el
index 4c99c5f9f..9b30dcdcb 100644
--- a/lisp/org-export-latex.el
+++ b/lisp/org-export-latex.el
@@ -1540,4 +1540,5 @@ Valid parameters are
 (provide 'org-export-latex)
 
 ;; arch-tag: 23c2b87d-da04-4c2d-ad2d-1eb6487bc3ad
+
 ;;; org-export-latex.el ends here
diff --git a/lisp/org-faces.el b/lisp/org-faces.el
index a9f8f3f21..c1b16e5d0 100644
--- a/lisp/org-faces.el
+++ b/lisp/org-faces.el
@@ -458,4 +458,6 @@ If it is less than 8, the level-1 face gets re-used for level N+1 etc."
 
 (provide 'org-faces)
 
+;; arch-tag: 9dab5f91-c4b9-4d6f-bac3-1f6211ad0a04
+
 ;;; org-faces.el ends here
diff --git a/lisp/org-gnus.el b/lisp/org-gnus.el
index 4771f9ffc..81c7bfe70 100644
--- a/lisp/org-gnus.el
+++ b/lisp/org-gnus.el
@@ -126,4 +126,6 @@ negates this setting for the duration of the command."
 
 (provide 'org-gnus)
 
+;; arch-tag: 512e0840-58fa-45b3-b456-71e10fa2376d
+
 ;;; org-gnus.el ends here
diff --git a/lisp/org-info.el b/lisp/org-info.el
index b8f51a01d..291b89322 100644
--- a/lisp/org-info.el
+++ b/lisp/org-info.el
@@ -80,4 +80,6 @@
 
 (provide 'org-info)
 
+;; arch-tag: 1e289f54-7176-487f-b575-dd4854bab15e
+
 ;;; org-info.el ends here
diff --git a/lisp/org-infojs.el b/lisp/org-infojs.el
index 8542b14a9..487225702 100644
--- a/lisp/org-infojs.el
+++ b/lisp/org-infojs.el
@@ -203,4 +203,6 @@ Option settings will replace the %MANAGER-OPTIONS cookie."
 
 (provide 'org-infojs)
 
+;; arch-tag: c71d1d85-3337-4817-a066-725e74ac9eac
+
 ;;; org-infojs.el ends here
diff --git a/lisp/org-irc.el b/lisp/org-irc.el
index 356356ec2..f4277a046 100644
--- a/lisp/org-irc.el
+++ b/lisp/org-irc.el
@@ -254,4 +254,5 @@ default."
 (provide 'org-irc)
 
 ;; arch-tag: 018d7dda-53b8-4a35-ba92-6670939e525a
+
 ;;; org-irc.el ends here
diff --git a/lisp/org-mac-message.el b/lisp/org-mac-message.el
index b2db76491..9b67a04e3 100644
--- a/lisp/org-mac-message.el
+++ b/lisp/org-mac-message.el
@@ -81,4 +81,5 @@ end tell")))
 (provide 'org-mac-message)
 
 ;; arch-tag: 3806d0c1-abe1-4db6-9c31-f3ed7d4a9b32
+
 ;;; org-mac-message.el ends here
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index 91254dcd7..a7eab2261 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -221,4 +221,6 @@ This is in contrast to merely setting it to 0."
 
 (provide 'org-macs)
 
+;; arch-tag: 7e6a73ce-aac9-4fc0-9b30-ce6f89dc6668
+
 ;;; org-macs.el ends here
diff --git a/lisp/org-mew.el b/lisp/org-mew.el
index 53c2b523a..82454cde1 100644
--- a/lisp/org-mew.el
+++ b/lisp/org-mew.el
@@ -124,4 +124,6 @@
 
 (provide 'org-mew)
 
+;; arch-tag: 07ccdca7-6020-4941-a593-588a1e51b870
+
 ;;; org-mew.el ends here
diff --git a/lisp/org-mhe.el b/lisp/org-mhe.el
index 006cb3b1c..8189b5683 100644
--- a/lisp/org-mhe.el
+++ b/lisp/org-mhe.el
@@ -213,4 +213,6 @@ folders."
 
 (provide 'org-mhe)
 
+;; arch-tag: dcb05484-8627-491d-a8c1-01dbd2bde4ae
+
 ;;; org-mhe.el ends here
diff --git a/lisp/org-mouse.el b/lisp/org-mouse.el
index 206d5953b..510ae196a 100644
--- a/lisp/org-mouse.el
+++ b/lisp/org-mouse.el
@@ -1115,3 +1115,5 @@ SCHEDULED: or DEADLINE: or ANYTHINGLIKETHIS:"
 (provide 'org-mouse)
 
 ;; arch-tag: ff1ae557-3529-41a3-95c6-baaebdcc280f
+
+;;; org-mouse.el ends-here
diff --git a/lisp/org-publish.el b/lisp/org-publish.el
index 7f125e209..767107e29 100644
--- a/lisp/org-publish.el
+++ b/lisp/org-publish.el
@@ -666,4 +666,5 @@ the project."
 
 
 ;; arch-tag: 72807f3c-8af0-4a6b-8dca-c3376eb25adb
+
 ;;; org-publish.el ends here
diff --git a/lisp/org-remember.el b/lisp/org-remember.el
index 44461bcf0..419641d36 100644
--- a/lisp/org-remember.el
+++ b/lisp/org-remember.el
@@ -777,5 +777,6 @@ See also the variable `org-reverse-note-order'."
 
 (provide 'org-remember)
 
-;;; org-remember.el ends here
+;; arch-tag: 497f30d0-4bc3-4097-8622-2d27ac5f2698
 
+;;; org-remember.el ends here
diff --git a/lisp/org-rmail.el b/lisp/org-rmail.el
index 9fe2cf496..ca8cfb898 100644
--- a/lisp/org-rmail.el
+++ b/lisp/org-rmail.el
@@ -106,4 +106,6 @@
 
 (provide 'org-rmail)
 
+;; arch-tag: c6cf4a8b-6639-4b7f-821f-bdf10746b173
+
 ;;; org-rmail.el ends here
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 3347ff88a..ef1d93244 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -3912,4 +3912,6 @@ this function is called."
 
 (provide 'org-table)
 
+;; arch-tag: 4d21cfdd-0268-440a-84b0-09237a0fe0ef
+
 ;;; org-table.el ends here
diff --git a/lisp/org-vm.el b/lisp/org-vm.el
index f33c84ab7..11f5ca730 100644
--- a/lisp/org-vm.el
+++ b/lisp/org-vm.el
@@ -127,4 +127,6 @@
 
 (provide 'org-vm)
 
+;; arch-tag: cbc3047b-935e-4d2a-96e7-c5b0117aaa6d
+
 ;;; org-vm.el ends here
diff --git a/lisp/org-wl.el b/lisp/org-wl.el
index 86db86f73..191107186 100644
--- a/lisp/org-wl.el
+++ b/lisp/org-wl.el
@@ -143,4 +143,6 @@
 
 (provide 'org-wl)
 
+;; arch-tag: 29b75a0f-ef2e-430b-8abc-acff75bde54a
+
 ;;; org-wl.el ends here
diff --git a/lisp/org.el b/lisp/org.el
index fe4849bdc..f3213e630 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -2176,11 +2176,11 @@ Normal means, no org-mode-specific context."
 (defvar mark-active)
 
 ;; Various packages
-(declare-function calendar-absolute-from-iso    "cal-iso"    (&optional date))
+(declare-function calendar-absolute-from-iso    "cal-iso"    (date))
 (declare-function calendar-forward-day          "cal-move"   (arg))
 (declare-function calendar-goto-date            "cal-move"   (date))
 (declare-function calendar-goto-today           "cal-move"   ())
-(declare-function calendar-iso-from-absolute    "cal-iso"    (&optional date))
+(declare-function calendar-iso-from-absolute    "cal-iso"    (date))
 (defvar calc-embedded-close-formula)
 (defvar calc-embedded-open-formula)
 (declare-function cdlatex-tab "ext:cdlatex" ())
@@ -13692,6 +13692,7 @@ Still experimental, may disappear in the future."
 (run-hooks 'org-load-hook)
 
 ;; arch-tag: e77da1a7-acc7-4336-b19e-efa25af3f9fd
+
 ;;; org.el ends here
 
 
-- 
2.11.4.GIT