forked from mirrors/org-mode
org-colview: Remove compatibility cruft
* lisp/org-colview.el (org-verify-version): Remove function. (org-columns): (org-agenda-columns): Apply removal.
This commit is contained in:
parent
c56ff1071d
commit
a5540c5599
|
@ -28,16 +28,13 @@
|
||||||
|
|
||||||
;;; Code:
|
;;; Code:
|
||||||
|
|
||||||
(eval-when-compile (require 'cl))
|
(require 'cl-lib)
|
||||||
(require 'org)
|
(require 'org)
|
||||||
|
|
||||||
(declare-function org-agenda-redo "org-agenda" ())
|
(declare-function org-agenda-redo "org-agenda" ())
|
||||||
(declare-function org-agenda-do-context-action "org-agenda" ())
|
(declare-function org-agenda-do-context-action "org-agenda" ())
|
||||||
(declare-function org-clock-sum-today "org-clock" (&optional headline-filter))
|
(declare-function org-clock-sum-today "org-clock" (&optional headline-filter))
|
||||||
|
|
||||||
(when (featurep 'xemacs)
|
|
||||||
(error "Do not load this file into XEmacs, use `org-colview-xemacs.el' from the contrib/ directory"))
|
|
||||||
|
|
||||||
;;; Column View
|
;;; Column View
|
||||||
|
|
||||||
(defvar org-columns-overlays nil
|
(defvar org-columns-overlays nil
|
||||||
|
@ -647,13 +644,6 @@ around it."
|
||||||
(mapcar (lambda (x) (format-time-string fmt (apply 'encode-time x)))
|
(mapcar (lambda (x) (format-time-string fmt (apply 'encode-time x)))
|
||||||
(list time-before time time-after)))))
|
(list time-before time time-after)))))
|
||||||
|
|
||||||
(defun org-verify-version (task)
|
|
||||||
(cond
|
|
||||||
((eq task 'columns)
|
|
||||||
(if (or (featurep 'xemacs)
|
|
||||||
(< emacs-major-version 22))
|
|
||||||
(error "Emacs 22 is required for the columns feature")))))
|
|
||||||
|
|
||||||
(defun org-columns-open-link (&optional arg)
|
(defun org-columns-open-link (&optional arg)
|
||||||
(interactive "P")
|
(interactive "P")
|
||||||
(let ((value (get-char-property (point) 'org-columns-value)))
|
(let ((value (get-char-property (point) 'org-columns-value)))
|
||||||
|
@ -690,7 +680,6 @@ Also sets `org-columns-top-level-marker' to the new position."
|
||||||
"Turn on column view on an org-mode file.
|
"Turn on column view on an org-mode file.
|
||||||
When COLUMNS-FMT-STRING is non-nil, use it as the column format."
|
When COLUMNS-FMT-STRING is non-nil, use it as the column format."
|
||||||
(interactive)
|
(interactive)
|
||||||
(org-verify-version 'columns)
|
|
||||||
(org-columns-remove-overlays)
|
(org-columns-remove-overlays)
|
||||||
(move-marker org-columns-begin-marker (point))
|
(move-marker org-columns-begin-marker (point))
|
||||||
(org-columns-goto-top-level)
|
(org-columns-goto-top-level)
|
||||||
|
@ -1394,7 +1383,6 @@ and tailing newline characters."
|
||||||
(defun org-agenda-columns ()
|
(defun org-agenda-columns ()
|
||||||
"Turn on or update column view in the agenda."
|
"Turn on or update column view in the agenda."
|
||||||
(interactive)
|
(interactive)
|
||||||
(org-verify-version 'columns)
|
|
||||||
(org-columns-remove-overlays)
|
(org-columns-remove-overlays)
|
||||||
(move-marker org-columns-begin-marker (point))
|
(move-marker org-columns-begin-marker (point))
|
||||||
(let ((org-columns-time (time-to-number-of-days (current-time)))
|
(let ((org-columns-time (time-to-number-of-days (current-time)))
|
||||||
|
|
Loading…
Reference in a new issue