From 174cc21d0861ef09e4ef5ef0bc2424271b1fdefa Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Sun, 25 May 2008 16:15:25 +0200 Subject: [PATCH] Bug fix for removal of comments during export. --- ORGWEBPAGE/index.org | 7 ++++--- README_DIST | 2 +- doc/org.texi | 2 +- doc/orgcard.tex | 2 +- lisp/org-agenda.el | 2 +- lisp/org-archive.el | 2 +- lisp/org-bbdb.el | 2 +- lisp/org-bibtex.el | 2 +- lisp/org-clock.el | 2 +- lisp/org-colview-xemacs.el | 2 +- lisp/org-colview.el | 2 +- lisp/org-compat.el | 2 +- lisp/org-exp.el | 9 ++++++--- lisp/org-export-latex.el | 2 +- lisp/org-faces.el | 2 +- lisp/org-gnus.el | 2 +- lisp/org-id.el | 2 +- lisp/org-info.el | 2 +- lisp/org-irc.el | 2 +- lisp/org-jsinfo.el | 2 +- lisp/org-mac-message.el | 2 +- lisp/org-macs.el | 2 +- lisp/org-mew.el | 2 +- lisp/org-mhe.el | 2 +- lisp/org-mouse.el | 2 +- lisp/org-publish.el | 2 +- lisp/org-remember.el | 2 +- lisp/org-rmail.el | 2 +- lisp/org-table.el | 2 +- lisp/org-vm.el | 2 +- lisp/org-wl.el | 2 +- lisp/org.el | 4 ++-- 32 files changed, 41 insertions(+), 37 deletions(-) diff --git a/ORGWEBPAGE/index.org b/ORGWEBPAGE/index.org index 169e68488..4ec47ac7b 100644 --- a/ORGWEBPAGE/index.org +++ b/ORGWEBPAGE/index.org @@ -1,3 +1,4 @@ + #+TITLE: Org-Mode Homepage #+LANGUAGE: en #+EMAIL: carsten at orgmode dot org @@ -22,9 +23,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 (6.04a) and Compatibility +* Current Version (6.04b) and Compatibility -The current version is 6.04a. To see what has changed in recent +The current version is 6.04b. 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, @@ -41,7 +42,7 @@ release. **** Distribution -Download as [[file:org-6.04a.zip][zip file]] or [[file:org-6.04a.tar.gz][gzipped tar archive]]. These archives contain +Download as [[file:org-6.04b.zip][zip file]] or [[file:org-6.04b.tar.gz][gzipped tar archive]]. These archives contain both the Lisp file org.el and the documentation in PDF and (TeX)Info formats. A shell script to simplify upgrading to the newest release has been posted [[http://www.philfam.co.uk/pete/GTD/org-mode/update-org.sh][here]]. diff --git a/README_DIST b/README_DIST index 7b8c46085..a2b4dc787 100644 --- a/README_DIST +++ b/README_DIST @@ -1,7 +1,7 @@ The is a distribution of Org, a plain text notes and project planning tool for Emacs. -The version of this release is: 6.04a +The version of this release is: 6.04b The homepage of Org is at http://orgmode.org diff --git a/doc/org.texi b/doc/org.texi index cbbc362b1..d87d7bf80 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -3,7 +3,7 @@ @setfilename ../../info/org @settitle The Org Manual -@set VERSION 6.04a +@set VERSION 6.04b @set DATE May 2008 @dircategory Emacs diff --git a/doc/orgcard.tex b/doc/orgcard.tex index fbf2c48f8..8cc67eb6d 100644 --- a/doc/orgcard.tex +++ b/doc/orgcard.tex @@ -1,5 +1,5 @@ % Reference Card for Org Mode -\def\orgversionnumber{6.04a} +\def\orgversionnumber{6.04b} \def\versionyear{2008} % latest update \def\year{2008} % latest copyright year diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 4f370d0ff..681fc6142 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.04a +;; Version: 6.04b ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-archive.el b/lisp/org-archive.el index 570110791..d80ed4466 100644 --- a/lisp/org-archive.el +++ b/lisp/org-archive.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.04a +;; Version: 6.04b ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-bbdb.el b/lisp/org-bbdb.el index 350a16e77..6c14204ea 100644 --- a/lisp/org-bbdb.el +++ b/lisp/org-bbdb.el @@ -6,7 +6,7 @@ ;; Thomas Baumann ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.04a +;; Version: 6.04b ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-bibtex.el b/lisp/org-bibtex.el index 68fb17028..3a3fc496e 100644 --- a/lisp/org-bibtex.el +++ b/lisp/org-bibtex.el @@ -5,7 +5,7 @@ ;; Author: Bastien Guerry ;; Carsten Dominik ;; Keywords: org, wp, remember -;; Version: 6.04a +;; Version: 6.04b ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-clock.el b/lisp/org-clock.el index fafa2e8b0..587b5796a 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.04a +;; Version: 6.04b ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-colview-xemacs.el b/lisp/org-colview-xemacs.el index 0ee983975..9f15ce119 100644 --- a/lisp/org-colview-xemacs.el +++ b/lisp/org-colview-xemacs.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.04a +;; Version: 6.04b ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-colview.el b/lisp/org-colview.el index aaddde4ee..656b926fc 100644 --- a/lisp/org-colview.el +++ b/lisp/org-colview.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.04a +;; Version: 6.04b ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-compat.el b/lisp/org-compat.el index 1ab61ae28..387486490 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.04a +;; Version: 6.04b ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-exp.el b/lisp/org-exp.el index 801b3ea00..dd9495ca4 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.04a +;; Version: 6.04b ;; ;; This file is part of GNU Emacs. ;; @@ -1459,12 +1459,15 @@ on this string to produce the exported version." ;; Remove or replace comments (goto-char (point-min)) (while (re-search-forward "^#\\(.*\n?\\)" nil t) + (setq pos (match-beginning 0)) (if commentsp (progn (add-text-properties (match-beginning 0) (match-end 0) '(org-protected t)) (replace-match (format commentsp (match-string 1)) t t)) - (goto-char (1+ (match-beginning 0))) - (org-if-unprotected (replace-match "")) + (goto-char (1+ pos)) + (org-if-unprotected + (replace-match "") + (goto-char (max (point-min) (1- pos)))) (end-of-line 1))) ;; Find matches for radio targets and turn them into internal links diff --git a/lisp/org-export-latex.el b/lisp/org-export-latex.el index c7dd2be02..ecdd92a68 100644 --- a/lisp/org-export-latex.el +++ b/lisp/org-export-latex.el @@ -4,7 +4,7 @@ ;; ;; Emacs Lisp Archive Entry ;; Filename: org-export-latex.el -;; Version: 6.04a +;; Version: 6.04b ;; Author: Bastien Guerry ;; Maintainer: Bastien Guerry ;; Keywords: org, wp, tex diff --git a/lisp/org-faces.el b/lisp/org-faces.el index 5bbaa0be0..f435fbe58 100644 --- a/lisp/org-faces.el +++ b/lisp/org-faces.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.04a +;; Version: 6.04b ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-gnus.el b/lisp/org-gnus.el index 260591afc..d20a6aa96 100644 --- a/lisp/org-gnus.el +++ b/lisp/org-gnus.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.04a +;; Version: 6.04b ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-id.el b/lisp/org-id.el index ae5eae3b5..1d44fd8b1 100644 --- a/lisp/org-id.el +++ b/lisp/org-id.el @@ -4,7 +4,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.04a +;; Version: 6.04b ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-info.el b/lisp/org-info.el index c25ec9593..b9c80f889 100644 --- a/lisp/org-info.el +++ b/lisp/org-info.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.04a +;; Version: 6.04b ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-irc.el b/lisp/org-irc.el index 608d7619d..99192c368 100644 --- a/lisp/org-irc.el +++ b/lisp/org-irc.el @@ -4,7 +4,7 @@ ;; ;; Author: Philip Jackson ;; Keywords: erc, irc, link, org -;; Version: 6.04a +;; Version: 6.04b ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-jsinfo.el b/lisp/org-jsinfo.el index f5f5f661a..fe8ea86cc 100644 --- a/lisp/org-jsinfo.el +++ b/lisp/org-jsinfo.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.04a +;; Version: 6.04b ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-mac-message.el b/lisp/org-mac-message.el index 21eefc433..b4e5332b4 100644 --- a/lisp/org-mac-message.el +++ b/lisp/org-mac-message.el @@ -3,7 +3,7 @@ ;; Copyright (C) 2008 Free Software Foundation, Inc. ;; Author: John Wiegley -;; Version: 6.04a +;; Version: 6.04b ;; Keywords: outlines, hypermedia, calendar, wp ;; This file is part of GNU Emacs. diff --git a/lisp/org-macs.el b/lisp/org-macs.el index 3d08a6123..99136cb72 100644 --- a/lisp/org-macs.el +++ b/lisp/org-macs.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.04a +;; Version: 6.04b ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-mew.el b/lisp/org-mew.el index fc73faff8..57dce090c 100644 --- a/lisp/org-mew.el +++ b/lisp/org-mew.el @@ -5,7 +5,7 @@ ;; Author: Tokuya Kameshima ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.04a +;; Version: 6.04b ;; This file is part of GNU Emacs. diff --git a/lisp/org-mhe.el b/lisp/org-mhe.el index 819352694..866c2d2d5 100644 --- a/lisp/org-mhe.el +++ b/lisp/org-mhe.el @@ -5,7 +5,7 @@ ;; Author: Thomas Baumann ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.04a +;; Version: 6.04b ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-mouse.el b/lisp/org-mouse.el index 0d4547884..c18c69ec3 100644 --- a/lisp/org-mouse.el +++ b/lisp/org-mouse.el @@ -4,7 +4,7 @@ ;; ;; Author: Piotr Zielinski ;; Maintainer: Carsten Dominik -;; Version: 6.04a +;; Version: 6.04b ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-publish.el b/lisp/org-publish.el index e18953c0b..4a1c9b7bb 100644 --- a/lisp/org-publish.el +++ b/lisp/org-publish.el @@ -4,7 +4,7 @@ ;; Author: David O'Toole ;; Maintainer: Bastien Guerry ;; Keywords: hypermedia, outlines, wp -;; Version: 6.04a +;; Version: 6.04b ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-remember.el b/lisp/org-remember.el index 5132b2034..65fb8617a 100644 --- a/lisp/org-remember.el +++ b/lisp/org-remember.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.04a +;; Version: 6.04b ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-rmail.el b/lisp/org-rmail.el index bda2f65a8..4de770e54 100644 --- a/lisp/org-rmail.el +++ b/lisp/org-rmail.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.04a +;; Version: 6.04b ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-table.el b/lisp/org-table.el index 2cdfa5a90..49793a439 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.04a +;; Version: 6.04b ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-vm.el b/lisp/org-vm.el index a784bd8d8..00bc8369b 100644 --- a/lisp/org-vm.el +++ b/lisp/org-vm.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.04a +;; Version: 6.04b ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-wl.el b/lisp/org-wl.el index 647c23bcf..d02fb3201 100644 --- a/lisp/org-wl.el +++ b/lisp/org-wl.el @@ -5,7 +5,7 @@ ;; Author: Tokuya Kameshima ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.04a +;; Version: 6.04b ;; ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org.el b/lisp/org.el index 646e8b3a6..2b7a61e5e 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.04a +;; Version: 6.04b ;; ;; This file is part of GNU Emacs. ;; @@ -91,7 +91,7 @@ ;;; Version -(defconst org-version "6.04a" +(defconst org-version "6.04b" "The version number of the file org.el.") (defun org-version (&optional here) -- 2.11.4.GIT