diff options
authorBastien Guerry <>2012-10-02 08:03:15 (GMT)
committer Bastien Guerry <>2012-10-02 08:03:15 (GMT)
commit5c762bbdc62dea6444aa1ff09610be52fc1d26f1 (patch)
parent4663f961c9a7269193ac09f749090b9696854d5e (diff)
Remove some autoloads and clean up code.
* org.el (turn-on-orgtbl): Moved here from org-table.el. (org-clock-persistence-insinuate): Moved here from org-clock.el. (org-update-all-dblocks, org-map-entries) (org-require-autoloaded-modules, org-forward-element) (org-backward-element, org-up-element) (org-element-greater-elements, org-drag-element-backward) (org-drag-element-forward, org-mark-element) (org-narrow-to-element, org-transpose-element) (org-unindent-buffer): Don't autoload. * org-clock.el (org-clock-get-clocktable): Rename from `org-get-clocktable'. (org-clock-persistence-insinuate): Move to org.el. * org-capture.el: Do no set `generated-autoload-file' locally. Minor code clean up. * org-agenda.el (org-agenda-list): Use `org-clock-get-clocktable'. Do no set `generated-autoload-file' locally. * org-table.el (org-table-iterate-buffer-tables): Minor reformatting. (turn-on-orgtbl): Move to org.el. * org-html.el (org-export-htmlize-generate-css): Don't autoload. * org-timer.el (org-timer-pause-or-continue, org-timer-stop): Ditto. * ob-tangle.el (org-babel-tangle-lang-exts): Ditto. * ob-lob.el (org-babel-lob-ingest): Ditto. * org-id.el (org-id-copy) (org-id-get-with-outline-path-completion) (org-id-get-with-outline-drilling): Ditto. * org-lparse.el (org-lparse-and-open, org-lparse-batch) (org-lparse-to-buffer, org-replace-region-by) (org-lparse-region): Ditto. * org-mobile.el (org-mobile-create-sumo-agenda): Ditto.
12 files changed, 23 insertions, 61 deletions
diff --git a/lisp/ob-lob.el b/lisp/ob-lob.el
index 793b4e8..8b5f14d 100644
--- a/lisp/ob-lob.el
+++ b/lisp/ob-lob.el
@@ -45,7 +45,6 @@ To add files to this list use the `org-babel-lob-ingest' command."
(defvar org-babel-default-lob-header-args '((:exports . "results"))
"Default header arguments to use when exporting #+lob/call lines.")
(defun org-babel-lob-ingest (&optional file)
"Add all named source-blocks defined in FILE to
diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el
index a0a6c12..7e25b2c 100644
--- a/lisp/ob-tangle.el
+++ b/lisp/ob-tangle.el
@@ -38,7 +38,6 @@
(declare-function org-babel-update-block-body "org" (new-body))
(declare-function make-directory "files" (dir &optional parents))
(defcustom org-babel-tangle-lang-exts
'(("emacs-lisp" . "el"))
"Alist mapping languages to their file extensions.
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 8ff30f8..04ad07a 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -1872,13 +1872,6 @@ When nil, `q' will kill the single agenda buffer."
:type 'boolean)
-;;;### (autoloads (org-agenda-to-appt org-calendar-goto-agenda org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item
-;;;;;; org-diary org-agenda-list-stuck-projects org-tags-view org-todo-list
-;;;;;; org-search-view org-agenda-list org-batch-store-agenda-views
-;;;;;; org-store-agenda-views org-batch-agenda-csv org-batch-agenda
-;;;;;; org-agenda org-toggle-sticky-agenda) "org-agenda" "org-agenda.el"
-;;;;;; (20586 34302 212927 775000))
-;;; Generated autoloads from org-agenda.el
(defun org-toggle-sticky-agenda (&optional arg)
"Toggle `org-agenda-sticky'."
@@ -4109,7 +4102,7 @@ given in `org-agenda-start-on-weekday'."
filter ""))))
- (setq tbl (apply 'org-get-clocktable p))
+ (setq tbl (apply 'org-clock-get-clocktable p))
(insert tbl)))
(goto-char (point-min))
(or org-agenda-multi (org-agenda-fit-window-to-buffer))
@@ -5254,7 +5247,6 @@ This function is invoked if `org-agenda-todo-ignore-deadlines',
(>= days n)
(<= days n))))
(defun org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item
(&optional end)
"Do we have a reason to ignore this TODO entry because it has a time stamp?"
@@ -9488,8 +9480,4 @@ to override `appt-message-warning-time'.
(provide 'org-agenda)
-;; Local variables:
-;; generated-autoload-file: "org-loaddefs.el"
-;; End:
;;; org-agenda.el ends here
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index 1bc60e3..be973b0 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -434,9 +434,10 @@ Turning on this mode runs the normal hook `org-capture-mode-hook'."
;;; The main commands
(defvar org-capture-initial nil)
(defvar org-capture-entry nil)
(defun org-capture-string (string &optional keys)
(interactive "sInitial text: \n")
(let ((org-capture-initial string)
@@ -1280,7 +1281,7 @@ Point will remain at the first line after the inserted text."
(goto-char pos)))
(defvar org-clock-marker) ; Defined in org.el
(defun org-capture-insert-template-here ()
(let* ((template (org-capture-get :template))
(type (org-capture-get :type))
@@ -1680,8 +1681,4 @@ The template may still contain \"%?\" for cursor positioning."
(provide 'org-capture)
-;; Local variables:
-;; generated-autoload-file: "org-loaddefs.el"
-;; End:
;;; org-capture.el ends here
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index e8cb5c4..9ca59e7 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -1859,7 +1859,7 @@ and is only done if the variable `org-clock-out-when-done' is not nil."
-(defun org-get-clocktable (&rest props)
+(defun org-clock-get-clocktable (&rest props)
"Get a formatted clocktable with parameters according to PROPS.
The table is created in a temporary buffer, fully formatted and
fontified, and then returned."
@@ -2766,12 +2766,6 @@ The details of what will be saved are regulated by the variable
(if (outline-invisible-p)
-(defun org-clock-persistence-insinuate ()
- "Set up hooks for clock persistence."
- (add-hook 'org-mode-hook 'org-clock-load)
- (add-hook 'kill-emacs-hook 'org-clock-save))
;; Suggested bindings
(org-defkey org-mode-map "\C-c\C-x\C-e" 'org-clock-modify-effort-estimate)
diff --git a/lisp/org-html.el b/lisp/org-html.el
index c3d6229..a6ca2d2 100644
--- a/lisp/org-html.el
+++ b/lisp/org-html.el
@@ -210,6 +210,7 @@ not be modified. Use the variables `org-export-html-style' to add
your own style information."
:group 'org-export-html
:type 'boolean)
(put 'org-export-html-style-include-default 'safe-local-variable 'booleanp)
@@ -2380,7 +2381,6 @@ the settings define in the org-... variables."
(plist-get htmlize-buffer-places 'content-end)))
(kill-buffer htmlbuf))))
(defun org-export-htmlize-generate-css ()
"Create the CSS for all font definitions in the current Emacs session.
Use this to create face definitions in your CSS style file that can then
diff --git a/lisp/org-id.el b/lisp/org-id.el
index 15cdc6f..f870ccc 100644
--- a/lisp/org-id.el
+++ b/lisp/org-id.el
@@ -233,7 +233,6 @@ With optional argument FORCE, force the creation of a new ID."
(org-entry-put (point) "ID" nil))
(org-id-get (point) 'create))
(defun org-id-copy ()
"Copy the ID of the entry at point to the kill ring.
Create an ID if necessary."
@@ -259,7 +258,6 @@ In any case, the ID of the entry is returned."
(org-id-add-location id (buffer-file-name (buffer-base-buffer)))
(defun org-id-get-with-outline-path-completion (&optional targets)
"Use outline-path-completion to retrieve the ID of an entry.
TARGETS may be a setting for `org-refile-targets' to define the eligible
@@ -276,7 +274,6 @@ It returns the ID of the entry. If necessary, the ID is created."
(prog1 (org-id-get pom 'create)
(move-marker pom nil))))
(defun org-id-get-with-outline-drilling (&optional targets)
"Use an outline-cycling interface to retrieve the ID of an entry.
This only finds entries in the current buffer, using `org-get-location'.
diff --git a/lisp/org-lparse.el b/lisp/org-lparse.el
index f18e9f2..1413dd1 100644
--- a/lisp/org-lparse.el
+++ b/lisp/org-lparse.el
@@ -50,7 +50,6 @@
(require 'org-list)
(require 'format-spec)
(defun org-lparse-and-open (target-backend native-backend arg
&optional file-or-buf)
"Export outline to TARGET-BACKEND via NATIVE-BACKEND and open exported file.
@@ -71,7 +70,6 @@ lists."
(when org-export-kill-product-buffer-when-displayed
(kill-buffer (current-buffer))))))
(defun org-lparse-batch (target-backend &optional native-backend)
"Call the function `org-lparse'.
This function can be used in batch processing as:
@@ -83,7 +81,6 @@ emacs --batch
(org-lparse target-backend native-backend
org-export-headline-levels 'hidden))
(defun org-lparse-to-buffer (backend arg)
"Call `org-lparse' with output to a temporary buffer.
No file is created. The prefix ARG is passed through to
@@ -93,7 +90,6 @@ No file is created. The prefix ARG is passed through to
(when org-export-show-temporary-export-buffer
(switch-to-buffer-other-window tempbuf))))
(defun org-replace-region-by (backend beg end)
"Assume the current region has org-mode syntax, and convert it to HTML.
This can be used in any buffer. For example, you could write an
@@ -115,7 +111,6 @@ this command to convert it."
(delete-region beg end)
(insert backend-string)))
(defun org-lparse-region (backend beg end &optional body-only buffer)
"Convert region from BEG to END in org-mode buffer to HTML.
If prefix arg BODY-ONLY is set, omit file header, footer, and table of
diff --git a/lisp/org-mobile.el b/lisp/org-mobile.el
index 3c70f42..ffdd665 100644
--- a/lisp/org-mobile.el
+++ b/lisp/org-mobile.el
@@ -680,7 +680,6 @@ The table of checksums is written to the file mobile-checksums."
(let ((table '(?: ?/)))
(org-link-escape s table)))
(defun org-mobile-create-sumo-agenda ()
"Create a file that contains all custom agenda views."
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 0667641..abbd1f9 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -2997,10 +2997,9 @@ with the prefix ARG."
"Iterate all tables in the buffer, to converge inter-table dependencies."
(let* ((imax 10)
+ (i imax)
(checksum (md5 (buffer-string)))
- c1
- (i imax))
+ c1)
@@ -3852,11 +3851,6 @@ Use COMMAND to do the motion, repeat if necessary to end up in a data line."
(defvar orgtbl-mode-map (make-keymap)
"Keymap for `orgtbl-mode'.")
-(defun turn-on-orgtbl ()
- "Unconditionally turn on `orgtbl-mode'."
- (orgtbl-mode 1))
(defvar org-old-auto-fill-inhibit-regexp nil
"Local variable used by `orgtbl-mode'.")
diff --git a/lisp/org-timer.el b/lisp/org-timer.el
index 37c6d59..a314564 100644
--- a/lisp/org-timer.el
+++ b/lisp/org-timer.el
@@ -130,7 +130,6 @@ the region 0:00:00."
(org-timer-secs-to-hms (or delta 0)))
(run-hooks 'org-timer-start-hook))))
(defun org-timer-pause-or-continue (&optional stop)
"Pause or continue the relative timer.
With prefix arg STOP, stop it entirely."
@@ -157,7 +156,6 @@ With prefix arg STOP, stop it entirely."
(org-timer-set-mode-line 'pause)
(message "Timer paused at %s" (org-timer-value-string)))))
(defun org-timer-stop ()
"Stop the relative timer."
diff --git a/lisp/org.el b/lisp/org.el
index 6ff9fa8..371b655 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -121,6 +121,7 @@ Stars are put in group 1 and the trimmed body in group 2.")
;; load languages based on value of `org-babel-load-languages'
(defvar org-babel-load-languages)
(defun org-babel-do-load-languages (sym value)
"Load the languages defined in `org-babel-load-languages'."
@@ -208,6 +209,7 @@ identifier."
;;; Version
(require 'org-compat)
(defun org-version (&optional here full message)
"Show the org-mode version in the echo area.
@@ -3887,6 +3889,12 @@ This works for both table types.")
orgtbl-to-generic orgtbl-to-tsv orgtbl-to-csv orgtbl-to-latex
orgtbl-to-orgtbl orgtbl-to-html orgtbl-to-texinfo)))
+(defun turn-on-orgtbl ()
+ "Unconditionally turn on `orgtbl-mode'."
+ (require 'org-table)
+ (orgtbl-mode 1))
(defun org-at-table-p (&optional table-type)
"Return t if the cursor is inside an org-type table.
If TABLE-TYPE is non-nil, also check for table.el-type tables."
@@ -4101,6 +4109,13 @@ If yes, offer to stop it and to save the buffer with the changes."
(when (org-match-line "^[ \t]*#\\+BEGIN:[ \t]+clocktable\\>")
(org-clocktable-shift dir n)))
+(defun org-clock-persistence-insinuate ()
+ "Set up hooks for clock persistence."
+ (require 'org-clock)
+ (add-hook 'org-mode-hook 'org-clock-load)
+ (add-hook 'kill-emacs-hook 'org-clock-save))
;; Autoload org-timer.el
@@ -11313,7 +11328,6 @@ Error if there is no such block at point."
(goto-char pos)
(error "Not in a dynamic block"))))
(defun org-update-all-dblocks ()
"Update all dynamic blocks in the buffer.
This function can be used in a hook."
@@ -14133,7 +14147,6 @@ Returns the new tags string, or nil to not change the current settings."
;;;; The mapping API
(defun org-map-entries (func &optional match scope &rest skip)
"Call FUNC at each headline selected by MATCH in SCOPE.
@@ -19960,7 +19973,6 @@ Your bug report will be posted to the Org-mode mailing list.
;;;; Documentation
(defun org-require-autoloaded-modules ()
(mapc 'require
@@ -21927,7 +21939,6 @@ Stop at the first and last subheadings of a superior heading."
(if (< l level) (setq arg 1)))
(setq arg (1- arg)))))
(defun org-forward-element ()
"Move forward by one element.
Move to the next element at the same level, when possible."
@@ -21947,7 +21958,6 @@ Move to the next element at the same level, when possible."
(goto-char (org-element-property :end parent))
(goto-char end))))))
(defun org-backward-element ()
"Move backward by one element.
Move to the previous element at the same level, when possible."
@@ -21974,7 +21984,6 @@ Move to the previous element at the same level, when possible."
((org-before-first-heading-p) (goto-char (point-min)))
(t (org-back-to-heading)))))))
(defun org-up-element ()
"Move to upper element."
@@ -21987,7 +21996,6 @@ Move to the previous element at the same level, when possible."
(error "No surrounding element")
(org-with-limited-levels (org-back-to-heading)))))))
(defvar org-element-greater-elements)
(defun org-down-element ()
"Move to inner element."
@@ -22004,7 +22012,6 @@ Move to the previous element at the same level, when possible."
(error "No content for this element"))))
(t (error "No inner element")))))
(defun org-drag-element-backward ()
"Move backward element at point."
@@ -22021,7 +22028,6 @@ Move to the previous element at the same level, when possible."
(goto-char (+ (org-element-property :begin prev-elem)
(- pos (org-element-property :begin elem)))))))))
(defun org-drag-element-forward ()
"Move forward element at point."
@@ -22056,7 +22062,6 @@ Move to the previous element at the same level, when possible."
(org-element-swap-A-B elem next-elem)
(goto-char (+ pos size-next size-blank))))))
(defun org-mark-element ()
"Put point at beginning of this element, mark at end.
@@ -22077,7 +22082,6 @@ ones already marked."
(push-mark (org-element-property :end element) t t)
(goto-char (org-element-property :begin element))))))
(defun org-narrow-to-element ()
"Narrow buffer to current element."
@@ -22096,7 +22100,6 @@ ones already marked."
(org-element-property :begin elem)
(org-element-property :end elem))))))
(defun org-transpose-element ()
"Transpose current and previous elements, keeping blank lines between.
Point is moved after both elements."
@@ -22106,7 +22109,6 @@ Point is moved after both elements."
(goto-char end)))
(defun org-unindent-buffer ()
"Un-indent the visible part of the buffer.
Relative indentation (between items, inside blocks, etc.) isn't