Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

ChangeLog

@@ -1,3 +1,4 @@
+
 2008-03-30  Carsten Dominik  <dominik@science.uva.nl>
 
 	* lisp/org.el (org-columns-hscoll-title): New function.

Makefile

@@ -70,23 +70,23 @@ LISPFILES0 = $(LISPF:%=lisp/%)
 LISPFILES  = $(LISPFILES0) lisp/org-install.el
 ELCFILES0  = $(LISPFILES0:.el=.elc)
 ELCFILES   = $(LISPFILES:.el=.elc)
-DOCFILES   = org.texi org.pdf org
+DOCFILES   = doc/org.texi doc/org.pdf doc/org doc/dir
 CARDFILES  = doc/orgcard.tex doc/orgcard.pdf doc/orgcard_letter.pdf
 TEXIFILES  = doc/org.texi
 INFOFILES  = doc/org
-HG_RELEASES = ../org-mode-all-releases-hg/
 
 
 .SUFFIXES: .el .elc .texi
 SHELL = /bin/sh
 
-DISTFILES=  README ${LISPFILES} ${DOCFILES} ${CARDFILES} \
-	Makefile dir ChangeLog request-assign-future.txt \
-	CONTRIB
+# Additional distribution files
+DISTFILES_extra=  Makefile ChangeLog request-assign-future.txt CONTRIB
 DISTFILES_xemacs=  xemacs/noutline.el xemacs/ps-print-invisible.el xemacs/README
 
 default: $(ELCFILES)
+
 all:	$(ELCFILES) $(INFOFILES)
+
 compile: $(ELCFILES0)
 
 install: install-lisp
@@ -156,11 +156,12 @@ doc/orgcard_letter.ps: doc/orgcard_letter.dvi
 # Below here are special targets for maintenance only
 
 webfiles:
-	(cd ORGWEBPAGE; emacs -batch -l ~/.emacs index.org -f org-publish-current-project)
+	(cd ORGWEBPAGE; emacs -batch -l ~/.emacs index.org -eval '(org-publish (assoc "orgwebpage" org-publish-project-alist))')
+	(cd ORGWEBPAGE/tmp; rm *~)
 
 web:
 	make webfiles
-	(cd ORGWEBPAGE/tmp; lftp -f ../../../org-mode-proprietary/ftp_upload_website)
+	(cd ORGWEBPAGE/tmp; lftp -f ../../../org-mode-proprietary/ftp_upload_website_legito)
 
 html: doc/org.html
 
