Add a bit more detail to tables

git-svn-id: file:///svn/tfheen/trunk/dotfiles@1408 8da78d58-1cd3-0310-bee5-d77bd1b3e8bf

diff --git a/emacs b/emacs
index 011f6cbf06e26f970db46248b165cb6f5efd134f..042f53e082211c17ec364d20803049cb2754d4d2 100644 (file)
--- a/emacs
+++ b/emacs
@@ -195,8 +195,7 @@
 ;    (show-paren-mode t)) ; show-paren-mode takes too much cpu
 (cw/for-emacs
  (global-font-lock-mode t)
- (font-lock-mode 1)
- (server-start))
+ (font-lock-mode 1))
 
 ;; Multiple mode
 
@@ -256,6 +255,9 @@
  (setq inhibit-startup-echo-area-message "tfheen")
 )
 
+(cw/for-emacs-23-and-later
+ (setq line-move-visual nil))
+
 ;(cw/for-emacs-21
 ; (display-battery))
 ;(cw/for-emacs-22
@@ -405,7 +407,8 @@
                  (apply 'encode-time (org-parse-time-string ts))))
          (end (time-to-seconds
                (apply 'encode-time (org-parse-time-string te))))
-        tbl day-numbers)
+        tbl day-numbers heading1-label)
+
     (setq params (plist-put params :tstart nil))
     (setq params (plist-put params :end nil))
     (move-marker ins (point))
@@ -422,14 +425,16 @@
          (when (setq time (get-text-property p :org-clock-minutes))
            (save-excursion
              (beginning-of-line 1)
-             (when (and (looking-at (org-re "\\(\\*+\\)[ \t]+\\(.*?\\)\\([ \t]+:[[:alnum:]_@:]+:\\)?[ \t]*$"))
+             (when (and (looking-at (org-re "^\\(\\*+\\)[ \t]+\\(.*?\\)\\([ \t]+:[[:alnum:]_@:]+:\\)?[ \t]*$"))
                         (setq level (org-reduced-level
                                      (- (match-end 1) (match-beginning 1))))
                         (<= level maxlevel))
-               (push (list
+               (if (= level 1)
+                   (setq heading1-label (match-string 2))
+                 (push (list
                       start
-                      (match-string 2)
-                      time) tbl))))))
+                      (concat heading1-label ": " (match-string 2))
+                      time) tbl)))))))
       (setq start (+ 86400 start)))
     (setq tbl (nreverse tbl))
     (goto-char ins)