forked from mirrors/org-mode
Bug fixes.
This commit is contained in:
parent
800db00dc8
commit
9a8d39d865
|
@ -34,6 +34,9 @@
|
||||||
(eval-when-compile (require 'cl))
|
(eval-when-compile (require 'cl))
|
||||||
(require 'org)
|
(require 'org)
|
||||||
|
|
||||||
|
(declare-function org-agenda-redo "org-agenda" ())
|
||||||
|
|
||||||
|
|
||||||
;;; Definie additional faces for column view
|
;;; Definie additional faces for column view
|
||||||
|
|
||||||
(when (featurep 'xemacs)
|
(when (featurep 'xemacs)
|
||||||
|
@ -1060,6 +1063,7 @@ Don't set this, this is meant for dynamic scoping.")
|
||||||
(org-columns-remove-overlays)
|
(org-columns-remove-overlays)
|
||||||
(if (org-mode-p)
|
(if (org-mode-p)
|
||||||
(call-interactively 'org-columns)
|
(call-interactively 'org-columns)
|
||||||
|
(org-agenda-redo)
|
||||||
(call-interactively 'org-agenda-columns)))
|
(call-interactively 'org-agenda-columns)))
|
||||||
(when (featurep 'xemacs)
|
(when (featurep 'xemacs)
|
||||||
(while (not (or (eolp)
|
(while (not (or (eolp)
|
||||||
|
|
|
@ -32,6 +32,8 @@
|
||||||
(eval-when-compile (require 'cl))
|
(eval-when-compile (require 'cl))
|
||||||
(require 'org)
|
(require 'org)
|
||||||
|
|
||||||
|
(declare-function org-agenda-redo "org-agenda" ())
|
||||||
|
|
||||||
;;; Column View
|
;;; Column View
|
||||||
|
|
||||||
(defvar org-columns-overlays nil
|
(defvar org-columns-overlays nil
|
||||||
|
@ -204,6 +206,15 @@ This is the compiled version of the format.")
|
||||||
(min (point-max) (1+ (point-at-eol)))
|
(min (point-max) (1+ (point-at-eol)))
|
||||||
'read-only "Type `e' to edit property")))))
|
'read-only "Type `e' to edit property")))))
|
||||||
|
|
||||||
|
(defun org-columns-add-ellipses (string width)
|
||||||
|
"Truncate STRING with WIDTH characters, with ellipses."
|
||||||
|
(cond
|
||||||
|
((<= (length string) width) string)
|
||||||
|
((<= width (length org-columns-ellipses))
|
||||||
|
(substring org-columns-ellipses 0 width))
|
||||||
|
(t (concat (substring string 0 (- width (length org-columns-ellipses)))
|
||||||
|
org-columns-ellipses))))
|
||||||
|
|
||||||
(defvar org-columns-full-header-line-format nil
|
(defvar org-columns-full-header-line-format nil
|
||||||
"Fthe full header line format, will be shifted by horizontal scrolling." )
|
"Fthe full header line format, will be shifted by horizontal scrolling." )
|
||||||
(defvar org-previous-header-line-format nil
|
(defvar org-previous-header-line-format nil
|
||||||
|
|
Loading…
Reference in a new issue