Move obsolete declarations into "org-compat.el"

* lisp/org-agenda.el (org-agenda-list):
(org-agenda-goto-today):
(org-agenda-reset-view): Remove reference to obsolete
`org-agenda-ndays'.
This commit is contained in:
Nicolas Goaziou 2016-06-30 15:20:51 +02:00
parent 8d3586faac
commit b2091f6d75
15 changed files with 91 additions and 132 deletions

View File

@ -2441,10 +2441,6 @@ file's directory then expand relative links."
(defvar org-babel-capitalize-example-region-markers nil
"Make true to capitalize begin/end example markers inserted by code blocks.")
(define-obsolete-function-alias
'org-babel-examplize-region
'org-babel-examplify-region "25.1")
(defun org-babel-examplify-region (beg end &optional results-switches inline)
"Comment out region using the inline `==' or `: ' org example quote."
(interactive "*r")
@ -2913,8 +2909,6 @@ can be specified as the REGEXP argument."
(setq string (substring string 0 -1)))
string))
(define-obsolete-function-alias 'org-babel-trim 'org-trim "Org 9.0")
(defun org-babel-local-file-name (file)
"Return the local name component of FILE."
(or (file-remote-p file 'localname) file))

View File

@ -998,8 +998,6 @@ you want to use two-columns display (see `org-agenda-menu-two-columns')."
:version "24.1"
:type 'boolean)
(define-obsolete-variable-alias 'org-agenda-menu-two-column 'org-agenda-menu-two-columns "24.3")
(defcustom org-agenda-menu-two-columns nil
"Non-nil means, use two columns to show custom commands in the dispatcher.
If you use this, you probably want to set `org-agenda-menu-show-matcher'
@ -1008,7 +1006,6 @@ to nil."
:version "24.1"
:type 'boolean)
(define-obsolete-variable-alias 'org-finalize-agenda-hook 'org-agenda-finalize-hook "24.3")
(defcustom org-agenda-finalize-hook nil
"Hook run just before displaying an agenda buffer.
The buffer is still writable when the hook is called.
@ -1125,16 +1122,6 @@ option will be ignored."
:group 'org-agenda-windows
:type 'boolean)
(defcustom org-agenda-ndays nil
"Number of days to include in overview display.
Should be 1 or 7.
Obsolete, see `org-agenda-span'."
:group 'org-agenda-daily/weekly
:type '(choice (const nil)
(integer)))
(make-obsolete-variable 'org-agenda-ndays 'org-agenda-span "24.1")
(defcustom org-agenda-span 'week
"Number of days to include in overview display.
Can be day, week, month, year, or any number of days.
@ -4221,8 +4208,7 @@ items if they have an hour specification like [h]h:mm."
(setq start-day (time-to-days (org-read-date nil t start-day))))
(org-compile-prefix-format 'agenda)
(org-set-sorting-strategy 'agenda)
(let* ((span (org-agenda-ndays-to-span
(or span org-agenda-ndays org-agenda-span)))
(let* ((span (org-agenda-ndays-to-span (or span org-agenda-span)))
(today (org-today))
(sd (or start-day today))
(ndays (org-agenda-span-to-ndays span sd))
@ -7851,7 +7837,7 @@ Negative selection means regexp must not match for selection of an entry."
(tdpos (goto-char tdpos))
((eq org-agenda-type 'agenda)
(let* ((sd (org-agenda-compute-starting-span
(org-today) (or curspan org-agenda-ndays org-agenda-span)))
(org-today) (or curspan org-agenda-span)))
(org-agenda-overriding-arguments args))
(setf (nth 1 org-agenda-overriding-arguments) sd)
(org-agenda-redo)
@ -7980,7 +7966,7 @@ With prefix ARG, go backward that many times the current span."
(defun org-agenda-reset-view ()
"Switch to default view for agenda."
(interactive)
(org-agenda-change-time-span (or org-agenda-ndays org-agenda-span)))
(org-agenda-change-time-span org-agenda-span))
(defun org-agenda-day-view (&optional day-of-month)
"Switch to daily view for agenda.
With argument DAY-OF-MONTH, switch to that day of the month."
@ -8324,9 +8310,6 @@ When called with a prefix argument, include all archive files as well."
(if org-agenda-clockreport-mode " Clock" "")))
(force-mode-line-update))
(define-obsolete-function-alias
'org-agenda-post-command-hook 'org-agenda-update-agenda-type "24.3")
(defun org-agenda-update-agenda-type ()
"Update the agenda type after each command."
(setq org-agenda-type
@ -10182,7 +10165,6 @@ days as returned by `calendar-absolute-from-gregorian' or
when defining today."
(eq (org-today)
(if (consp date) (calendar-absolute-from-gregorian date) date)))
(define-obsolete-function-alias 'org-agenda-todayp 'org-agenda-today-p "25.1")
(defun org-agenda-todo-yesterday (&optional arg)
"Like `org-agenda-todo' but the time of change will be 23:59 of yesterday."

View File

@ -237,9 +237,6 @@ file name Play this sound file, fall back to beep"
(const :tag "Standard beep" t)
(file :tag "Play sound file")))
(define-obsolete-variable-alias 'org-clock-modeline-total
'org-clock-mode-line-total "24.3")
(defcustom org-clock-mode-line-total 'auto
"Default setting for the time included for the mode line clock.
This can be overruled locally using the CLOCK_MODELINE_TOTAL property.

View File

@ -1497,9 +1497,6 @@ PARAMS is a property list of parameters:
(id)))))
(org-update-dblock))
(define-obsolete-function-alias 'org-insert-columns-dblock
'org-columns-insert-dblock "Org 9.0")
;;; Column view in the agenda

View File

@ -52,11 +52,10 @@
(defalias 'gui-get-selection 'x-get-selection)))
;;; Obsolete aliases (remove them the next major release).
(define-obsolete-function-alias 'org-activate-mark 'activate-mark)
;;; Obsolete aliases (remove them once the next major release is released).
;;;; XEmacs compatibility, now removed.
(define-obsolete-function-alias 'org-activate-mark 'activate-mark)
(define-obsolete-function-alias 'org-add-hook 'add-hook "Org 9.0")
(define-obsolete-function-alias 'org-bound-and-true-p 'bound-and-true-p "Org 9.0")
(define-obsolete-function-alias 'org-decompose-region 'decompose-region "Org 9.0")
@ -99,11 +98,96 @@
(define-obsolete-function-alias 'org-pop-to-buffer-same-window 'pop-to-buffer-same-window "Org 9.0")
(define-obsolete-function-alias 'org-string-match-p 'string-match-p "Org 9.0")
;;;; Variables declared obsolete.
;;;; Functions and variables from previous releases now obsolete.
(define-obsolete-function-alias 'org-element-remove-indentation
'org-remove-indentation "Org 9.0")
(define-obsolete-variable-alias 'org-hierarchical-checkbox-statistics
'org-checkbox-hierarchical-statistics "Org 8.0")
(define-obsolete-variable-alias 'org-description-max-indent
'org-list-description-max-indent "Org 8.0")
(define-obsolete-variable-alias 'org-latex-create-formula-image-program
'org-preview-latex-default-process "Org 9.0")
(define-obsolete-variable-alias 'org-latex-preview-ltxpng-directory
'org-preview-latex-image-directory "Org 9.0")
(define-obsolete-function-alias 'org-table-p 'org-at-table-p "Org 9.0")
(define-obsolete-function-alias 'org-on-heading-p 'org-at-heading-p "Org 9.0")
(define-obsolete-function-alias 'org-at-regexp-p 'org-in-regexp "Org 8.3")
(define-obsolete-function-alias 'org-speed-command-default-hook
'org-speed-command-activate "Org 8.0")
(define-obsolete-function-alias 'org-babel-speed-command-hook
'org-babel-speed-command-activate "Org 8.0")
(define-obsolete-function-alias 'org-image-file-name-regexp
'image-file-name-regexp "Org 9.0")
(define-obsolete-function-alias 'org-get-legal-level
'org-get-valid-level "Org 7.8")
(define-obsolete-function-alias 'org-completing-read-no-i
'completing-read "Org 9.0")
(define-obsolete-function-alias 'org-icompleting-read
'completing-read "Org 9.0")
(define-obsolete-function-alias 'org-iread-file-name 'read-file-name "Org 9.0")
(define-obsolete-function-alias 'org-days-to-time
'org-time-stamp-to-now "Org 8.2")
(define-obsolete-variable-alias 'org-agenda-ignore-drawer-properties
'org-agenda-ignore-properties "Org 9.0")
(define-obsolete-function-alias 'org-preview-latex-fragment
'org-toggle-latex-fragment "Org 8.3")
(define-obsolete-function-alias 'org-display-inline-modification-hook
'org-display-inline-remove-overlay "Org 8.0")
(define-obsolete-function-alias 'org-export-get-genealogy
'org-element-lineage "Org 9.0")
(define-obsolete-variable-alias 'org-latex-with-hyperref
'org-latex-hyperref-template "Org 9.0")
(define-obsolete-variable-alias 'org-link-to-org-use-id
'org-id-link-to-org-use-id "Org 8.0")
(define-obsolete-variable-alias 'hfy-optimisations 'hfy-optimizations "Org 9.0")
(define-obsolete-variable-alias 'org-clock-modeline-total
'org-clock-mode-line-total "Org 8.0")
(define-obsolete-function-alias 'org-protocol-unhex-compound
'org-link-unescape-compound "Org 7.8")
(define-obsolete-function-alias 'org-protocol-unhex-string
'org-link-unescape "Org 7.8")
(define-obsolete-function-alias 'org-protocol-unhex-single-byte-sequence
'org-link-unescape-single-byte-sequence "Org 7.8")
(define-obsolete-variable-alias 'org-export-htmlized-org-css-url
'org-org-htmlized-css-url "Org 8.2")
(define-obsolete-variable-alias 'org-alphabetical-lists
'org-list-allow-alphabetical "Org 8.0")
(define-obsolete-function-alias 'org-list-parse-list 'org-list-to-lisp "Org 9.0")
(define-obsolete-variable-alias 'org-agenda-menu-two-column
'org-agenda-menu-two-columns "Org 8.0")
(define-obsolete-variable-alias 'org-finalize-agenda-hook
'org-agenda-finalize-hook "Org 8.0")
(make-obsolete-variable 'org-agenda-ndays 'org-agenda-span "Org 7.8")
(define-obsolete-function-alias 'org-agenda-post-command-hook
'org-agenda-update-agenda-type "Org 8.0")
(define-obsolete-function-alias 'org-agenda-todayp
'org-agenda-today-p "Org 9.0")
(define-obsolete-function-alias 'org-babel-examplize-region
'org-babel-examplify-region "Org 9.0")
(define-obsolete-function-alias 'org-babel-trim 'org-trim "Org 9.0")
(define-obsolete-variable-alias 'org-html-style-include-scripts
'org-html-head-include-scripts "Org 8.0")
(define-obsolete-variable-alias 'org-html-style-include-default
'org-html-head-include-default-style "Org 8.0")
(define-obsolete-variable-alias 'org-html-style 'org-html-head "24.4")
(define-obsolete-function-alias 'org-insert-columns-dblock
'org-columns-insert-dblock "Org 9.0")
(make-obsolete-variable
'org-read-date-minibuffer-setup-hook
"Set `org-read-date-minibuffer-local-map' instead." "24.4")
(defcustom org-read-date-minibuffer-setup-hook nil
"Hook to be used to set up keys for the date/time interface.
Add key definitions to `minibuffer-local-map', which will be a
temporary copy.
WARNING: This option is obsolete, you should use
`org-read-date-minibuffer-local-map' to set up keys."
:group 'org-time
:type 'hook)
;;; Miscellaneous functions
(defun org-compatible-face (inherits specs)
"Make a compatible face specification.
@ -139,9 +223,6 @@ is, use SPECS to define the face."
t))
t)))
;;; Miscellaneous functions
(defun org-get-x-clipboard (value)
"Get the value of the X or Windows clipboard."
(cond ((eq window-system 'x)

View File

@ -6041,10 +6041,6 @@ end of ELEM-A."
(move-overlay (car o) (- (nth 1 o) offset) (- (nth 2 o) offset))))
(goto-char (org-element-property :end elem-B)))))
;; For backward-compatibility with Org <= 8.3
(define-obsolete-function-alias
'org-element-remove-indentation 'org-remove-indentation "25.1")
(provide 'org-element)

View File

@ -81,8 +81,6 @@
:tag "Org ID"
:group 'org)
(define-obsolete-variable-alias
'org-link-to-org-use-id 'org-id-link-to-org-use-id "24.3")
(defcustom org-id-link-to-org-use-id nil
"Non-nil means storing a link to an Org file will use entry IDs.
\\<org-mode-map>\

View File

@ -244,8 +244,6 @@ interface or run the following code after updating it:
:set (lambda (var val) (set var val)
(when (featurep 'org-element) (org-element-update-syntax))))
(define-obsolete-variable-alias 'org-alphabetical-lists
'org-list-allow-alphabetical "24.4") ; Since 8.0
(defcustom org-list-allow-alphabetical nil
"Non-nil means single character alphabetical bullets are allowed.
@ -3022,8 +3020,6 @@ Point is left at list's end."
(delete-region top bottom)
(when (and (not (looking-at "[ \t]*$")) (looking-at org-list-end-re))
(replace-match ""))))))
(define-obsolete-function-alias
'org-list-parse-list 'org-list-to-lisp "Org 9.0")
(defun org-list-make-subtree ()
"Convert the plain list at point into a subtree."

View File

@ -121,19 +121,6 @@
(filename &optional up))
(declare-function server-edit "server" (&optional arg))
(define-obsolete-function-alias
'org-protocol-unhex-compound 'org-link-unescape-compound
"2011-02-17")
(define-obsolete-function-alias
'org-protocol-unhex-string 'org-link-unescape
"2011-02-17")
(define-obsolete-function-alias
'org-protocol-unhex-single-byte-sequence
'org-link-unescape-single-byte-sequence
"2011-02-17")
(defvar org-capture-link-is-already-stored)
(defgroup org-protocol nil

View File

@ -3388,19 +3388,6 @@ When nil, only the minibuffer will be available."
(defvaralias 'org-popup-calendar-for-date-prompt
'org-read-date-popup-calendar)
(make-obsolete-variable
'org-read-date-minibuffer-setup-hook
"Set `org-read-date-minibuffer-local-map' instead." "24.4")
(defcustom org-read-date-minibuffer-setup-hook nil
"Hook to be used to set up keys for the date/time interface.
Add key definitions to `minibuffer-local-map', which will be a
temporary copy.
WARNING: This option is obsolete, you should use
`org-read-date-minibuffer-local-map' to set up keys."
:group 'org-time
:type 'hook)
(defcustom org-extend-today-until 0
"The hour when your day really ends. Must be an integer.
This has influence for the following applications:
@ -3981,10 +3968,6 @@ When using LaTeXML set this option to
(const :tag "None" nil)
(string :tag "\nShell command")))
(define-obsolete-variable-alias
'org-latex-create-formula-image-program
'org-preview-latex-default-process "25.1")
(defcustom org-preview-latex-default-process 'dvipng
"The default process to convert LaTeX fragments to image files.
All available processes and theirs documents can be found in
@ -4085,10 +4068,6 @@ Place-holders only used by `:image-converter':
:type '(alist :tag "LaTeX to image backends"
:value-type (plist)))
(define-obsolete-variable-alias
'org-latex-preview-ltxpng-directory
'org-preview-latex-image-directory "25.1")
(defcustom org-preview-latex-image-directory "ltximg/"
"Path to store latex preview images.
A relative path here creates many directories relative to the
@ -4567,7 +4546,6 @@ If `org-enable-table-editor' is nil, return nil unconditionally."
(or (not (derived-mode-p 'org-mode))
(let ((e (org-element-lineage (org-element-at-point) '(table) t)))
(and e (or table-type (eq (org-element-property :type e) 'org)))))))
(define-obsolete-function-alias 'org-table-p 'org-at-table-p "Org 9.0")
(defun org-at-table.el-p ()
"Non-nil when point is at a table.el table."
@ -8185,7 +8163,6 @@ even level numbers will become the next higher odd number."
((> change 0) (1+ (* 2 (/ (+ level (* 2 change)) 2))))
((< change 0) (max 1 (1+ (* 2 (/ (+ level (* 2 change)) 2))))))
(max 1 (+ level (or change 0)))))
(define-obsolete-function-alias 'org-get-legal-level 'org-get-valid-level "23.1")
(defun org-promote ()
"Promote the current heading higher up the tree."
@ -10519,13 +10496,6 @@ Use TAB to complete link prefixes, then RET for type-specific completion support
'org-time-stamp-inactive)
(apply #'completing-read args)))
(define-obsolete-function-alias
'org-completing-read-no-i 'completing-read "Org 9.0")
(define-obsolete-function-alias
'org-icompleting-read 'completing-read "Org 9.0")
(define-obsolete-function-alias
'org-iread-file-name 'read-file-name "Org 9.0")
;;; Opening/following a link
(defvar org-link-search-failed nil)
@ -17460,8 +17430,6 @@ Don't touch the rest."
(let ((n 0))
(mapcar (lambda (x) (if (< (setq n (1+ n)) 7) (or x 0) x)) time)))
(define-obsolete-function-alias 'org-days-to-time 'org-time-stamp-to-now "24.4")
(defun org-time-stamp-to-now (timestamp-string &optional seconds)
"Difference between TIMESTAMP-STRING and now in days.
If SECONDS is non-nil, return the difference in seconds."
@ -18439,10 +18407,6 @@ tables are not re-aligned, etc."
:version "24.3"
:group 'org-agenda)
(define-obsolete-variable-alias
'org-agenda-ignore-drawer-properties
'org-agenda-ignore-properties "25.1")
(defcustom org-agenda-ignore-properties nil
"Avoid updating text properties when building the agenda.
Properties are used to prepare buffers for effort estimates,
@ -19079,8 +19043,6 @@ overlays were removed, nil otherwise."
(mapc #'delete-overlay overlays)
overlays))
(define-obsolete-function-alias
'org-preview-latex-fragment 'org-toggle-latex-fragment "24.4")
(defun org-toggle-latex-fragment (&optional arg)
"Preview the LaTeX fragment at point, or all locally or globally.
@ -19722,9 +19684,6 @@ boundaries."
(list 'org-display-inline-remove-overlay))
(push ov org-inline-image-overlays)))))))))))))))
(define-obsolete-function-alias
'org-display-inline-modification-hook 'org-display-inline-remove-overlay "24.3")
(defun org-display-inline-remove-overlay (ov after _beg _end &optional _len)
"Remove inline-display overlay if a corresponding region is modified."
(let ((inhibit-modification-hooks t))
@ -20113,9 +20072,6 @@ If not, return to the original position and throw an error."
(defvar org-table-auto-blank-field) ; defined in org-table.el
(defvar org-speed-command nil)
(define-obsolete-function-alias
'org-speed-command-default-hook 'org-speed-command-activate "24.3")
(defun org-speed-command-activate (keys)
"Hook for activating single-letter speed commands.
`org-speed-commands-default' specifies a minimal command set.
@ -20126,9 +20082,6 @@ Use `org-speed-commands-user' for further customization."
(cdr (assoc keys (append org-speed-commands-user
org-speed-commands-default)))))
(define-obsolete-function-alias
'org-babel-speed-command-hook 'org-babel-speed-command-activate "24.3")
(defun org-babel-speed-command-activate (keys)
"Hook for activating single-letter code block commands."
(when (and (bolp) (looking-at org-babel-src-block-regexp))
@ -22556,8 +22509,6 @@ match."
(let ((end (match-end 0)))
(when (or (> end pos) (and (= end pos) (not visually)))
(throw :exit (cons (match-beginning 0) (match-end 0))))))))))
(define-obsolete-function-alias 'org-at-regexp-p 'org-in-regexp
"Org mode 8.3")
(defun org-between-regexps-p (start-re end-re &optional lim-up lim-down)
"Non-nil when point is between matches of START-RE and END-RE.
@ -22775,9 +22726,6 @@ not an indirect buffer."
(or (buffer-base-buffer buf) buf)
nil)))
(define-obsolete-function-alias 'org-image-file-name-regexp 'image-file-name-regexp
"Org 9.0")
;;; TODO: Only called once, from ox-odt which should probably use
;;; org-export-inline-image-p or something.
(defun org-file-image-p (file)
@ -24195,10 +24143,6 @@ This version does not only check the character property, but also
(defun org-at-heading-p (&optional ignored)
(outline-on-heading-p t))
;;; Though the function was obsoleted in 7.8.03, the byte-compiler
;;; warning was only added in Org 9.0, which should be taken into
;;; account when deciding when to remove the alias.
(define-obsolete-function-alias 'org-on-heading-p 'org-at-heading-p "Org 7.8.03")
(defun org-in-commented-heading-p (&optional no-inheritance)
"Non-nil if point is under a commented heading.

View File

@ -1416,8 +1416,6 @@ ignored."
;;;; Template :: Scripts
(define-obsolete-variable-alias
'org-html-style-include-scripts 'org-html-head-include-scripts "24.4")
(defcustom org-html-head-include-scripts t
"Non-nil means include the JavaScript snippets in exported HTML files.
The actual script is defined in `org-html-scripts' and should
@ -1429,8 +1427,6 @@ not be modified."
;;;; Template :: Styles
(define-obsolete-variable-alias
'org-html-style-include-default 'org-html-head-include-default-style "24.4")
(defcustom org-html-head-include-default-style t
"Non-nil means include the default style in exported HTML files.
The actual style is defined in `org-html-style-default' and
@ -1443,7 +1439,6 @@ style information."
;;;###autoload
(put 'org-html-head-include-default-style 'safe-local-variable 'booleanp)
(define-obsolete-variable-alias 'org-html-style 'org-html-head "24.4")
(defcustom org-html-head ""
"Org-wide head definitions for exported HTML files.

View File

@ -621,8 +621,6 @@ precedence over this variable."
:package-version '(Org . "8.3")
:type '(choice (const :tag "No template" nil)
(string :tag "Format string")))
(define-obsolete-variable-alias
'org-latex-with-hyperref 'org-latex-hyperref-template "25.1")
;;;; Headline

View File

@ -281,7 +281,6 @@ except that the foreground and background colors are set
according to the default face identified by the `htmlfontify'.")
(defvar hfy-optimizations)
(define-obsolete-variable-alias 'hfy-optimisations 'hfy-optimizations "25.1")
(defvar org-odt-embedded-formulas-count 0)
(defvar org-odt-embedded-images-count 0)
(defvar org-odt-image-size-probe-method

View File

@ -35,8 +35,6 @@
:version "24.4"
:package-version '(Org . "8.0"))
(define-obsolete-variable-alias
'org-export-htmlized-org-css-url 'org-org-htmlized-css-url "24.4")
(defcustom org-org-htmlized-css-url nil
"URL pointing to the CSS defining colors for htmlized Emacs buffers.
Normally when creating an htmlized version of an Org buffer,

View File

@ -5442,9 +5442,6 @@ Return the new string."
;; defsubst org-export-get-parent must be defined before first use
(define-obsolete-function-alias
'org-export-get-genealogy 'org-element-lineage "25.1")
(defun org-export-get-parent-headline (blob)
"Return BLOB parent headline or nil.
BLOB is the element or object being considered."