summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2008-03-31 12:40:41 +0200
committerBastien Guerry <bzg@altern.org>2008-03-31 12:40:41 +0200
commit85bb2a81019af17cdef167ec7db364a5bece66c5 (patch)
treea4d56f5c537fee0985565305569da7430e0b0002
parent85820fa34f086e6a212f0fcfcea29c719a50e53a (diff)
parent5515c6e245d26aac34d5118f8e557bac83fbe37f (diff)
downloadorg-mode-85bb2a81019af17cdef167ec7db364a5bece66c5.tar.gz
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
-rw-r--r--ChangeLog8
-rw-r--r--Makefile5
-rw-r--r--lisp/org-table.el2
-rw-r--r--lisp/org.el34
4 files changed, 40 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index b12216b..df05691 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-03-30 Carsten Dominik <dominik@science.uva.nl>
+
+ * lisp/org.el (org-columns-hscoll-title): New function.
+ (org-columns-previous-hscroll): New variable.
+ (org-columns-full-header-line-format): New variable.
+ (org-columns-display-here-title, org-columns-remove-overlays):
+ Install `org-columns-hscoll-title' in post-command-hook.
+
2008-03-28 Carsten Dominik <dominik@science.uva.nl>
* lisp/org.el (org-auto-repeat-maybe): Make sure that repeating
diff --git a/Makefile b/Makefile
index ca78f9f..b0ee919 100644
--- a/Makefile
+++ b/Makefile
@@ -73,7 +73,7 @@ ELCFILES = $(LISPFILES:.el=.elc)
DOCFILES = org.texi org.pdf org
CARDFILES = doc/orgcard.tex doc/orgcard.pdf doc/orgcard_letter.pdf
TEXIFILES = doc/org.texi
-INFOFILES = org
+INFOFILES = doc/org
HG_RELEASES = ../org-mode-all-releases-hg/
@@ -85,7 +85,8 @@ DISTFILES= README ${LISPFILES} ${DOCFILES} ${CARDFILES} \
CONTRIB
DISTFILES_xemacs= xemacs/noutline.el xemacs/ps-print-invisible.el xemacs/README
-all: $(ELCFILES)
+default: $(ELCFILES)
+all: $(ELCFILES) $(INFOFILES)
compile: $(ELCFILES0)
install: install-lisp
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 02c2c5d..119e2b4 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -176,7 +176,7 @@ from accept as input, do not present for editing
t: accept as input and present for editing"
:group 'org-table-calculation
:type '(choice
- (const :tag "Never, don't even check unser input for them" nil)
+ (const :tag "Never, don't even check user input for them" nil)
(const :tag "Always, both as user input, and when editing" t)
(const :tag "Convert user input, don't offer during editing" 'from)))
diff --git a/lisp/org.el b/lisp/org.el
index 3caa123..d38cbda 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -5557,7 +5557,7 @@ the whole buffer."
(org-beginning-of-item)
(setq curr-ind (org-get-indentation))
(setq next-ind curr-ind)
- (while (and (org-at-item-p) (= curr-ind next-ind))
+ (while (and (bolp) (org-at-item-p) (= curr-ind next-ind))
(save-excursion (end-of-line) (setq eline (point)))
(if (re-search-forward re-box eline t)
(if (member (match-string 2) '("[ ]" "[-]"))
@@ -10582,6 +10582,8 @@ This is the compiled version of the format.")
(min (point-max) (1+ (point-at-eol)))
'read-only "Type `e' to edit property")))))
+(defvar org-columns-full-header-line-format nil
+ "Fthe full header line format, will be shifted by horizontal scrolling." )
(defvar org-previous-header-line-format nil
"The header line format before column view was turned on.")
(defvar org-columns-inhibit-recalculation nil
@@ -10589,6 +10591,7 @@ This is the compiled version of the format.")
(defvar header-line-format)
+(defvar org-columns-previous-hscroll 0)
(defun org-columns-display-here-title ()
"Overlay the newline before the current line with the table title."
(interactive)
@@ -10607,10 +10610,24 @@ This is the compiled version of the format.")
title (concat title string)))
(setq title (concat
(org-add-props " " nil 'display '(space :align-to 0))
- (org-add-props title nil 'face '(:weight bold :underline t))))
+ (org-add-props title nil 'face '(:weight bold :underline t :inherit default))))
(org-set-local 'org-previous-header-line-format header-line-format)
(org-set-local 'org-columns-current-widths (nreverse widths))
- (setq header-line-format title)))
+ (setq org-columns-full-header-line-format title)
+ (setq org-columns-previous-hscroll -1)
+; (org-columns-hscoll-title)
+ (org-add-hook 'post-command-hook 'org-columns-hscoll-title nil 'local)))
+
+(defun org-columns-hscoll-title ()
+ "Set the header-line-format so that it scrolls along with the table."
+ (sit-for .0001) ; need to force a redisplay to update window-hscroll
+ (when (not (= (window-hscroll) org-columns-previous-hscroll))
+ (setq header-line-format
+ (concat (substring org-columns-full-header-line-format 0 1)
+ (substring org-columns-full-header-line-format
+ (1+ (window-hscroll))))
+ org-columns-previous-hscroll (window-hscroll))
+ (force-mode-line-update)))
(defun org-columns-remove-overlays ()
"Remove all currently active column overlays."
@@ -10619,7 +10636,8 @@ This is the compiled version of the format.")
(with-current-buffer (marker-buffer org-columns-begin-marker)
(when (local-variable-p 'org-previous-header-line-format)
(setq header-line-format org-previous-header-line-format)
- (kill-local-variable 'org-previous-header-line-format))
+ (kill-local-variable 'org-previous-header-line-format)
+ (remove-hook 'post-command-hook 'org-columns-hscoll-title 'local))
(move-marker org-columns-begin-marker nil)
(move-marker org-columns-top-level-marker nil)
(org-unmodified
@@ -14661,8 +14679,12 @@ See the individual commands for more information."
["Modify math symbol" org-cdlatex-math-modify
(org-inside-LaTeX-fragment-p)]
["Export LaTeX fragments as images"
- (setq org-export-with-LaTeX-fragments (not org-export-with-LaTeX-fragments))
- :style toggle :selected org-export-with-LaTeX-fragments])
+ (if (featurep 'org-exp)
+ (setq org-export-with-LaTeX-fragments
+ (not org-export-with-LaTeX-fragments))
+ (require 'org-exp))
+ :style toggle :selected (and (boundp 'org-export-with-LaTeX-fragments)
+ org-export-with-LaTeX-fragments)])
"--"
("Documentation"
["Show Version" org-version t]