[Emacs-diffs] Changes to emacs/lisp/textmodes/org.el,v

[Carsten Dominik]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Carsten Dominik <cdominik>      07/08/30 13:56:29

Index: org.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/textmodes/org.el,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -b -r1.150 -r1.151
--- org.el      30 Aug 2007 09:48:23 -0000      1.150
+++ org.el      30 Aug 2007 13:56:28 -0000      1.151
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <dominik at science dot uva dot nl>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://www.astro.uva.nl/~dominik/Tools/org/
-;; Version: 5.07
+;; Version: 5.08
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -3827,7 +3827,7 @@
                             kws0)
                kwsa (if kwsa (append '((:startgroup)) kwsa '((:endgroup))))
                hw (car kws1)
-               dws (if sep (cdr sep) (last kws1))
+               dws (if sep (org-remove-keyword-keys (cdr sep)) (last kws1))
                tail (list inter hw (car dws) (org-last dws)))
          (add-to-list 'org-todo-heads hw 'append)
          (push kws1 org-todo-sets)
@@ -3936,6 +3936,12 @@
 
     (org-set-font-lock-defaults)))
 
+(defun org-remove-keyword-keys (list)
+  (mapcar (lambda (x)
+           (if (string-match "(.)$" x)
+               (substring x 0 (match-beginning 0))
+             x))
+         list))
 
 ;;; Some variables ujsed in various places