@@ -177,14 +178,20 @@ card:	doc/orgcard.pdf doc/orgcard.ps doc/orgcard_letter.pdf doc/orgcard_letter.p
 
 distfile:
 	@if [ "X$(TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi
-	touch org.texi orgcard.tex
+	touch doc/org.texi doc/orgcard.tex # force update
 	make info
 	make doc
-	make org-install.el
+	make lisp/org-install.el
 	rm -rf org-$(TAG) org-$(TAG).zip
 	$(MKDIR) org-$(TAG)
 	$(MKDIR) org-$(TAG)/xemacs
-	cp -r $(DISTFILES) org-$(TAG)/
+	$(MKDIR) org-$(TAG)/doc
+	$(MKDIR) org-$(TAG)/lisp
+	cp -r $(LISPFILES) org-$(TAG)/lisp
+	cp -r $(DOCFILES) $(CARDFILES) org-$(TAG)/doc
+	cp -r $(DISTFILES_extra) org-$(TAG)/
+	cp -r README_DIST org-$(TAG)/README
+	cp -r ORGWEBPAGE/Changes.org org-$(TAG)/
 	cp -r $(DISTFILES_xemacs) org-$(TAG)/xemacs/
 	zip -r org-$(TAG).zip org-$(TAG)
 	gtar zcvf org-$(TAG).tar.gz org-$(TAG)
@@ -206,20 +213,12 @@ release:
 #	cp ORGWEBPAGE/tmp/*.jpg    RELEASEDIR
 	cp RELEASEDIR/org-$(TAG).zip    RELEASEDIR/org.zip
 	cp RELEASEDIR/org-$(TAG).tar.gz RELEASEDIR/org.tar.gz
-	(cd $(HG_RELEASES); rm -rf $(DISTFILES) xemacs)
-	cp -r org-$(TAG)/* $(HG_RELEASES)
-	(cd $(HG_RELEASES); hg addremove; hg ci -m $(TAG); hg tag $(TAG))
-
-trackrelease:
-	(cd $(HG_RELEASES); rm -rf $(DISTFILES) xemacs)
-	cp -r org-$(TAG)/* $(HG_RELEASES)
-	(cd $(HG_RELEASES); hg addremove; hg ci -m $(TAG); hg tag $(TAG))
 
 upload_release:
-	(cd RELEASEDIR; lftp -f ../../org-mode-proprietary/ftp_upload_release)
+	(cd RELEASEDIR; lftp -f ../../org-mode-proprietary/ftp_upload_release_legito)
 
 upload_manual:
-	lftp -f ../org-mode-proprietary/ftp_upload_manual
+	lftp -f ../org-mode-proprietary/ftp_upload_manual_legito
 
 relup:
 	make release

ORGWEBPAGE/index.org

@@ -22,9 +22,9 @@ messages, BBDB entries, and any files related to the projects.  For
 printing and sharing of notes, an Org-mode file can be exported as a
 structured ASCII file, HTML, and LaTeX.
 
-* Current Version (5.23a) and Compatibility
+* Current Version (6.00pre-1) and Compatibility
 
-The current version is 5.23a.  To see what has changed in recent
+The current version is 6.00pre-1.  To see what has changed in recent
 releases, check this [[file:Changes.html][list of user-visible changes]].  These descriptions
 are extensive, to avoid that people will be printing the manual after
 each incremental release.  If you have an older version of the manual,

ORGWEBPAGE/org.css

@@ -0,0 +1,87 @@
+body {
+ margin: 10px 6% 10px 250px;
+ font-family: Verdana;
+ font-size: 11pt;
+ text-align: left;
+ background-image: url(img/nrocinu.jpg);
+ background-attachment: fixed;
+ background-repeat: no-repeat;
+ background-position: left top;
+}
+
+h1 {font-size: 14pt;}
+
+#table-of-contents {
+    font-size: 85%;
+    position: fixed;
+    display: bloc;
+    left: 10px;
+    top: 180px;
+    width: 200px;
+    line-height: 14pt;
+}
+
+#table-of-contents h2 {
+    display:none;
+}
+
+#table-of-contents ul {
+    list-style: none; 
+    margin: 7px 0px 7px 15px ; 
+    padding: 0px;
+}
+
+.title {
+    padding-bottom: 7px; 
+    margin-bottom: 20px; 
+    border-bottom: 1px solid #222;
+}
+
+h2 {
+  font-size: 12pt;
+  padding-bottom: 4px; 
+  margin-top: 5px;
+  margin-bottom: 5px;
+  border-bottom: 1px solid #DDD;
+}
+
+h3 {font-size: 11pt; color: #a34d32;}
+h4 {font-size: 9pt;}
+
+a {text-decoration: none; color: #537d7b}
+a:visited {text-decoration: none; color: #224444}
+a:hover {text-decoration: underline; color: #a34d32}
+
+.todo {color: #990000;}
+.done {color: #006666;}
+.timestamp-kwd {color: #444;}
+.tag {color: #DDD; font-size: 70%; font-weight: 500;}
+
+table {border: none;}
+td {border: none; padding: .1em .7em .1em .3em;}
+th {border: none;}
+
+code {font-size: 10pt;}
+
+pre {
+    border: 1px solid #555;
+    background: #EEEEEE;
+    font-size: 9pt;
+    padding: 1em;
+}
+
+img {
+    border: none;
+}
+
+.share img {
+    opacity: .4;
+    -moz-opacity: .4;
+    filter: alpha(opacity=40);
+}
+
+.share img:hover {
+    opacity: 1;
+    -moz-opacity: 1;
+    filter: alpha(opacity=100);
+}

README

@@ -1,21 +1,51 @@
-The is a distribution of Org-mode, a plain text notes and project planning
-tool for Emacs.
+This is the Emacs Org project, an emacs subsystem for organizing your life
 
-The homepage of Org-mode is at http://orgmode.org
+The homepage of Org is at http://orgmode.org
 
-The manual is in the file org.pdf, it includes a section about installation.
+This distribution contains:
 
-The xemacs directory contains special code for XEmacs users, in particular
-a port of the GNU Emacs outline.el to XEmacs.  Org-mode does not work
-under XEmacs without this file installed.  It did until version 4.37,
-but no longer.
+README
+    This file.
 
-If this is the git project, there are additional directories here:
+README_DIST
+    The README file for the distribution (zip and tar files)
 
-CONTRIB
-    contains bits and pieces contributed by users.  These are not yet
-    part of the Org-mode core, and also not part of Emacs.
+README_GIT
+    Information about the git repository and how to contribute
+    to Org-mode development. 
+
+lisp/
+    Directory with all the Emacs Lisp files that make up Org.
+
+doc/
+    The documentation files.  org.texi is the source of the
+    documentation, org.html and org.pdf are formatted versions of it.
+
+xemacs/
+    The xemacs directory contains special code for XEmacs users, in
+    particular a port of the GNU Emacs outline.el to XEmacs.  Org-mode
+    does not work under XEmacs without this file installed.  It did
+    until version 4.37, but no longer.
+
+CONTRIB/
+    A diretory with third-party additions for Org.  Some really cool
+    stuff is in there.
+
+ORGWEBPAGE/
+    Directory with the source files for the orgmode.org web page.
+    
+ChangeLog
+    The standard ChangeLog file.
+
+Makefile
+    The makefile to compile and install Org, and also for maintenance
+    tasks.
+
+request-assign-future.txt
+    The form that contributors have to sign and get processed with the
+    FSF before contributed changes can be integrated into the Org
+    core.  All files in this distribution except the CONTRIB directory
+    have copyright assigned to the FSF.
 
 EXPERIMENTAL
-    files that contain code bits for experimenting.  Nothing has been
-    decided on what to do with these.
+    Experimental code, not necessarily FSF copyright.

README_DIST

@@ -0,0 +1,45 @@
+The is a distribution of Org, a plain text notes and project planning
+tool for Emacs.
+
+The version of this release is: 6.00pre-1
+
+The homepage of Org is at http://orgmode.org
+
+This distribution contains:
+
+README
+    This file.
+
+lisp/
+    Directory with all the Emacs Lisp files that make up Org.
+
+doc/
+    The documentation files.  org.texi is the source of the
+    documentation, org.html and org.pdf are formatted versions of it.
+
+xemacs/
+    The xemacs directory contains special code for XEmacs users, in
+    particular a port of the GNU Emacs outline.el to XEmacs.  Org-mode
+    does not work under XEmacs without this file installed.  It did
+    until version 4.37, but no longer.
+
+CONTRIB/
+    A diretory with third-party additions for Org.  Some really cool
+    stuff is in there.
+
+ChangeLog
+    The standard ChangeLog file, for geeks.
+
+Changes.org
+    An Org-mode file listing the user visible changes in each release.
+
+Makefile
+    The makefile to compile and install Org.  For installation
+    instructions, see the manual.
+
+request-assign-future.txt
+    The form that contributors have to sign and get processed with the
+    FSF before contributed changes can be integrated into the Org
+    core.  All files in this distribution except the CONTRIB directory
+    have copyright assigned to the FSF.
+

UTILITIES/set-version.pl

@@ -20,5 +20,13 @@ $cmd = qq{s/^\\\\def\\\\orgversionnumber\\{\\S+\\}/\\\\def\\\\orgversionnumber{$
 $c1 = "perl -pi -e '$cmd' doc/orgcard.tex";
 system($c1);
 
+print STDERR "README_DIST\n";
+$cmd = qq{s/^(The version of this release is:)\\s+(\\S+)[ \t]*\$/\$1 $version/;};
+$c1 = "perl -pi -e '$cmd' README_DIST";
+system($c1);
 
-
+print STDERR "ORGWEBPAGE/index.org\n";
+$cmd = qq{s/^(\\* Current Version )\\(\\S+?\\)/\$1($version)/;s/^(The current version is)\\s+(\\S+)\\. /\$1 $version. /};
+$c1 = "perl -pi -e '$cmd' ORGWEBPAGE/index.org";
+print STDERR $c1,"\n";
+system($c1);

lisp/org.el

@@ -4790,7 +4790,7 @@ even level numbers will become the next higher odd number."
 	    ((< change 0) (max 1 (1+ (* 2 (/ (+ level (* 2 change)) 2))))))
     (max 1 (+ level change))))
 
-(if (featurep 'xemacs)
+(if (or (featurep 'xemacs) (< emacs-major-version 23))
     (define-obsolete-function-alias 'org-get-legal-level
       'org-get-valid-level)
   (define-obsolete-function-alias 'org-get-legal-level