Release 5.13arelease_5.13a

4 files changed, 56 insertions, 10 deletions

diff --git a/org.el b/org.el
index 07fd764..9a83761 100644
--- a/org.el
+++ b/org.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 5.13
+;; Version: 5.13a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -83,7 +83,7 @@
 
 ;;; Version
 
-(defconst org-version "5.13"
+(defconst org-version "5.13a"
   "The version number of the file org.el.")
 (defun org-version ()
   (interactive)
@@ -15441,14 +15441,16 @@ This is the compiled version of the format.")
 
 (defun org-columns-cleanup-item (item fmt)
   "Remove from ITEM what is a column in the format FMT."
-  (when (string-match org-complex-heading-regexp item)
-    (concat
-     (org-add-props (concat (match-string 1 item) " ") nil
-       'org-whitespace (* 2 (1- (org-reduced-level (- (match-end 1) (match-beginning 1))))))
-     (and (match-end 2) (not (assoc "TODO" fmt)) (concat " " (match-string 2 item)))
-     (and (match-end 3) (not (assoc "PRIORITY" fmt)) (concat " " (match-string 3 item)))
-     " " (match-string 4 item)
-     (and (match-end 5) (not (assoc "TAGS" fmt)) (concat " " (match-string 5 item))))))
+  (if (not org-complex-heading-regexp)
+      item
+    (when (string-match org-complex-heading-regexp item)
+      (concat
+       (org-add-props (concat (match-string 1 item) " ") nil
+	 'org-whitespace (* 2 (1- (org-reduced-level (- (match-end 1) (match-beginning 1))))))
+       (and (match-end 2) (not (assoc "TODO" fmt)) (concat " " (match-string 2 item)))
+       (and (match-end 3) (not (assoc "PRIORITY" fmt)) (concat " " (match-string 3 item)))
+       " " (match-string 4 item)
+       (and (match-end 5) (not (assoc "TAGS" fmt)) (concat " " (match-string 5 item)))))))
   
 (defun org-columns-show-value ()
   "Show the full value of the property."
diff --git a/org.pdf b/org.pdf
index 6d1f046..a2dd4dd 100644
--- a/org.pdf
+++ b/org.pdf
diff --git a/orgcard.pdf b/orgcard.pdf
index 1050a04..034c4ff 100644
--- a/orgcard.pdf
+++ b/orgcard.pdf
diff --git a/request-assign.future b/request-assign.future
new file mode 100644
index 0000000..8ee7747
--- /dev/null
+++ b/request-assign.future
@@ -0,0 +1,44 @@
+Please email the following information to assign@gnu.org, and we
+will send you the assignment form for your past and future changes.
+
+Please use your full legal name (in ASCII characters) as the subject
+line of the message.
+----------------------------------------------------------------------
+REQUEST: SEND FORM FOR PAST AND FUTURE CHANGES
+
+[What is the name of the program or package you're contributing to?]
+
+  Org-mode, which is part of Emacs
+
+[Did you copy any files or text written by someone else in these changes?
+Even if that material is free software, we need to know about it.]
+
+
+[Do you have an employer who might have a basis to claim to own
+your changes?  Do you attend a school which might make such a claim?]
+
+
+[For the copyright registration, what country are you a citizen of?]
+
+
+[What year were you born?]
+
+
+[Please write your email address here.]
+
+
+[Please write your postal address here.]
+
+
+
+
+
+[Which files have you changed so far, and which new files have you written
+so far?]
+
+
+
+
+
+
+