diff options
author | Kyle Meyer <kyle@kyleam.com> | 2016-05-15 19:00:30 -0400 |
---|---|---|
committer | Kyle Meyer <kyle@kyleam.com> | 2016-05-15 19:00:30 -0400 |
commit | 4925d5be7be9b82ff54e07b82a6d20bb27c15c6f (patch) | |
tree | 4728fcc87482e2db8afae430f6ef2374f7493ee7 | |
parent | e4eebe97ecc737f4e94f81cca53222a4eb416772 (diff) | |
parent | 19cf68da90d0afd74a4c38106eae5c135e146364 (diff) | |
download | org-mode-4925d5be7be9b82ff54e07b82a6d20bb27c15c6f.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/ob-R.el | 2 | ||||
-rw-r--r-- | lisp/ob-comint.el | 2 | ||||
-rw-r--r-- | lisp/ob-core.el | 4 | ||||
-rw-r--r-- | lisp/ob-exp.el | 2 | ||||
-rw-r--r-- | lisp/ob-gnuplot.el | 2 | ||||
-rw-r--r-- | lisp/ob-haskell.el | 3 | ||||
-rw-r--r-- | lisp/ob-latex.el | 5 | ||||
-rw-r--r-- | lisp/ob-python.el | 2 | ||||
-rw-r--r-- | lisp/ob-scheme.el | 9 | ||||
-rw-r--r-- | lisp/ob-shell.el | 6 | ||||
-rw-r--r-- | lisp/ob-tangle.el | 8 | ||||
-rw-r--r-- | lisp/org-bibtex.el | 2 | ||||
-rw-r--r-- | lisp/org-clock.el | 2 | ||||
-rw-r--r-- | lisp/org-colview.el | 2 | ||||
-rw-r--r-- | lisp/org-compat.el | 8 | ||||
-rw-r--r-- | lisp/org-feed.el | 3 | ||||
-rw-r--r-- | lisp/org-gnus.el | 9 | ||||
-rw-r--r-- | lisp/org-info.el | 4 | ||||
-rw-r--r-- | lisp/org-macro.el | 1 | ||||
-rw-r--r-- | lisp/org-macs.el | 3 | ||||
-rw-r--r-- | lisp/org-pcomplete.el | 4 | ||||
-rw-r--r-- | lisp/org-protocol.el | 2 | ||||
-rw-r--r-- | lisp/org-table.el | 20 | ||||
-rw-r--r-- | lisp/org.el | 17 | ||||
-rw-r--r-- | lisp/ox-org.el | 2 |
25 files changed, 68 insertions, 56 deletions
diff --git a/lisp/ob-R.el b/lisp/ob-R.el index 1850e8e..bffa1a4 100644 --- a/lisp/ob-R.el +++ b/lisp/ob-R.el @@ -36,7 +36,7 @@ (declare-function ess-make-buffer-current "ext:ess-inf" ()) (declare-function ess-eval-buffer "ext:ess-inf" (vis)) (declare-function ess-wait-for-process "ext:ess-inf" - (proc &optional sec-prompt wait force-redisplay)) + (&optional proc sec-prompt wait force-redisplay)) (declare-function org-number-sequence "org-compat" (from &optional to inc)) (defconst org-babel-header-args:R diff --git a/lisp/ob-comint.el b/lisp/ob-comint.el index 34fcbae..54befbc 100644 --- a/lisp/ob-comint.el +++ b/lisp/ob-comint.el @@ -36,7 +36,7 @@ (eval-when-compile (require 'cl)) (require 'tramp) -(declare-function tramp-flush-directory-property "tramp-cache" (vec directory)) +(declare-function tramp-flush-directory-property "tramp-cache" (key directory)) (declare-function tramp-dissect-file-name "tramp" (name &optional nodefault)) (declare-function tramp-file-name-method "tramp" (vec)) (declare-function tramp-file-name-user "tramp" (vec)) diff --git a/lisp/ob-core.el b/lisp/ob-core.el index 71c7aea..3acace7 100644 --- a/lisp/ob-core.el +++ b/lisp/ob-core.el @@ -49,13 +49,13 @@ (declare-function tramp-dissect-file-name "tramp" (name &optional nodefault)) (declare-function tramp-file-name-user "tramp" (vec)) (declare-function tramp-file-name-host "tramp" (vec)) -(declare-function with-parsed-tramp-file-name "tramp" (filename var &rest body)) +(declare-function with-parsed-tramp-file-name "tramp" (filename var &rest body) + t) (declare-function org-edit-src-code "org-src" (&optional code edit-buffer-name)) (declare-function org-edit-src-exit "org-src" ()) (declare-function org-get-indentation "org" (&optional line)) (declare-function org-in-regexp "org" (regexp &optional nlines visually)) (declare-function org-open-at-point "org" (&optional in-emacs reference-buffer)) -(declare-function org-save-outline-visibility "org-macs" (use-markers &rest body)) (declare-function org-outline-overlay-data "org" (&optional use-markers)) (declare-function org-set-outline-overlay-data "org" (data)) (declare-function org-narrow-to-subtree "org" ()) diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el index 40dd5aa..7ce1456 100644 --- a/lisp/ob-exp.el +++ b/lisp/ob-exp.el @@ -43,7 +43,7 @@ (declare-function org-fill-template "org" (template alist)) (declare-function org-split-string "org" (string &optional separators)) (declare-function org-element-at-point "org-element" ()) -(declare-function org-element-context "org-element" ()) +(declare-function org-element-context "org-element" (&optional element)) (declare-function org-element-property "org-element" (property element)) (declare-function org-element-type "org-element" (element)) (declare-function org-id-get "org-id" (&optional pom create prefix)) diff --git a/lisp/ob-gnuplot.el b/lisp/ob-gnuplot.el index 870f381..a1546ad 100644 --- a/lisp/ob-gnuplot.el +++ b/lisp/ob-gnuplot.el @@ -41,7 +41,7 @@ (require 'ob) (eval-when-compile (require 'cl)) -(declare-function org-time-string-to-time "org" (s)) +(declare-function org-time-string-to-time "org" (s &optional buffer pos)) (declare-function org-combine-plists "org" (&rest plists)) (declare-function orgtbl-to-generic "org-table" (table params)) (declare-function gnuplot-mode "ext:gnuplot-mode" ()) diff --git a/lisp/ob-haskell.el b/lisp/ob-haskell.el index bd6b808..4cdaa9c 100644 --- a/lisp/ob-haskell.el +++ b/lisp/ob-haskell.el @@ -143,7 +143,8 @@ specifying a variable of the same value." (defvar org-export-copy-to-kill-ring) (declare-function org-export-to-file "ox" (backend file - &optional async subtreep visible-only body-only ext-plist)) + &optional async subtreep visible-only body-only + ext-plist post-process)) (defun org-babel-haskell-export-to-lhs (&optional arg) "Export to a .lhs file with all haskell code blocks escaped. When called with a prefix argument the resulting diff --git a/lisp/ob-latex.el b/lisp/ob-latex.el index a8fbe29..c76b462 100644 --- a/lisp/ob-latex.el +++ b/lisp/ob-latex.el @@ -32,11 +32,12 @@ ;;; Code: (require 'ob) -(declare-function org-create-formula-image "org" (string tofile options buffer)) +(declare-function org-create-formula-image "org" + (string tofile options buffer &optional type)) (declare-function org-splice-latex-header "org" (tpl def-pkg pkg snippets-p &optional extra)) (declare-function org-latex-guess-inputenc "ox-latex" (header)) -(declare-function org-latex-compile "ox-latex" (file)) +(declare-function org-latex-compile "ox-latex" (texfile &optional snippet)) (defvar org-babel-tangle-lang-exts) (add-to-list 'org-babel-tangle-lang-exts '("latex" . "tex")) diff --git a/lisp/ob-python.el b/lisp/ob-python.el index ebbd980..0ec9ac9 100644 --- a/lisp/ob-python.el +++ b/lisp/ob-python.el @@ -33,7 +33,7 @@ (declare-function org-remove-indentation "org" ) (declare-function py-shell "ext:python-mode" (&optional argprompt)) (declare-function py-toggle-shells "ext:python-mode" (arg)) -(declare-function run-python "ext:python" (cmd &optional dedicated show)) +(declare-function run-python "ext:python" (&optional cmd dedicated show)) (defvar org-babel-tangle-lang-exts) (add-to-list 'org-babel-tangle-lang-exts '("python" . "py")) diff --git a/lisp/ob-scheme.el b/lisp/ob-scheme.el index ff94502..2a1a9bf 100644 --- a/lisp/ob-scheme.el +++ b/lisp/ob-scheme.el @@ -45,10 +45,11 @@ (defvar geiser-default-implementation) ; Defined in geiser-impl.el (defvar geiser-active-implementations) ; Defined in geiser-impl.el -(declare-function run-geiser "geiser-repl" (impl)) -(declare-function geiser-mode "geiser-mode" ()) -(declare-function geiser-eval-region "geiser-mode" (start end &optional and-go raw nomsg)) -(declare-function geiser-repl-exit "geiser-repl" (&optional arg)) +(declare-function run-geiser "ext:geiser-repl" (impl)) +(declare-function geiser-mode "ext:geiser-mode" ()) +(declare-function geiser-eval-region "ext:geiser-mode" + (start end &optional and-go raw nomsg)) +(declare-function geiser-repl-exit "ext:geiser-repl" (&optional arg)) (defvar org-babel-default-header-args:scheme '() "Default header arguments for scheme code blocks.") diff --git a/lisp/ob-shell.el b/lisp/ob-shell.el index 07283ae..fefdcdd 100644 --- a/lisp/ob-shell.el +++ b/lisp/ob-shell.el @@ -30,10 +30,12 @@ (require 'shell) (eval-when-compile (require 'cl)) -(declare-function org-babel-comint-in-buffer "ob-comint" (buffer &rest body)) +(declare-function org-babel-comint-in-buffer "ob-comint" (buffer &rest body) + t) (declare-function org-babel-comint-wait-for-output "ob-comint" (buffer)) (declare-function org-babel-comint-buffer-livep "ob-comint" (buffer)) -(declare-function org-babel-comint-with-output "ob-comint" (meta &rest body)) +(declare-function org-babel-comint-with-output "ob-comint" (meta &rest body) + t) (declare-function orgtbl-to-generic "org-table" (table params)) (defvar org-babel-default-header-args:shell '()) diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el index a42dd1d..e5bc28e 100644 --- a/lisp/ob-tangle.el +++ b/lisp/ob-tangle.el @@ -30,8 +30,8 @@ (declare-function make-directory "files" (dir &optional parents)) (declare-function org-at-heading-p "org" (&optional ignored)) -(declare-function org-babel-update-block-body "org" (new-body)) -(declare-function org-back-to-heading "org" (invisible-ok)) +(declare-function org-babel-update-block-body "ob-core" (new-body)) +(declare-function org-back-to-heading "org" (&optional invisible-ok)) (declare-function org-before-first-heading-p "org" ()) (declare-function org-edit-special "org" (&optional arg)) (declare-function org-element-at-point "org-element" ()) @@ -39,10 +39,10 @@ (declare-function org-fill-template "org" (template alist)) (declare-function org-heading-components "org" ()) (declare-function org-in-commented-heading-p "org" (&optional no-inheritance)) -(declare-function org-link-escape "org" (text &optional table)) +(declare-function org-link-escape "org" (text &optional table merge)) (declare-function org-open-link-from-string "org" (s &optional arg reference-buffer)) (declare-function org-store-link "org" (arg)) -(declare-function org-string-nw-p "org" (s)) +(declare-function org-string-nw-p "org-macs" (s)) (declare-function outline-previous-heading "outline" ()) (defvar org-link-types-re) diff --git a/lisp/org-bibtex.el b/lisp/org-bibtex.el index a346056..08410cd 100644 --- a/lisp/org-bibtex.el +++ b/lisp/org-bibtex.el @@ -121,7 +121,7 @@ (declare-function bibtex-generate-autokey "bibtex" ()) (declare-function bibtex-parse-entry "bibtex" (&optional content)) (declare-function bibtex-url "bibtex" (&optional pos no-browse)) -(declare-function org-babel-trim "ob" (string &optional regexp)) +(declare-function org-babel-trim "ob-core" (string &optional regexp)) ;;; Bibtex data diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 561ed74..c72bed4 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -32,7 +32,7 @@ (require 'cl)) (require 'org) -(declare-function calendar-iso-to-absolute "cal-iso" (&optional date)) +(declare-function calendar-iso-to-absolute "cal-iso" (date)) (declare-function notifications-notify "notifications" (&rest params)) (declare-function org-pop-to-buffer-same-window "org-compat" (&optional buffer-or-name norecord label)) (declare-function org-element-property "org-element" (property element)) diff --git a/lisp/org-colview.el b/lisp/org-colview.el index e3b2b0f..92ced53 100644 --- a/lisp/org-colview.el +++ b/lisp/org-colview.el @@ -31,7 +31,7 @@ (require 'cl-lib) (require 'org) -(declare-function org-agenda-redo "org-agenda" ()) +(declare-function org-agenda-redo "org-agenda" (&optional all)) (declare-function org-agenda-do-context-action "org-agenda" ()) (declare-function org-clock-sum-today "org-clock" (&optional headline-filter)) (declare-function org-element-extract-element "org-element" (element)) diff --git a/lisp/org-compat.el b/lisp/org-compat.el index 857fafe..c10690a 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -34,8 +34,6 @@ (require 'org-macs) -(declare-function w32-focus-frame "term/w32-win" (frame)) - ;; The following constant is for backward compatibility. We do not use ;; it in org-mode, because the Byte compiler evaluates (featurep 'xemacs) ;; at compilation time and can therefore optimize code better. @@ -394,7 +392,8 @@ Pass BUFFER to the XEmacs version of `move-to-column'." (select-frame frame) (cond ((memq window-system '(x ns mac)) (x-focus-frame frame)) - ((eq window-system 'w32) + ((and (eq window-system 'w32) + (fboundp 'w32-focus-frame)) (w32-focus-frame frame))) (when focus-follows-mouse (set-mouse-position frame (1- (frame-width frame)) 0))))) @@ -414,7 +413,8 @@ Pass BUFFER to the XEmacs version of `move-to-column'." (defalias 'org-font-lock-ensure (if (fboundp 'font-lock-ensure) #'font-lock-ensure - (lambda (&optional _beg _end) (font-lock-fontify-buffer)))) + (lambda (&optional _beg _end) + (with-no-warnings (font-lock-fontify-buffer))))) (defmacro org-no-popups (&rest body) "Suppress popup windows. diff --git a/lisp/org-feed.el b/lisp/org-feed.el index a0cfb51..20b6afb 100644 --- a/lisp/org-feed.el +++ b/lisp/org-feed.el @@ -91,7 +91,8 @@ (require 'org) (require 'sha1) -(declare-function url-retrieve-synchronously "url" (url)) +(declare-function url-retrieve-synchronously "url" + (url &optional silent inhibit-cookies timeout)) (declare-function xml-node-children "xml" (node)) (declare-function xml-get-children "xml" (node child-name)) (declare-function xml-get-attribute "xml" (node attribute)) diff --git a/lisp/org-gnus.el b/lisp/org-gnus.el index ddade09..4d9dfa2 100644 --- a/lisp/org-gnus.el +++ b/lisp/org-gnus.el @@ -39,7 +39,6 @@ (declare-function message-fetch-field "message" (header &optional not-all)) (declare-function message-narrow-to-head-1 "message" nil) -(declare-function nnimap-group-overview-filename "nnimap" (group server)) (declare-function gnus-summary-last-subject "gnus-sum" nil) (declare-function nnvirtual-map-article "nnvirtual" (article)) @@ -85,8 +84,12 @@ this variable to t." MESSAGE-ID is the message-id header field that identifies the message. If the uid is not cached, return nil." (with-temp-buffer - (let ((nov (nnimap-group-overview-filename group server))) - (when (file-exists-p nov) + (let ((nov (and (fboundp 'nnimap-group-overview-filename) + ;; nnimap-group-overview-filename was removed from + ;; Gnus in September 2010, and therefore should + ;; only be present in Emacs 23.1. + (nnimap-group-overview-filename group server)))) + (when (and nov (file-exists-p nov)) (mm-insert-file-contents nov) (set-buffer-modified-p nil) (goto-char (point-min)) diff --git a/lisp/org-info.el b/lisp/org-info.el index 07693fe..7527ab4 100644 --- a/lisp/org-info.el +++ b/lisp/org-info.el @@ -34,8 +34,8 @@ ;; Declare external functions and variables -(declare-function Info-find-node "info" (filename nodename - &optional no-going-back)) +(declare-function Info-find-node "info" + (filename nodename &optional no-going-back strict-case)) (defvar Info-current-file) (defvar Info-current-node) diff --git a/lisp/org-macro.el b/lisp/org-macro.el index 5e9be98..e135374 100644 --- a/lisp/org-macro.el +++ b/lisp/org-macro.el @@ -58,7 +58,6 @@ (declare-function org-file-contents "org" (file &optional noerror)) (declare-function org-mode "org" ()) (declare-function org-remove-double-quotes "org" (s)) -(declare-function org-with-wide-buffer "org-macs" (&rest body)) ;;; Variables diff --git a/lisp/org-macs.el b/lisp/org-macs.el index 5c1ae1f..fd4791f 100644 --- a/lisp/org-macs.el +++ b/lisp/org-macs.el @@ -45,7 +45,8 @@ (string (decode-char 'ucs c))))) (declare-function org-add-props "org-compat" (string plist &rest props)) -(declare-function org-string-match-p "org-compat" (&rest args)) +(declare-function org-string-match-p "org-compat" + (regexp string &optional start)) (defmacro org-with-gensyms (symbols &rest body) (declare (debug (sexp body)) (indent 1)) diff --git a/lisp/org-pcomplete.el b/lisp/org-pcomplete.el index c8387b4..4cc2bda 100644 --- a/lisp/org-pcomplete.el +++ b/lisp/org-pcomplete.el @@ -41,7 +41,7 @@ (declare-function org-get-tags "org" ()) (declare-function org-buffer-property-keys "org" (&optional specials defaults columns ignore-malformed)) -(declare-function org-entry-properties "org" (&optional pom which specific)) +(declare-function org-entry-properties "org" (&optional pom which)) (declare-function org-tag-alist-to-string "org" (alist &optional skip-key)) ;;;; Customization variables @@ -254,7 +254,7 @@ When completing for #+STARTUP, for example, this function returns (buffer-name (buffer-base-buffer))))))) -(declare-function org-export-backend-options "org-export" (cl-x)) +(declare-function org-export-backend-options "ox" (cl-x) t) (defun pcomplete/org-mode/file-option/options () "Complete arguments for the #+OPTIONS file option." (while (pcomplete-here diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el index 6510733..20504db 100644 --- a/lisp/org-protocol.el +++ b/lisp/org-protocol.el @@ -119,7 +119,7 @@ (eval-when-compile (require 'cl)) -(declare-function org-publish-get-project-from-filename "org-publish" +(declare-function org-publish-get-project-from-filename "ox-publish" (filename &optional up)) (declare-function server-edit "server" (&optional arg)) diff --git a/lisp/org-table.el b/lisp/org-table.el index da2e763..c6a84b8 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -53,15 +53,17 @@ (declare-function org-element-property "org-element" (property element)) (declare-function org-element-type "org-element" (element)) -(declare-function org-export-create-backend "org-export" (&rest rest)) -(declare-function org-export-data-with-backend "org-export" (arg1 arg2 arg3)) -(declare-function org-export-filter-apply-functions "org-export" (&optional filters value info)) -(declare-function org-export-first-sibling-p "org-export" (blob info)) -(declare-function org-export-get-backend "org-export" (name)) -(declare-function org-export-get-environment "org-export" (&optional arg1 arg2 arg3)) -(declare-function org-export-install-filters "org-export" (info)) -(declare-function org-export-table-has-special-column-p "org-export" (table)) -(declare-function org-export-table-row-is-special-p "org-export" (table-row info)) +(declare-function org-export-create-backend "ox" (&rest rest) t) +(declare-function org-export-data-with-backend "ox" (data backend info)) +(declare-function org-export-filter-apply-functions "ox" + (filters value info)) +(declare-function org-export-first-sibling-p "ox" (blob info)) +(declare-function org-export-get-backend "ox" (name)) +(declare-function org-export-get-environment "ox" + (&optional backend subtreep ext-plist)) +(declare-function org-export-install-filters "ox" (info)) +(declare-function org-export-table-has-special-column-p "ox" (table)) +(declare-function org-export-table-row-is-special-p "ox" (table-row info)) (declare-function calc-eval "calc" (str &optional separator &rest args)) diff --git a/lisp/org.el b/lisp/org.el index f45d5d0..1f341df 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -113,11 +113,12 @@ Stars are put in group 1 and the trimmed body in group 2.") (declare-function cdlatex-environment "ext:cdlatex" (environment item)) (declare-function org-add-archive-files "org-archive" (files)) (declare-function org-agenda-entry-get-agenda-timestamp "org-agenda" (pom)) -(declare-function org-agenda-list "org-agenda" (&optional arg start-day span)) +(declare-function org-agenda-list "org-agenda" + (&optional arg start-day span with-hour)) (declare-function org-agenda-redo "org-agenda" (&optional all)) -(declare-function org-babel-do-in-edit-buffer "ob-core" (&rest body)) +(declare-function org-babel-do-in-edit-buffer "ob-core" (&rest body) t) (declare-function org-babel-tangle-file "ob-tangle" (file &optional target-file lang)) -(declare-function org-beamer-mode "ox-beamer" ()) +(declare-function org-beamer-mode "ox-beamer" (&optional prefix) t) (declare-function org-clock-get-last-clock-out-time "org-clock" ()) (declare-function org-clock-out "org-clock" (&optional switch-to-state fail-quietly at-time)) (declare-function org-clock-remove-overlays "org-clock" (&optional beg end noremove)) @@ -133,7 +134,7 @@ Stars are put in group 1 and the trimmed body in group 2.") (declare-function org-element-contents "org-element" (element)) (declare-function org-element-context "org-element" (&optional element)) (declare-function org-element-copy "org-element" (datum)) -(declare-function org-element-interpret-data "org-element" (data &optional parent)) +(declare-function org-element-interpret-data "org-element" (data)) (declare-function org-element-lineage "org-element" (blob &optional types with-self)) (declare-function org-element-nested-p "org-element" (elem-a elem-b)) (declare-function org-element-parse-buffer "org-element" (&optional granularity visible-only)) @@ -737,7 +738,7 @@ For export specific modules, see also `org-export-backends'." (defvar org-export-registered-backends) ; From ox.el. (declare-function org-export-derived-backend-p "ox" (backend &rest backends)) -(declare-function org-export-backend-name "ox" (backend)) +(declare-function org-export-backend-name "ox" (backend) t) (defcustom org-export-backends '(ascii html icalendar latex odt) "List of export back-ends that should be always available. @@ -4416,7 +4417,8 @@ This is needed for font-lock setup.") (&optional localp no-error-if-not-filep)) (declare-function iswitchb-read-buffer "iswitchb" - (prompt &optional default require-match start matches-set)) + (prompt &optional + default require-match _predicate start matches-set)) (declare-function org-agenda-change-all-lines "org-agenda" (newhead hdmarker &optional fixface just-this)) @@ -12241,8 +12243,7 @@ This function can be used in a hook." ;;;; Completion -(declare-function org-export-backend-name "org-export" (cl-x)) -(declare-function org-export-backend-options "org-export" (cl-x)) +(declare-function org-export-backend-options "ox" (cl-x) t) (defun org-get-export-keywords () "Return a list of all currently understood export keywords. Export keywords include options, block names, attributes and diff --git a/lisp/ox-org.el b/lisp/ox-org.el index 6ab96ae..0d1c83c 100644 --- a/lisp/ox-org.el +++ b/lisp/ox-org.el @@ -25,7 +25,7 @@ ;;; Code: (require 'ox) -(declare-function htmlize-buffer "htmlize" (&optional buffer)) +(declare-function htmlize-buffer "ext:htmlize" (&optional buffer)) (defvar htmlize-output-type) (defgroup org-export-org nil |