From 2b2e853b1b692b95abc9f319744fa4e76902d618 Mon Sep 17 00:00:00 2001 From: Eric Schulte Date: Tue, 3 Jan 2012 11:44:32 -0700 Subject: [PATCH 01/30] fixed bug in org-babel-balanced-split when run on Emacs22 Thanks to Martyn Jago for the test case * lisp/ob.el (org-babel-balanced-split): Explicit checking if list before calling member. * testing/lisp/test-ob.el (test-ob/org-babel-balanced-split): Testing the new Emacs22-proof behavior. --- testing/lisp/test-ob.el | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/testing/lisp/test-ob.el b/testing/lisp/test-ob.el index 988ef3358..3c6b27db8 100644 --- a/testing/lisp/test-ob.el +++ b/testing/lisp/test-ob.el @@ -618,16 +618,6 @@ on two lines (buffer-substring-no-properties (point-min) (point-max))))))) -(ert-deftest test-org-babel/inline-src-block-enclosed-within-parenthesis () - (let ((test-line "{src_emacs-lisp[ :results verbatim ]{ \"x\" }")) - (org-test-with-temp-text - (concat test-line "}") - (forward-char 1) - (org-ctrl-c-ctrl-c) - (should (string= (concat test-line " =\"x\"=}") - (buffer-substring-no-properties - (point-min) (point-max))))))) - (ert-deftest test-org-babel/inline-src_blk-preceded-by-letter () "Test inline source block invalid where preceded by letter" From e9fd334eb4ce4253875d84c34cb9ab750794fda5 Mon Sep 17 00:00:00 2001 From: Jambunathan K Date: Tue, 17 Jan 2012 02:25:47 +0530 Subject: [PATCH 03/30] Add support for indented tables in ODT export * etc/styles/OrgOdtContentTemplate.xml (OrgIndentedSection-Level-*): New section styles. These sections are indented to the same level as the corresponding list entries. These sections hold tables that occur within a list. (OrgTable): Increased relative width from 90% to 96% for aesthetic reasons. * lisp/org-odt.el (org-odt-table-indentedp): New variable (org-odt-begin-table): Modified. If the table is within a list, temporarily leave the list and begin an indented section before emitting the table. (org-odt-end-table): Modified. If the table was within a list, close the indented section and re-open the list immediately after ending the table. (org-odt-continue-list, org-odt-discontinue-list): Helper routines to temporarily discontinue and continue a list. (org-odt-list-stack-stashed): New variable to hold the state of a pending list. (org-odt-begin-list, org-odt-begin-list-item) (org-odt-end-list-item): Modified. Handle nitty-gritties for continuing a list and list item. (org-odt-section-count): New variable that keeps track of section count. Used in conjunction with naming of sections. (org-odt-begin-section, org-odt-end-section): New defuns. (org-odt-init-outfile): Initialize `org-odt-list-stack-stashed' and `org-odt-section-count'. * lisp/org-lparse.el (org-lparse-list-item-count): Removed. Was a superfluous variable. (org-lparse-list-level): Removed. Now derived from `org-lparse-list-stack'. (org-lparse-list-stack): New. List that records the list types - ordered, unordered or descriptive - in the following order: self, parent, grand-parent etc. (org-do-lparse): Added, removed above let-bound vars. Disallowed regular tables within list-table block. (org-lparse-begin-list, org-lparse-end-list) (org-lparse-begin-list-item, org-lparse-end-list-item): Propagate above changes. OpenDocument doesn't permit tables to occur in the middle of a list. Use list continuations and indented sections to typeset indented tables. Fixes the following bug: http://lists.gnu.org/archive/html/emacs-orgmode/2012-01/msg00515.html --- etc/styles/OrgOdtContentTemplate.xml | 55 +++++++++++- lisp/org-lparse.el | 129 +++++++++++++-------------- lisp/org-odt.el | 65 ++++++++++++-- 3 files changed, 172 insertions(+), 77 deletions(-) diff --git a/etc/styles/OrgOdtContentTemplate.xml b/etc/styles/OrgOdtContentTemplate.xml index f4982f620..d981631fb 100644 --- a/etc/styles/OrgOdtContentTemplate.xml +++ b/etc/styles/OrgOdtContentTemplate.xml @@ -45,8 +45,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/lisp/org-lparse.el b/lisp/org-lparse.el index 8c98ea767..4d88ba062 100644 --- a/lisp/org-lparse.el +++ b/lisp/org-lparse.el @@ -603,11 +603,7 @@ version." (org-lparse-par-open-stashed 0) ;; list related vars - (org-lparse-list-level 0) ; list level starts at 1. A - ; value of 0 implies we are - ; outside of any list - (org-lparse-list-item-count 0) - org-lparse-list-stack + (org-lparse-list-stack '()) ;; list-table related vars org-lparse-list-table-p @@ -1086,10 +1082,11 @@ version." table-buffer (nreverse table-buffer) table-orig-buffer (nreverse table-orig-buffer)) (org-lparse-end-paragraph) + (when org-lparse-list-table-p + (error "Regular tables are not allowed in a list-table block")) (org-lparse-insert 'TABLE table-buffer table-orig-buffer))) ;; Normal lines - (t ;; This line either is list item or end a list. (when (get-text-property 0 'list-item line) @@ -2109,8 +2106,6 @@ When TITLE is nil, just close all open levels." ("d" . description))))) ;; following vars are bound during `org-do-lparse' -(defvar org-lparse-list-level) -(defvar org-lparse-list-item-count) (defvar org-lparse-list-stack) (defvar org-lparse-list-table:table-row) (defvar org-lparse-list-table:lines) @@ -2152,73 +2147,69 @@ When TITLE is nil, just close all open levels." ;; https://lists.gnu.org/archive/html/emacs-orgmode/2011-03/msg01101.html (defun org-lparse-begin-list (ltype) - (incf org-lparse-list-level) - (push org-lparse-list-item-count org-lparse-list-stack) - (setq org-lparse-list-item-count 0) - (cond - ((not org-lparse-list-table-p) - (org-lparse-begin 'LIST ltype)) - ;; process LIST-TABLE - ((= 1 org-lparse-list-level) - ;; begin LIST-TABLE - (setq org-lparse-list-table:lines nil) - (setq org-lparse-list-table:table-row nil)) - ((= 2 org-lparse-list-level) - (ignore)) - (t - (org-lparse-begin 'LIST ltype)))) + (push ltype org-lparse-list-stack) + (let ((list-level (length org-lparse-list-stack))) + (cond + ((not org-lparse-list-table-p) + (org-lparse-begin 'LIST ltype)) + ;; process LIST-TABLE + ((= 1 list-level) + ;; begin LIST-TABLE + (setq org-lparse-list-table:lines nil) + (setq org-lparse-list-table:table-row nil)) + ((= 2 list-level) + (ignore)) + (t + (org-lparse-begin 'LIST ltype))))) (defun org-lparse-end-list (ltype) - (setq org-lparse-list-item-count (pop org-lparse-list-stack)) - (decf org-lparse-list-level) - (cond - ((not org-lparse-list-table-p) - (org-lparse-end 'LIST ltype)) - ;; process LIST-TABLE - ((= 0 org-lparse-list-level) - ;; end LIST-TABLE - (insert (org-lparse-format-list-table - (nreverse org-lparse-list-table:lines)))) - ((= 1 org-lparse-list-level) - (ignore)) - (t - (org-lparse-end 'LIST ltype)))) + (pop org-lparse-list-stack) + (let ((list-level (length org-lparse-list-stack))) + (cond + ((not org-lparse-list-table-p) + (org-lparse-end 'LIST ltype)) + ;; process LIST-TABLE + ((= 0 list-level) + ;; end LIST-TABLE + (insert (org-lparse-format-list-table + (nreverse org-lparse-list-table:lines)))) + ((= 1 list-level) + (ignore)) + (t + (org-lparse-end 'LIST ltype))))) (defun org-lparse-begin-list-item (ltype &optional arg headline) - (incf org-lparse-list-item-count) - (cond - ((not org-lparse-list-table-p) - (org-lparse-begin 'LIST-ITEM ltype arg headline)) - ;; process LIST-TABLE - ((and (= 1 org-lparse-list-level) - (= 1 org-lparse-list-item-count)) - ;; begin TABLE-ROW for LIST-TABLE - (setq org-lparse-list-table:table-row nil) - (org-lparse-begin-list-table:table-cell)) - ((and (= 2 org-lparse-list-level) - (= 1 org-lparse-list-item-count)) - ;; begin TABLE-CELL for LIST-TABLE - (org-lparse-begin-list-table:table-cell)) - (t - (org-lparse-begin 'LIST-ITEM ltype arg headline)))) + (let ((list-level (length org-lparse-list-stack))) + (cond + ((not org-lparse-list-table-p) + (org-lparse-begin 'LIST-ITEM ltype arg headline)) + ;; process LIST-TABLE + ((= 1 list-level) + ;; begin TABLE-ROW for LIST-TABLE + (setq org-lparse-list-table:table-row nil) + (org-lparse-begin-list-table:table-cell)) + ((= 2 list-level) + ;; begin TABLE-CELL for LIST-TABLE + (org-lparse-begin-list-table:table-cell)) + (t + (org-lparse-begin 'LIST-ITEM ltype arg headline))))) (defun org-lparse-end-list-item (ltype) - (decf org-lparse-list-item-count) - (cond - ((not org-lparse-list-table-p) - (org-lparse-end 'LIST-ITEM ltype)) - ;; process LIST-TABLE - ((and (= 1 org-lparse-list-level) - (= 0 org-lparse-list-item-count)) - ;; end TABLE-ROW for LIST-TABLE - (org-lparse-end-list-table:table-cell) - (push (nreverse org-lparse-list-table:table-row) - org-lparse-list-table:lines)) - ((= 2 org-lparse-list-level) - ;; end TABLE-CELL for LIST-TABLE - (org-lparse-end-list-table:table-cell)) - (t - (org-lparse-end 'LIST-ITEM ltype)))) + (let ((list-level (length org-lparse-list-stack))) + (cond + ((not org-lparse-list-table-p) + (org-lparse-end 'LIST-ITEM ltype)) + ;; process LIST-TABLE + ((= 1 list-level) + ;; end TABLE-ROW for LIST-TABLE + (org-lparse-end-list-table:table-cell) + (push (nreverse org-lparse-list-table:table-row) + org-lparse-list-table:lines)) + ((= 2 list-level) + ;; end TABLE-CELL for LIST-TABLE + (org-lparse-end-list-table:table-cell)) + (t + (org-lparse-end 'LIST-ITEM ltype))))) (defvar org-lparse-list-table:table-cell-open) (defun org-lparse-begin-list-table:table-cell () diff --git a/lisp/org-odt.el b/lisp/org-odt.el index 838a327b0..7cff0462d 100644 --- a/lisp/org-odt.el +++ b/lisp/org-odt.el @@ -648,6 +648,15 @@ PUB-DIR is set, use this as the publishing directory." (defun org-odt-end-outline-text () (ignore)) +(defvar org-odt-section-count 0) +(defun org-odt-begin-section (style &optional name) + (setq name (or name (format "Section-%d" (incf org-odt-section-count)))) + (org-lparse-insert-tag + "" style name)) + +(defun org-odt-end-section () + (org-lparse-insert-tag "")) + (defun org-odt-begin-paragraph (&optional style) (org-lparse-insert-tag "" (org-odt-get-extra-attrs-for-paragraph-style style))) @@ -731,13 +740,17 @@ PUB-DIR is set, use this as the publishing directory." (list)) (t (error "Unknown environment %s" style)))) -(defvar org-lparse-list-level) ; dynamically bound in org-do-lparse +(defvar org-lparse-list-stack) ; dynamically bound in org-do-lparse +(defvar org-odt-list-stack-stashed) (defun org-odt-begin-list (ltype) (setq ltype (or (org-lparse-html-list-type-to-canonical-list-type ltype) ltype)) (let* ((style-name (org-odt-get-style-name-for-entity 'list ltype)) - (extra (concat (when (= org-lparse-list-level 1) - " text:continue-numbering=\"false\"") + (extra (concat (if (or org-lparse-list-table-p + (and (= 1 (length org-lparse-list-stack)) + (null org-odt-list-stack-stashed))) + " text:continue-numbering=\"false\"" + " text:continue-numbering=\"true\"") (when style-name (format " text:style-name=\"%s\"" style-name))))) (case ltype @@ -760,11 +773,15 @@ PUB-DIR is set, use this as the publishing directory." (ordered (assert (not headline) t) (let* ((counter arg) (extra "")) - (org-lparse-insert-tag "") + (org-lparse-insert-tag (if (= (length org-lparse-list-stack) + (length org-odt-list-stack-stashed)) + "" "")) (org-lparse-begin-paragraph))) (unordered (let* ((id arg) (extra "")) - (org-lparse-insert-tag "") + (org-lparse-insert-tag (if (= (length org-lparse-list-stack) + (length org-odt-list-stack-stashed)) + "" "")) (org-lparse-begin-paragraph) (insert (if headline (org-odt-format-target headline id) (org-odt-format-bookmark "" id))))) @@ -785,13 +802,30 @@ PUB-DIR is set, use this as the publishing directory." ltype)) (case ltype ((ordered unordered) - (org-lparse-insert-tag "")) + (org-lparse-insert-tag (if (= (length org-lparse-list-stack) + (length org-odt-list-stack-stashed)) + (prog1 "" + (setq org-odt-list-stack-stashed nil)) + ""))) (description (org-lparse-end-list-item-1) (org-lparse-end-list 'description) (org-lparse-end-list-item-1)) (t (error "Unknown list type")))) +(defun org-odt-discontinue-list () + (let ((stashed-stack org-lparse-list-stack)) + (loop for list-type in stashed-stack + do (org-lparse-end-list-item-1 list-type) + (org-lparse-end-list list-type)) + (setq org-odt-list-stack-stashed stashed-stack))) + +(defun org-odt-continue-list () + (setq org-odt-list-stack-stashed (nreverse org-odt-list-stack-stashed)) + (loop for list-type in org-odt-list-stack-stashed + do (org-lparse-begin-list list-type) + (org-lparse-begin-list-item list-type))) + ;; Following variables are let bound when table emission is in ;; progress. See org-lparse.el. (defvar org-lparse-table-begin-marker) @@ -899,7 +933,19 @@ style from the list." :key-type symbol :value-type (const :tag "True" t)))))) +(defvar org-odt-table-indentedp nil) (defun org-odt-begin-table (caption label attributes) + (setq org-odt-table-indentedp (not (null org-lparse-list-stack))) + (when org-odt-table-indentedp + ;; Within the Org file, the table is appearing within a list item. + ;; OpenDocument doesn't allow table to appear within list items. + ;; Temporarily terminate the list, emit the table and then + ;; re-continue the list. + (org-odt-discontinue-list) + ;; Put the Table in an indented section. + (let ((level (length org-odt-list-stack-stashed))) + (org-odt-begin-section (format "OrgIndentedSection-Level-%d" level)))) + (setq org-odt-table-style attributes) (setq org-odt-table-style-spec (assoc org-odt-table-style org-export-odt-table-styles)) @@ -942,7 +988,10 @@ style from the list." ((equal spec "table-cell:style-name") (replace-match table-cell-style t t)))))) (goto-char (point-max)) - (org-lparse-insert-tag "")) + (org-lparse-insert-tag "") + (when org-odt-table-indentedp + (org-odt-end-section) + (org-odt-continue-list))) (defun org-odt-begin-table-rowgroup (&optional is-header-row) (when org-lparse-table-rowgrp-open @@ -2055,7 +2104,9 @@ CATEGORY-HANDLE is used. See (setq org-odt-manifest-file-entries nil org-odt-embedded-images-count 0 org-odt-embedded-formulas-count 0 + org-odt-section-count 0 org-odt-entity-labels-alist nil + org-odt-list-stack-stashed nil org-odt-entity-counts-plist nil) content-file)) From 4da551b600e906136a8ca0d1101ca8f81abd2288 Mon Sep 17 00:00:00 2001 From: Jambunathan K Date: Fri, 20 Jan 2012 00:08:18 +0530 Subject: [PATCH 04/30] Honor user-specified width in captioned images * lisp/org-odt.el (org-odt-format-textbox): Honor user-specified width in captioned images. Fix for bug reported here: http://lists.gnu.org/archive/html/emacs-orgmode/2012-01/msg00641.html --- lisp/org-odt.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/org-odt.el b/lisp/org-odt.el index 7cff0462d..a21995b23 100644 --- a/lisp/org-odt.el +++ b/lisp/org-odt.el @@ -1765,7 +1765,8 @@ ATTR is a string of other attributes of the a element." (org-odt-format-tags '("" . "") text (concat (format " fo:min-height=\"%0.2fcm\"" (or height .2)) - (format " fo:min-width=\"%0.2fcm\"" (or width .2)))) + (unless width + (format " fo:min-width=\"%0.2fcm\"" (or width .2))))) width nil style extra anchor-type)) (defun org-odt-format-inlinetask (heading content From 6bd7c7d042937d7fcaec12a672b4f087d81c6dfa Mon Sep 17 00:00:00 2001 From: David Maus Date: Tue, 24 Jan 2012 06:41:49 +0100 Subject: [PATCH 07/30] Don't search for position in existing list if :exact-position MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * org-capture.el (org-capture-place-item): Don't search for position in existing list if :exact-position was supplied. This fixes a bug reported by François Pinard in . --- lisp/org-capture.el | 46 ++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/lisp/org-capture.el b/lisp/org-capture.el index e0c75b59e..85f7f8b5a 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -911,30 +911,30 @@ it. When it is a variable, retrieve the value. Return whatever we get." (target-entry-p (org-capture-get :target-entry-p)) (ind 0) beg end) - (cond - ((org-capture-get :exact-position) - (goto-char (org-capture-get :exact-position))) - ((not target-entry-p) - ;; Insert as top-level entry, either at beginning or at end of file - (setq beg (point-min) end (point-max))) - (t - (setq beg (1+ (point-at-eol)) - end (save-excursion (outline-next-heading) (point))))) - (if (org-capture-get :prepend) - (progn - (goto-char beg) - (if (org-list-search-forward (org-item-beginning-re) end t) - (progn - (goto-char (match-beginning 0)) - (setq ind (org-get-indentation))) - (goto-char end) - (setq ind 0))) - (goto-char end) - (if (org-list-search-backward (org-item-beginning-re) beg t) + (if (org-capture-get :exact-position) + (goto-char (org-capture-get :exact-position)) + (cond + ((not target-entry-p) + ;; Insert as top-level entry, either at beginning or at end of file + (setq beg (point-min) end (point-max))) + (t + (setq beg (1+ (point-at-eol)) + end (save-excursion (outline-next-heading) (point))))) + (if (org-capture-get :prepend) (progn - (setq ind (org-get-indentation)) - (org-end-of-item)) - (setq ind 0))) + (goto-char beg) + (if (org-list-search-forward (org-item-beginning-re) end t) + (progn + (goto-char (match-beginning 0)) + (setq ind (org-get-indentation))) + (goto-char end) + (setq ind 0))) + (goto-char end) + (if (org-list-search-backward (org-item-beginning-re) beg t) + (progn + (setq ind (org-get-indentation)) + (org-end-of-item)) + (setq ind 0)))) ;; Remove common indentation (setq txt (org-remove-indentation txt)) ;; Make sure this is indeed an item From 8c16d854769b6ebf614f14795a1fe11111e88fad Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Thu, 26 Jan 2012 09:24:51 +0100 Subject: [PATCH 08/30] org.el: `org-preview-latex-fragment' requires a buffer file name. * org.el (org-preview-latex-fragment): Throw an error when called from a non-file buffer. This take care of this bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3768 --- lisp/org.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/org.el b/lisp/org.el index 0d06231ff..55b32b651 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -16713,6 +16713,8 @@ the cursor is before the first headline, display all fragments in the buffer. The images can be removed again with \\[org-ctrl-c-ctrl-c]." (interactive "P") + (unless buffer-file-name + (error "Can't preview LaTeX fragment in a non-file buffer")) (org-remove-latex-fragment-image-overlays) (save-excursion (save-restriction From 2ac428a21d544b35831265cad0df9a1372b268f2 Mon Sep 17 00:00:00 2001 From: Jambunathan K Date: Fri, 27 Jan 2012 12:50:19 +0530 Subject: [PATCH 09/30] org-odt.el: Honor "[TABLE-OF-CONTENTS]" directive * lisp/org-odt.el (org-odt-format-preamble): Don't insert TOC here. Delay it till the end of export. (org-odt-begin-document-body): Make a note of the default position of TOC in `org-lparse-dyn-first-heading-pos'. (org-odt-insert-toc): Insert TOC as directed by [TABLE-OF-CONTENTS] line or at the default position. (org-odt-end-export): Call `org-odt-insert-toc'. Fix for the following bug: http://lists.gnu.org/archive/html/emacs-orgmode/2012-01/msg00974.html --- lisp/org-odt.el | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/lisp/org-odt.el b/lisp/org-odt.el index a21995b23..19c21d199 100644 --- a/lisp/org-odt.el +++ b/lisp/org-odt.el @@ -35,7 +35,20 @@ :tag "Org Export ODT" :group 'org-export) +(defun org-odt-insert-toc () + (goto-char (point-min)) + (cond + ((re-search-forward + "\\(]*>\\)?\\s-*\\[TABLE-OF-CONTENTS\\]\\s-*\\(\\)?" + nil t) + (goto-char (match-beginning 0)) + (replace-match "")) + (t + (goto-char org-lparse-dyn-first-heading-pos)) + (insert (org-odt-format-toc)))) + (defun org-odt-end-export () + (org-odt-insert-toc) (org-odt-fixup-label-references) ;; remove empty paragraphs @@ -611,13 +624,12 @@ PUB-DIR is set, use this as the publishing directory." '("" . "") date "N75" iso-date)) ;; separator - "")) - ;; toc - (org-odt-format-toc)))) + ""))))) (defun org-odt-begin-document-body (opt-plist) (org-odt-begin-office-body) - (insert (org-odt-format-preamble opt-plist))) + (insert (org-odt-format-preamble opt-plist)) + (setq org-lparse-dyn-first-heading-pos (point))) (defvar org-lparse-body-only) ; let bound during org-do-lparse (defvar org-lparse-to-buffer) ; let bound during org-do-lparse From 2bbb8b99f4870f0f03ef9879a2eabb3e3b0aa487 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Sun, 29 Jan 2012 00:18:46 +0100 Subject: [PATCH 10/30] org.el: Fix bug: hide drawers in inline tasks too. * org.el (org-cycle-internal-local): Fix bug: hide drawers in inline tasks too. --- lisp/org.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/org.el b/lisp/org.el index 55b32b651..ff59b6779 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -6313,6 +6313,8 @@ in special contexts. (org-list-set-item-visibility (point-at-bol) struct 'children) (org-show-entry) (show-children) + (when (memq 'org-cycle-hide-drawers org-cycle-hook) + (org-cycle-hide-drawers 'subtree)) ;; Fold every list in subtree to top-level items. (when (eq org-cycle-include-plain-lists 'integrate) (save-excursion From 4b84ca41d7b280593c56e906d60c2eec2676d753 Mon Sep 17 00:00:00 2001 From: David Maus Date: Wed, 8 Feb 2012 19:27:32 +0100 Subject: [PATCH 11/30] Don't format tags in title if title headline does not have tags * org-exp.el (org-export-get-title-from-subtree): Don't format tags in title if title headline does not have tags. Fixes a bug reported by John Hendy in . --- lisp/org-exp.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org-exp.el b/lisp/org-exp.el index 9b06c5db2..be7c82890 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -2195,7 +2195,7 @@ can work correctly." ;; This is a subtree, we take the title from the first heading (goto-char rbeg) (looking-at org-todo-line-tags-regexp) - (setq title (if (eq tags t) + (setq title (if (and (eq tags t) (match-string 4)) (format "%s\t%s" (match-string 3) (match-string 4)) (match-string 3))) (org-unmodified From 79105c48e2ce7273cc38f523dd4b1b0b70450b00 Mon Sep 17 00:00:00 2001 From: David Maus Date: Wed, 8 Feb 2012 20:09:48 +0100 Subject: [PATCH 12/30] Moved `org-in-clocktable-p' from org-clock.el to org.el * org-clock.el (org-in-clocktable-p): Moved to org.el. * org.el (org-in-clocktable-p): New function. Moved from org-clock.el Fixes a bug reported by suvayu ali in . `org-context' depends on the function but org.el does not depend on org-clock.el. --- lisp/org-clock.el | 11 ----------- lisp/org.el | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 411e3a4bc..793ae57d3 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -1763,17 +1763,6 @@ buffer and update it." (org-combine-plists org-clock-clocktable-default-properties props)))) (org-update-dblock)) -(defun org-in-clocktable-p () - "Check if the cursor is in a clocktable." - (let ((pos (point)) start) - (save-excursion - (end-of-line 1) - (and (re-search-backward "^[ \t]*#\\+BEGIN:[ \t]+clocktable" nil t) - (setq start (match-beginning 0)) - (re-search-forward "^[ \t]*#\\+END:.*" nil t) - (>= (match-end 0) pos) - start)))) - (defun org-day-of-week (day month year) "Returns the day of the week as an integer." (nth 6 diff --git a/lisp/org.el b/lisp/org.el index ff59b6779..8139ce749 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -19275,6 +19275,17 @@ With prefix arg UNCOMPILED, load the uncompiled versions." (eval form) (error (format "%%![Error: %s]" error)))) +(defun org-in-clocktable-p () + "Check if the cursor is in a clocktable." + (let ((pos (point)) start) + (save-excursion + (end-of-line 1) + (and (re-search-backward "^[ \t]*#\\+BEGIN:[ \t]+clocktable" nil t) + (setq start (match-beginning 0)) + (re-search-forward "^[ \t]*#\\+END:.*" nil t) + (>= (match-end 0) pos) + start)))) + (defun org-in-commented-line () "Is point in a line starting with `#'?" (equal (char-after (point-at-bol)) ?#)) From 37e35d2bb55dd5d478f43d87f188731f725a2946 Mon Sep 17 00:00:00 2001 From: David Maus Date: Sun, 12 Feb 2012 19:38:20 +0100 Subject: [PATCH 13/30] Fix highlighting in sparse-tree * org.el (org-scan-tags): Fix highlighting in sparse-tree. `org-get-heading' uses `org-heading-regexp' introduced by dfcb6faef11a2439b56b18a6289803361d402130 but `org-scan-tags' assumed match groups of the old regular expression. This should fix a bug reported by Suvayu Ali in <20120209032255.431e8197@kuru.dyndns-at-home.com>. --- lisp/org.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org.el b/lisp/org.el index 8139ce749..b69b20f5d 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -12879,7 +12879,7 @@ headlines matching this string." (and org-highlight-sparse-tree-matches (org-get-heading) (match-end 0) (org-highlight-new-match - (match-beginning 0) (match-beginning 1))) + (match-beginning 1) (match-end 1))) (org-show-context 'tags-tree)) ((eq action 'agenda) (setq txt (org-agenda-format-item From 2d4b9c05f2dfbabcfc7ba161b9524233559ec811 Mon Sep 17 00:00:00 2001 From: "Toby S. Cubitt" Date: Wed, 8 Feb 2012 10:21:13 +0100 Subject: [PATCH 14/30] Fix bug in org-goto `outline-path-completion' interface * lisp/org.el (org-goto): call org-refile-get-location with NO-EXCLUDE argument set, otherwise not only are headlines in the current subtree excluded, but it throws an error if point happens not to be within a subtree (e.g. at start of buffer). TINYCHANGE --- lisp/org.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org.el b/lisp/org.el index b69b20f5d..920fc59bc 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -6822,7 +6822,7 @@ hierarchy above." (selected-point (if (eq interface 'outline) (car (org-get-location (current-buffer) org-goto-help)) - (let ((pa (org-refile-get-location "Goto"))) + (let ((pa (org-refile-get-location "Goto" nil nil t))) (org-refile-check-position pa) (nth 3 pa))))) (if selected-point From ff2b00b7ac7d68742b97036d45b2e9735f2f35da Mon Sep 17 00:00:00 2001 From: David Maus Date: Sat, 18 Feb 2012 11:21:05 +0100 Subject: [PATCH 15/30] Use `with-selected-window' to select calendar window * org.el (org-recenter-calendar): Use `with-selected-window' to select calendar window and save currently selected window and current buffer. Fixes a bug reported by Thomas Morgan in . --- lisp/org.el | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 920fc59bc..93f03d6f3 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -16092,14 +16092,12 @@ in the timestamp determines what will be changed." (defun org-recenter-calendar (date) "If the calendar is visible, recenter it to DATE." - (let* ((win (selected-window)) - (cwin (get-buffer-window "*Calendar*" t)) - (calendar-move-hook nil)) + (let ((cwin (get-buffer-window "*Calendar*" t))) (when cwin - (select-window cwin) - (calendar-goto-date (if (listp date) date - (calendar-gregorian-from-absolute date))) - (select-window win)))) + (let ((calendar-move-hook nil)) + (with-selected-window cwin + (calendar-goto-date (if (listp date) date + (calendar-gregorian-from-absolute date)))))))) (defun org-goto-calendar (&optional arg) "Go to the Emacs calendar at the current date. From 01f7b698a73771bc79d34b1c1dcc6859ce8242fc Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Wed, 4 Jan 2012 15:11:23 +0100 Subject: [PATCH 16/30] More copyright year fixes. --- contrib/lisp/org-elisp-symbol.el | 2 +- contrib/lisp/org-expiry.el | 2 +- contrib/lisp/org-interactive-query.el | 2 +- contrib/lisp/org-mac-link-grabber.el | 2 +- contrib/lisp/org-toc.el | 2 +- contrib/lisp/org-wikinodes.el | 2 +- lisp/ob-js.el | 2 +- lisp/ob-org.el | 2 +- lisp/ob-scheme.el | 2 +- lisp/ob-shen.el | 2 +- lisp/org-capture.el | 2 +- lisp/org-entities.el | 2 +- lisp/org-lparse.el | 2 +- lisp/org-odt.el | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/contrib/lisp/org-elisp-symbol.el b/contrib/lisp/org-elisp-symbol.el index 340272b86..96b0e5d12 100644 --- a/contrib/lisp/org-elisp-symbol.el +++ b/contrib/lisp/org-elisp-symbol.el @@ -1,6 +1,6 @@ ;;; org-elisp-symbol.el --- Org links to emacs-lisp symbols ;; -;; Copyright 2007-2011 Free Software Foundation, Inc. +;; Copyright 2007-2012 Free Software Foundation, Inc. ;; ;; Author: bzg AT gnu DOT org ;; Version: 0.2 diff --git a/contrib/lisp/org-expiry.el b/contrib/lisp/org-expiry.el index bc4840b7b..88a1ab28a 100644 --- a/contrib/lisp/org-expiry.el +++ b/contrib/lisp/org-expiry.el @@ -1,6 +1,6 @@ ;;; org-expiry.el --- expiry mechanism for Org entries ;; -;; Copyright 2007-2011 Free Software Foundation, Inc. +;; Copyright 2007-2012 Free Software Foundation, Inc. ;; ;; Author: bzg AT gnu DOT org ;; Version: 0.2 diff --git a/contrib/lisp/org-interactive-query.el b/contrib/lisp/org-interactive-query.el index 936e43dda..6bf40f8d0 100644 --- a/contrib/lisp/org-interactive-query.el +++ b/contrib/lisp/org-interactive-query.el @@ -1,6 +1,6 @@ ;;; org-interactive-query.el --- Interactive modification of agenda query ;; -;; Copyright 2007-2011 Free Software Foundation, Inc. +;; Copyright 2007-2012 Free Software Foundation, Inc. ;; ;; Author: Christopher League ;; Version: 1.0 diff --git a/contrib/lisp/org-mac-link-grabber.el b/contrib/lisp/org-mac-link-grabber.el index e526b1a30..1644fc49e 100644 --- a/contrib/lisp/org-mac-link-grabber.el +++ b/contrib/lisp/org-mac-link-grabber.el @@ -1,7 +1,7 @@ ;;; org-mac-link-grabber.el --- Grab links and url from various mac ;;; application and insert them as links into org-mode documents ;; -;; Copyright (c) 2010-2011 Free Software Foundation, Inc. +;; Copyright (c) 2010-2012 Free Software Foundation, Inc. ;; ;; Author: Anthony Lander ;; Version: 1.0.1 diff --git a/contrib/lisp/org-toc.el b/contrib/lisp/org-toc.el index 3e3b97245..1c9752b49 100644 --- a/contrib/lisp/org-toc.el +++ b/contrib/lisp/org-toc.el @@ -1,6 +1,6 @@ ;;; org-toc.el --- Table of contents for Org-mode buffer -;; Copyright 2007-2011 Free Software Foundation, Inc. +;; Copyright 2007-2012 Free Software Foundation, Inc. ;; ;; Author: Bastien Guerry ;; Keywords: Org table of contents diff --git a/contrib/lisp/org-wikinodes.el b/contrib/lisp/org-wikinodes.el index 7a65a4bb7..a5a5b1978 100644 --- a/contrib/lisp/org-wikinodes.el +++ b/contrib/lisp/org-wikinodes.el @@ -1,6 +1,6 @@ ;;; org-wikinodes.el --- Wiki-like CamelCase links to outline nodes -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/ob-js.el b/lisp/ob-js.el index e4379a29a..d71c0aba8 100644 --- a/lisp/ob-js.el +++ b/lisp/ob-js.el @@ -1,6 +1,6 @@ ;;; ob-js.el --- org-babel functions for Javascript -;; Copyright (C) 2010-2011 Free Software Foundation +;; Copyright (C) 2010-2012 Free Software Foundation ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, js diff --git a/lisp/ob-org.el b/lisp/ob-org.el index 32820e55f..d57f8b506 100644 --- a/lisp/ob-org.el +++ b/lisp/ob-org.el @@ -1,6 +1,6 @@ ;;; ob-org.el --- org-babel functions for org code block evaluation -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-scheme.el b/lisp/ob-scheme.el index 14198ba6a..d0d03dd74 100644 --- a/lisp/ob-scheme.el +++ b/lisp/ob-scheme.el @@ -1,6 +1,6 @@ ;;; ob-scheme.el --- org-babel functions for Scheme -;; Copyright (C) 2010-2011 Free Software Foundation +;; Copyright (C) 2010-2012 Free Software Foundation ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, scheme diff --git a/lisp/ob-shen.el b/lisp/ob-shen.el index ccf3030b9..7207cd935 100644 --- a/lisp/ob-shen.el +++ b/lisp/ob-shen.el @@ -1,6 +1,6 @@ ;;; ob-shen.el --- org-babel functions for Shen -;; Copyright (C) 2010-2011 Free Software Foundation +;; Copyright (C) 2010-2012 Free Software Foundation ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, shen diff --git a/lisp/org-capture.el b/lisp/org-capture.el index 85f7f8b5a..8cc503509 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -1,6 +1,6 @@ ;;; org-capture.el --- Fast note taking in Org-mode -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org-entities.el b/lisp/org-entities.el index eb6994e71..fe3c52892 100644 --- a/lisp/org-entities.el +++ b/lisp/org-entities.el @@ -1,6 +1,6 @@ ;;; org-entities.el --- Support for special entities in Org-mode -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik , ;; Ulf Stegemann diff --git a/lisp/org-lparse.el b/lisp/org-lparse.el index 4d88ba062..f0a62abc2 100644 --- a/lisp/org-lparse.el +++ b/lisp/org-lparse.el @@ -1,6 +1,6 @@ ;;; org-lparse.el --- Line-oriented parser-exporter for Org-mode -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Jambunathan K ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org-odt.el b/lisp/org-odt.el index 19c21d199..86f9c0c71 100644 --- a/lisp/org-odt.el +++ b/lisp/org-odt.el @@ -1,6 +1,6 @@ ;;; org-odt.el --- OpenDocumentText export for Org-mode -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Jambunathan K ;; Keywords: outlines, hypermedia, calendar, wp From aca43d416283d4c5128ee25ce0c3cbd62da485df Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Wed, 4 Jan 2012 15:47:43 +0100 Subject: [PATCH 17/30] More copyright year fixes. --- lisp/ob-C.el | 2 +- lisp/ob-calc.el | 2 +- lisp/ob-ledger.el | 2 +- lisp/ob-lilypond.el | 2 +- lisp/ob-matlab.el | 2 +- lisp/ob-mscgen.el | 2 +- lisp/ob-octave.el | 2 +- lisp/ob-picolisp.el | 2 +- lisp/ob-plantuml.el | 2 +- lisp/ob-sqlite.el | 2 +- lisp/org-crypt.el | 2 +- lisp/org-mks.el | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lisp/ob-C.el b/lisp/ob-C.el index dccf6b2b0..4f33fc453 100644 --- a/lisp/ob-C.el +++ b/lisp/ob-C.el @@ -1,6 +1,6 @@ ;;; ob-C.el --- org-babel functions for C and similar languages -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-calc.el b/lisp/ob-calc.el index 0b0cfd4b1..6686c2754 100644 --- a/lisp/ob-calc.el +++ b/lisp/ob-calc.el @@ -1,6 +1,6 @@ ;;; ob-calc.el --- org-babel functions for calc code evaluation -;; Copyright (C) 2010-2011 Free Software Foundation, Inc +;; Copyright (C) 2010-2012 Free Software Foundation, Inc ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-ledger.el b/lisp/ob-ledger.el index 7556ca191..e9c142712 100644 --- a/lisp/ob-ledger.el +++ b/lisp/ob-ledger.el @@ -1,6 +1,6 @@ ;;; ob-ledger.el --- org-babel functions for ledger evaluation -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Eric S Fraga ;; Keywords: literate programming, reproducible research, accounting diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el index 1f817adb4..1f412fd96 100644 --- a/lisp/ob-lilypond.el +++ b/lisp/ob-lilypond.el @@ -1,6 +1,6 @@ ;;; ob-lilypond.el --- org-babel functions for lilypond evaluation -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Martyn Jago ;; Keywords: babel language, literate programming diff --git a/lisp/ob-matlab.el b/lisp/ob-matlab.el index 479100a80..717fc746d 100644 --- a/lisp/ob-matlab.el +++ b/lisp/ob-matlab.el @@ -1,6 +1,6 @@ ;;; ob-matlab.el --- org-babel support for matlab evaluation -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Dan Davison ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-mscgen.el b/lisp/ob-mscgen.el index 5e894717d..b40f9a39c 100644 --- a/lisp/ob-mscgen.el +++ b/lisp/ob-mscgen.el @@ -1,6 +1,6 @@ ;;; ob-msc.el --- org-babel functions for mscgen evaluation -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Juan Pechiar ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-octave.el b/lisp/ob-octave.el index 7de1455b8..9e8575768 100644 --- a/lisp/ob-octave.el +++ b/lisp/ob-octave.el @@ -1,6 +1,6 @@ ;;; ob-octave.el --- org-babel functions for octave and matlab evaluation -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Dan Davison ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-picolisp.el b/lisp/ob-picolisp.el index 75e3ae03f..1b39e923e 100644 --- a/lisp/ob-picolisp.el +++ b/lisp/ob-picolisp.el @@ -1,6 +1,6 @@ ;;; ob-picolisp.el --- org-babel functions for picolisp evaluation -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Authors: Thorsten Jolitz and Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-plantuml.el b/lisp/ob-plantuml.el index 9f60f583b..da700527f 100644 --- a/lisp/ob-plantuml.el +++ b/lisp/ob-plantuml.el @@ -1,6 +1,6 @@ ;;; ob-plantuml.el --- org-babel functions for plantuml evaluation -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Zhang Weize ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-sqlite.el b/lisp/ob-sqlite.el index 2439257f5..462f7c08c 100644 --- a/lisp/ob-sqlite.el +++ b/lisp/ob-sqlite.el @@ -1,6 +1,6 @@ ;;; ob-sqlite.el --- org-babel functions for sqlite database interaction -;; Copyright (C) 2010-2011 Free Software Foundation +;; Copyright (C) 2010-2012 Free Software Foundation ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/org-crypt.el b/lisp/org-crypt.el index f7644048f..f3e63b0fb 100644 --- a/lisp/org-crypt.el +++ b/lisp/org-crypt.el @@ -1,6 +1,6 @@ ;;; org-crypt.el --- Public key encryption for org-mode entries -;; Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc. ;; Emacs Lisp Archive Entry ;; Filename: org-crypt.el diff --git a/lisp/org-mks.el b/lisp/org-mks.el index 551404197..71405deeb 100644 --- a/lisp/org-mks.el +++ b/lisp/org-mks.el @@ -1,6 +1,6 @@ ;;; org-mks.el --- Multi-key-selection for Org-mode -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp From 16ea957cd0307e7df10925cf44327e30b553b999 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Wed, 4 Jan 2012 15:48:18 +0100 Subject: [PATCH 18/30] Copyright year fixes for contrib/. --- contrib/lisp/htmlize.el | 2 +- contrib/lisp/org-contacts.el | 2 +- contrib/lisp/org-mime.el | 2 +- contrib/lisp/org-notmuch.el | 2 +- contrib/lisp/org-registry.el | 2 +- contrib/lisp/org-screen.el | 2 +- contrib/lisp/org-secretary.el | 2 +- contrib/lisp/org-velocity.el | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/contrib/lisp/htmlize.el b/contrib/lisp/htmlize.el index 414e913a3..8952e99b6 100644 --- a/contrib/lisp/htmlize.el +++ b/contrib/lisp/htmlize.el @@ -1,6 +1,6 @@ ;; htmlize.el -- Convert buffer text and decorations to HTML. -;; Copyright (C) 1997-2011 Hrvoje Niksic +;; Copyright (C) 1997-2012 Hrvoje Niksic ;; Author: Hrvoje Niksic ;; Keywords: hypermedia, extensions diff --git a/contrib/lisp/org-contacts.el b/contrib/lisp/org-contacts.el index 74d68dc36..f2384830b 100644 --- a/contrib/lisp/org-contacts.el +++ b/contrib/lisp/org-contacts.el @@ -1,6 +1,6 @@ ;;; org-contacts.el --- Contacts management -;; Copyright (C) 2010-2011 Julien Danjou +;; Copyright (C) 2010-2012 Julien Danjou ;; Author: Julien Danjou ;; Keywords: outlines, hypermedia, calendar diff --git a/contrib/lisp/org-mime.el b/contrib/lisp/org-mime.el index ec638c166..72bdd68f5 100644 --- a/contrib/lisp/org-mime.el +++ b/contrib/lisp/org-mime.el @@ -1,6 +1,6 @@ ;;; org-mime.el --- org html export for text/html MIME emails -;; Copyright (C) 2010-2011 Eric Schulte +;; Copyright (C) 2010-2012 Eric Schulte ;; Author: Eric Schulte ;; Keywords: mime, mail, email, html diff --git a/contrib/lisp/org-notmuch.el b/contrib/lisp/org-notmuch.el index 87001ab95..11e06b842 100644 --- a/contrib/lisp/org-notmuch.el +++ b/contrib/lisp/org-notmuch.el @@ -1,6 +1,6 @@ ;;; org-notmuch.el --- Support for links to notmuch messages from within Org-mode -;; Copyright (C) 2010-2011 Matthieu Lemerre +;; Copyright (C) 2010-2012 Matthieu Lemerre ;; Author: Matthieu Lemerre ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/contrib/lisp/org-registry.el b/contrib/lisp/org-registry.el index 01d059d24..3b43ce25f 100644 --- a/contrib/lisp/org-registry.el +++ b/contrib/lisp/org-registry.el @@ -1,6 +1,6 @@ ;;; org-registry.el --- a registry for Org links ;; -;; Copyright 2007-2011 Bastien Guerry +;; Copyright 2007-2012 Bastien Guerry ;; ;; Emacs Lisp Archive Entry ;; Filename: org-registry.el diff --git a/contrib/lisp/org-screen.el b/contrib/lisp/org-screen.el index cab123ed5..ba74267e1 100644 --- a/contrib/lisp/org-screen.el +++ b/contrib/lisp/org-screen.el @@ -1,6 +1,6 @@ ;;; org-screen.el --- Integreate Org-mode with screen. -;; Copyright (c) 2008-2011 Andrew Hyatt +;; Copyright (c) 2008-2012 Andrew Hyatt ;; ;; Author: Andrew Hyatt ;; Maintainer: Carsten Dominik diff --git a/contrib/lisp/org-secretary.el b/contrib/lisp/org-secretary.el index 889848366..5db60f67e 100644 --- a/contrib/lisp/org-secretary.el +++ b/contrib/lisp/org-secretary.el @@ -1,5 +1,5 @@ ;;; org-secretary.el --- Team management with org-mode -;; Copyright (C) 2010-2011 Juan Reyero +;; Copyright (C) 2010-2012 Juan Reyero ;; ;; Author: Juan Reyero ;; Keywords: outlines, tasks, team, management diff --git a/contrib/lisp/org-velocity.el b/contrib/lisp/org-velocity.el index b288cda9a..7425d32af 100644 --- a/contrib/lisp/org-velocity.el +++ b/contrib/lisp/org-velocity.el @@ -1,6 +1,6 @@ ;;; org-velocity.el --- something like Notational Velocity for Org. -;; Copyright (C) 2010-2011 Paul M. Rodriguez +;; Copyright (C) 2010-2012 Paul M. Rodriguez ;; Author: Paul M. Rodriguez ;; Created: 2010-05-05 From f5e5c5811c1cb12209e49a8574b627f6d54ed5d1 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Wed, 4 Jan 2012 16:12:43 +0100 Subject: [PATCH 19/30] More fixes to the copyright year... Conflicts: lisp/ob-awk.el lisp/ob-fortran.el lisp/ob-java.el lisp/org-eshell.el --- lisp/ob-awk.el | 2 +- lisp/ob-fortran.el | 2 +- lisp/ob-java.el | 2 +- lisp/org-eshell.el | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lisp/ob-awk.el b/lisp/ob-awk.el index 1ba0a3569..ded8ee4f6 100644 --- a/lisp/ob-awk.el +++ b/lisp/ob-awk.el @@ -1,6 +1,6 @@ ;;; ob-awk.el --- org-babel functions for awk evaluation -;; Copyright (C) 2011 Free Software Foundation, Inc. +;; Copyright (C) 2011-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-fortran.el b/lisp/ob-fortran.el index 1b97f8724..f99c8d276 100644 --- a/lisp/ob-fortran.el +++ b/lisp/ob-fortran.el @@ -1,6 +1,6 @@ ;;; ob-fortran.el --- org-babel functions for fortran -;; Copyright (C) 2011 Sergey Litvinov, Eric Schulte +;; Copyright (C) 2011-2012 Sergey Litvinov, Eric Schulte ;; Authors: Sergey Litvinov (based on ob-C.el by Eric Schulte), Eric Schulte ;; Keywords: literate programming, reproducible research, fortran diff --git a/lisp/ob-java.el b/lisp/ob-java.el index bd02d30f0..75afda124 100644 --- a/lisp/ob-java.el +++ b/lisp/ob-java.el @@ -1,6 +1,6 @@ ;;; ob-java.el --- org-babel functions for java evaluation -;; Copyright (C) 2011 Free Software Foundation, Inc. +;; Copyright (C) 2011-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/org-eshell.el b/lisp/org-eshell.el index c8754d76b..9fae6fdd6 100644 --- a/lisp/org-eshell.el +++ b/lisp/org-eshell.el @@ -1,6 +1,7 @@ ;;; org-eshell.el - Support for links to working directories in eshell -;; Copyright (C) 2011 Free Software Foundation, Inc. -;; + +;; Copyright (C) 2011-2012 Free Software Foundation, Inc. + ;; Author: Konrad Hinsen ;; Version: 7.8.03 ;; From 059bb972d14f6ed4dbae5fb35257facb2c0e662d Mon Sep 17 00:00:00 2001 From: Martyn Jago Date: Wed, 4 Jan 2012 13:37:07 +0000 Subject: [PATCH 20/30] Modify macro `org-test-with-temp-text-in-file' to work on emacs 22. * testing/org-test.el: In Emacs 22 the `kill-buffer' argument is NOT optional. This change reflects this and allows the macro `org-test-with-temp-text-in-file' to work in Emacs 22 for org compatibility. This fixes the test `test-ob-lob/do-not-eval-lob-lines-in-example-blocks-on-export' --- testing/org-test.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/org-test.el b/testing/org-test.el index bed92a063..255cb9691 100644 --- a/testing/org-test.el +++ b/testing/org-test.el @@ -212,7 +212,7 @@ otherwise place the point at the beginning of the inserted text." (find-file ,file) (org-mode) (setq ,results ,@body) - (save-buffer) (kill-buffer) + (save-buffer) (kill-buffer (current-buffer)) (delete-file ,file) ,results))) (def-edebug-spec org-test-with-temp-text-in-file (form body)) From fd6f9c7d46650c0ac34ca18292036bb09c464a07 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Thu, 5 Jan 2012 09:43:21 +0100 Subject: [PATCH 21/30] Copyright, license, and header fixes. Thanks to Glenn Morris for this fix in Emacs trunk. Conflicts: lisp/ob-emacs-lisp.el lisp/ob-perl.el lisp/ob-python.el lisp/ob-ruby.el lisp/ob-screen.el lisp/org-eshell.el lisp/org-mouse.el --- lisp/ob-calc.el | 2 +- lisp/ob-emacs-lisp.el | 2 +- lisp/ob-js.el | 2 +- lisp/ob-perl.el | 2 +- lisp/ob-picolisp.el | 3 ++- lisp/ob-python.el | 2 +- lisp/ob-ruby.el | 2 +- lisp/ob-scheme.el | 2 +- lisp/ob-screen.el | 2 +- lisp/ob-shen.el | 2 +- lisp/ob-sqlite.el | 2 +- lisp/org-eshell.el | 21 +++++++++++---------- lisp/org-lparse.el | 11 +++-------- lisp/org-mouse.el | 10 ++++------ lisp/org-odt.el | 8 +++----- 15 files changed, 33 insertions(+), 40 deletions(-) diff --git a/lisp/ob-calc.el b/lisp/ob-calc.el index 6686c2754..f8ad7e337 100644 --- a/lisp/ob-calc.el +++ b/lisp/ob-calc.el @@ -1,6 +1,6 @@ ;;; ob-calc.el --- org-babel functions for calc code evaluation -;; Copyright (C) 2010-2012 Free Software Foundation, Inc +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-emacs-lisp.el b/lisp/ob-emacs-lisp.el index d49a68998..c8af60620 100644 --- a/lisp/ob-emacs-lisp.el +++ b/lisp/ob-emacs-lisp.el @@ -1,6 +1,6 @@ ;;; ob-emacs-lisp.el --- org-babel functions for emacs-lisp code evaluation -;; Copyright (C) 2009-2011 Free Software Foundation, Inc +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-js.el b/lisp/ob-js.el index d71c0aba8..bbb7aa085 100644 --- a/lisp/ob-js.el +++ b/lisp/ob-js.el @@ -1,6 +1,6 @@ ;;; ob-js.el --- org-babel functions for Javascript -;; Copyright (C) 2010-2012 Free Software Foundation +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, js diff --git a/lisp/ob-perl.el b/lisp/ob-perl.el index 12e6c17a7..916eb029d 100644 --- a/lisp/ob-perl.el +++ b/lisp/ob-perl.el @@ -1,6 +1,6 @@ ;;; ob-perl.el --- org-babel functions for perl evaluation -;; Copyright (C) 2009-2011 Free Software Foundation +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Dan Davison ;; Eric Schulte diff --git a/lisp/ob-picolisp.el b/lisp/ob-picolisp.el index 1b39e923e..04fcad5d5 100644 --- a/lisp/ob-picolisp.el +++ b/lisp/ob-picolisp.el @@ -2,7 +2,8 @@ ;; Copyright (C) 2010-2012 Free Software Foundation, Inc. -;; Authors: Thorsten Jolitz and Eric Schulte +;; Authors: Thorsten Jolitz +;; Eric Schulte ;; Keywords: literate programming, reproducible research ;; Homepage: http://orgmode.org diff --git a/lisp/ob-python.el b/lisp/ob-python.el index c84b11d77..5e7a2f0e6 100644 --- a/lisp/ob-python.el +++ b/lisp/ob-python.el @@ -1,6 +1,6 @@ ;;; ob-python.el --- org-babel functions for python evaluation -;; Copyright (C) 2009-2011 Free Software Foundation +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Dan Davison diff --git a/lisp/ob-ruby.el b/lisp/ob-ruby.el index e48e372eb..8f7e44e12 100644 --- a/lisp/ob-ruby.el +++ b/lisp/ob-ruby.el @@ -1,6 +1,6 @@ ;;; ob-ruby.el --- org-babel functions for ruby evaluation -;; Copyright (C) 2009-2011 Free Software Foundation +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-scheme.el b/lisp/ob-scheme.el index d0d03dd74..4bcde9423 100644 --- a/lisp/ob-scheme.el +++ b/lisp/ob-scheme.el @@ -1,6 +1,6 @@ ;;; ob-scheme.el --- org-babel functions for Scheme -;; Copyright (C) 2010-2012 Free Software Foundation +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, scheme diff --git a/lisp/ob-screen.el b/lisp/ob-screen.el index 2b1b25d40..37cdb2869 100644 --- a/lisp/ob-screen.el +++ b/lisp/ob-screen.el @@ -1,6 +1,6 @@ ;;; ob-screen.el --- org-babel support for interactive terminal -;; Copyright (C) 2009-2011 Free Software Foundation +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Benjamin Andresen ;; Keywords: literate programming, interactive shell diff --git a/lisp/ob-shen.el b/lisp/ob-shen.el index 7207cd935..8f4b13217 100644 --- a/lisp/ob-shen.el +++ b/lisp/ob-shen.el @@ -1,6 +1,6 @@ ;;; ob-shen.el --- org-babel functions for Shen -;; Copyright (C) 2010-2012 Free Software Foundation +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, shen diff --git a/lisp/ob-sqlite.el b/lisp/ob-sqlite.el index 462f7c08c..84d6bb26b 100644 --- a/lisp/ob-sqlite.el +++ b/lisp/ob-sqlite.el @@ -1,6 +1,6 @@ ;;; ob-sqlite.el --- org-babel functions for sqlite database interaction -;; Copyright (C) 2010-2012 Free Software Foundation +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/org-eshell.el b/lisp/org-eshell.el index 9fae6fdd6..c386af86b 100644 --- a/lisp/org-eshell.el +++ b/lisp/org-eshell.el @@ -3,14 +3,14 @@ ;; Copyright (C) 2011-2012 Free Software Foundation, Inc. ;; Author: Konrad Hinsen -;; Version: 7.8.03 -;; +;; Version: 0.1 + ;; This file is part of GNU Emacs. -;; -;; Emacs is free software; you can redistribute it and/or modify + +;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 3, or (at your option) -;; any later version. +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -18,10 +18,11 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -;; Boston, MA 02110-1301, USA. -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; along with GNU Emacs. If not, see . + +;;; Commentary: + +;;; Code: (require 'org) (require 'eshell) diff --git a/lisp/org-lparse.el b/lisp/org-lparse.el index f0a62abc2..a84dade2e 100644 --- a/lisp/org-lparse.el +++ b/lisp/org-lparse.el @@ -5,9 +5,8 @@ ;; Author: Jambunathan K ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; -;; This file is not (yet) part of GNU Emacs. -;; However, it is distributed under the same license. + +;; This file is part of GNU Emacs. ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -21,8 +20,7 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see . -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; + ;;; Commentary: ;; `org-lparse' is the entry point for the generic line-oriented @@ -45,9 +43,6 @@ ;; convert documents between various formats. Use this to command, ;; for example, to convert odt file to doc or pdf format. -;; See README.org file that comes with this library for answers to -;; FAQs and more information on using this library. - ;;; Code: (eval-when-compile (require 'cl)) diff --git a/lisp/org-mouse.el b/lisp/org-mouse.el index 3a667deee..b1d9f22a4 100644 --- a/lisp/org-mouse.el +++ b/lisp/org-mouse.el @@ -1,13 +1,12 @@ ;;; org-mouse.el --- Better mouse support for org-mode -;; Copyright (C) 2006-2011 Free Software Foundation -;; +;; Copyright (C) 2006-2012 Free Software Foundation, Inc. + ;; Author: Piotr Zielinski ;; Maintainer: Carsten Dominik -;; ;; This file is part of GNU Emacs. -;; + ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or @@ -20,8 +19,7 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see . -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; + ;;; Commentary: ;; ;; Org-mouse provides mouse support for org-mode. diff --git a/lisp/org-odt.el b/lisp/org-odt.el index 86f9c0c71..3cde3f4fe 100644 --- a/lisp/org-odt.el +++ b/lisp/org-odt.el @@ -5,9 +5,8 @@ ;; Author: Jambunathan K ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; -;; This file is not (yet) part of GNU Emacs. -;; However, it is distributed under the same license. + +;; This file is part of GNU Emacs. ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -21,8 +20,7 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see . -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; + ;;; Commentary: ;;; Code: From 4a5f40e88b10fe85130e3f6ec85685d1df2c1cc3 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 10 Jan 2012 11:40:20 +0100 Subject: [PATCH 22/30] org.texi: Fix spelling mistakes. Thanks to Paul Eggert for this fixes in Emacs trunk. Conflicts: doc/org.texi --- doc/org.texi | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/org.texi b/doc/org.texi index d3d0e9b36..7cc0a587e 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -36,7 +36,7 @@ @c orgkey{key} A key item @c orgcmd{key,cmd} Key with command name -@c xorgcmd{key,cmmand} Key with command name as @itemx +@c xorgcmd{key,cmd} Key with command name as @itemx @c orgcmdnki{key,cmd} Like orgcmd, but do not index the key @c orgcmdtkc{text,key,cmd} Like orgcmd,special text instead of key @c orgcmdkkc{key1,key2,cmd} Two keys with one command name, use "or" @@ -1006,7 +1006,7 @@ from within Emacs, please copy and paste the content into your Email program. Sometimes you might face a problem due to an error in your Emacs or Org mode setup. Before reporting a bug, it is very helpful to start Emacs with minimal customisations and reproduce the problem. Doing so often helps you determine -if the problem is with your customisation or with Org mode itself. You can +if the problem is with your customization or with Org mode itself. You can start a typical minimal session with a command like the example below. @example @@ -1242,7 +1242,7 @@ Reveal context around point, showing the current entry, the following heading and the hierarchy above. Useful for working near a location that has been exposed by a sparse tree command (@pxref{Sparse trees}) or an agenda command (@pxref{Agenda commands}). With a prefix argument show, on each -level, all sibling headings. With a double prefix argument, also show the +level, all sibling headings. With a double prefix argument, also show the entire subtree of the parent. @orgcmd{C-c C-k,show-branches} Expose all the headings of the subtree, CONTENT view for just one subtree. @@ -3936,7 +3936,7 @@ special faces for some of them. This can be done using the variable @end lisp While using a list with face properties as shown for CANCELED @emph{should} -work, this does not aways seem to be the case. If necessary, define a +work, this does not always seem to be the case. If necessary, define a special face and use that. A string is interpreted as a color. The variable @code{org-faces-easy-properties} determines if that color is interpreted as a foreground or a background color. @@ -4420,7 +4420,7 @@ off a box while there are unchecked boxes above it. @table @kbd @orgcmd{C-c C-c,org-toggle-checkbox} -Toggle checkbox status or (with prefix arg) checkbox presence at point. +Toggle checkbox status or (with prefix arg) checkbox presence at point. With a single prefix argument, add an empty checkbox or remove the current one@footnote{`C-u C-c C-c' on the @emph{first} item of a list with no checkbox will add checkboxes to the rest of the list.}. With a double prefix argument, set it to @samp{[-]}, which is @@ -6320,7 +6320,7 @@ not started at exactly the right moment. @kindex ; Calling @code{org-timer-set-timer} from an Org mode buffer runs a countdown -timer. Use @kbd{;} from agenda buffers, @key{C-c C-x ;} everwhere else. +timer. Use @kbd{;} from agenda buffers, @key{C-c C-x ;} everywhere else. @code{org-timer-set-timer} prompts the user for a duration and displays a countdown timer in the modeline. @code{org-timer-default-timer} sets the @@ -9543,7 +9543,7 @@ broad range of other applications. @LaTeX{} export lets you use Org mode and its structured editing functions to easily create @LaTeX{} files. DocBook export makes it possible to convert Org files to many other formats using DocBook tools. OpenDocument Text(@acronym{ODT}) export allows seamless -colloboration across organizational boundaries. For project management you +collaboration across organizational boundaries. For project management you can create gantt and resource charts by using TaskJuggler export. To incorporate entries with associated times like deadlines or appointments into a desktop calendar program like iCal, Org mode can also produce extracts in @@ -10992,9 +10992,9 @@ You can control the size and scale of the embedded images using the @vindex org-export-odt-pixels-per-inch Note that the exporter specifies the desired size of the image in the final -document in units of centimetres. In order to scale the embedded images, the +document in units of centimeters. In order to scale the embedded images, the exporter needs to compute the size of the image. This is done by retrieving -the image size in pixels and converting the pixel units to centimetres using +the image size in pixels and converting the pixel units to centimeters using @code{org-export-odt-pixels-per-inch}. The default value of this variable is set to @code{display-pixels-per-inch}. You can tweak this variable to achieve the best results. @@ -16484,7 +16484,7 @@ chapter about publishing. @i{Jambunathan K} contributed the @acronym{ODT} exporter. @item @i{Sebastien Vauban} reported many issues with @LaTeX{} and BEAMER export and -enabled source code highlighling in Gnus. +enabled source code highlighting in Gnus. @item @i{Stefan Vollmar} organized a video-recorded talk at the Max-Planck-Institute for Neurology. He also inspired the creation of a From d5ca0780f9f610fce999c2f9057c8748824339d3 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 10 Jan 2012 11:56:15 +0100 Subject: [PATCH 23/30] Fix typos and spelling mistakes. Thanks to Paul Eggert for this fixes in Emacs trunk. --- lisp/ob-fortran.el | 4 ++-- lisp/ob-latex.el | 2 +- lisp/ob-ledger.el | 2 +- lisp/org-agenda.el | 14 +++++++------- lisp/org-beamer.el | 4 ++-- lisp/org-capture.el | 4 ++-- lisp/org-clock.el | 2 +- lisp/org-compat.el | 2 +- lisp/org-ctags.el | 2 +- lisp/org-exp.el | 14 +++++++------- lisp/org-list.el | 8 ++++---- lisp/org-lparse.el | 8 ++++---- lisp/org-odt.el | 10 +++++----- lisp/org-protocol.el | 4 ++-- lisp/org-publish.el | 4 ++-- lisp/org-table.el | 8 ++++---- lisp/org-taskjuggler.el | 4 ++-- lisp/org.el | 12 ++++++------ 18 files changed, 54 insertions(+), 54 deletions(-) diff --git a/lisp/ob-fortran.el b/lisp/ob-fortran.el index f99c8d276..283f1ce46 100644 --- a/lisp/ob-fortran.el +++ b/lisp/ob-fortran.el @@ -108,7 +108,7 @@ it's header arguments." "Wrap body in a \"program ... end program\" block if none exists." (if (string-match "^[ \t]*program[ \t]*.*" (capitalize body)) (let ((vars (mapcar #'cdr (org-babel-get-header params :var)))) - (if vars (error "cannot use :vars if 'program' statment is present")) + (if vars (error "cannot use :vars if 'program' statement is present")) body) (format "program main\n%s\nend program main\n" body))) @@ -125,7 +125,7 @@ support for sessions" ;; helper functions (defun org-babel-fortran-var-to-fortran (pair) - "fortranonvert an elisp val into a string of fortran code specifying a var + "Convert an elisp val into a string of fortran code specifying a var of the same value." ;; TODO list support (let ((var (car pair)) diff --git a/lisp/ob-latex.el b/lisp/ob-latex.el index afd8e5f36..16d49209c 100644 --- a/lisp/ob-latex.el +++ b/lisp/ob-latex.el @@ -132,7 +132,7 @@ This function is called by `org-babel-execute-src-block'." (when (file-exists-p transient-pdf-file) (delete-file transient-pdf-file)))))) ((string-match "\\.\\([^\\.]+\\)$" out-file) - (error "can not create %s files, please specify a .png or .pdf file or try the :imagemagick header arguement" + (error "can not create %s files, please specify a .png or .pdf file or try the :imagemagick header argument" (match-string 1 out-file)))) nil) ;; signal that output has already been written to file body)) diff --git a/lisp/ob-ledger.el b/lisp/ob-ledger.el index e9c142712..a454d51e3 100644 --- a/lisp/ob-ledger.el +++ b/lisp/ob-ledger.el @@ -29,7 +29,7 @@ ;; ;; 1) there is no such thing as a "session" in ledger ;; -;; 2) we are generally only going to return output from the leger program +;; 2) we are generally only going to return output from the ledger program ;; ;; 3) we are adding the "cmdline" header argument ;; diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index f3024b171..8179b9344 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -28,7 +28,7 @@ ;; ;; The functions `org-batch-agenda', `org-batch-agenda-csv', and ;; `org-batch-store-agenda-views' are implemented as macros to provide -;; a conveniant way for extracting agenda information from the command +;; a convenient way for extracting agenda information from the command ;; line. The Lisp does not evaluate parameters of a macro call; thus ;; it is not necessary to quote the parameters passed to one of those ;; functions. E.g. you can write: @@ -1086,7 +1086,7 @@ and timeline buffers." (const :tag "Sunday" 0))) (defcustom org-agenda-move-date-from-past-immediately-to-today t - "Non-nil means jumpt to today when moving a past date forward in time. + "Non-nil means jump to today when moving a past date forward in time. When using S-right in the agenda to move a a date forward, and the date stamp currently points to the past, the first key press will move it to today. WHen nil, just move one day forward even if the date stays @@ -1658,7 +1658,7 @@ Where CATEGORY-REGEXP is a regexp matching the categories where the icon should be displayed. FILE-OR-DATA either a file path or a string containing image data. -The other fields can be omited safely if not needed: +The other fields can be omitted safely if not needed: TYPE indicates the image type. DATA-P is a boolean indicating whether the FILE-OR-DATA string is image data. @@ -3062,7 +3062,7 @@ define a filter for one of the individual blocks. You need to set it in the global options and expect it to be applied to the entire view.") (defvar org-agenda-category-filter-preset nil - "A preset of the categeory filter used for secondary agenda filtering. + "A preset of the category filter used for secondary agenda filtering. This must be a list of strings, each string must be a single category preceded by \"+\" or \"-\". This variable should not be set directly, but agenda custom commands can @@ -4920,7 +4920,7 @@ DAYNAME is a number between 0 (Sunday) and 6 (Saturday). SKIP-WEEKS is any number of ISO weeks in the block period for which the item should be skipped. If any of the SKIP-WEEKS arguments is the symbol `holidays', then any date that is known by the Emacs calendar to be a -holidy will also be skipped." +holiday will also be skipped." (let* ((date1 (calendar-absolute-from-gregorian (list m1 d1 y1))) (date2 (calendar-absolute-from-gregorian (list m2 d2 y2))) (d (calendar-absolute-from-gregorian date))) @@ -8505,7 +8505,7 @@ tag and (if present) the flagging note." (org-agenda-remove-flag hdmarker) (let ((win (get-buffer-window "*Flagging Note*"))) (and win (delete-window win))) - (message "Entry unflaged")) + (message "Entry unflagged")) (setq note (org-entry-get hdmarker "THEFLAGGINGNOTE")) (unless note (error "No flagging note")) @@ -8528,7 +8528,7 @@ tag and (if present) the flagging note." (org-entry-delete nil "THEFLAGGINGNOTE") (setq newhead (org-get-heading))) (org-agenda-change-all-lines newhead marker) - (message "Entry unflaged"))) + (message "Entry unflagged"))) (defun org-agenda-get-any-marker (&optional pos) (or (get-text-property (or pos (point-at-bol)) 'org-hd-marker) diff --git a/lisp/org-beamer.el b/lisp/org-beamer.el index d64ce2ddc..9f5d05f45 100644 --- a/lisp/org-beamer.el +++ b/lisp/org-beamer.el @@ -410,7 +410,7 @@ the value will be inserted right after the documentclass statement." ;; Functions to initialize and post-process -;; These fuctions will be hooked into various places in the export process +;; These functions will be hooked into various places in the export process (defun org-beamer-initialize-open-trackers () "Reset variables that track if certain environments are open during export." @@ -450,7 +450,7 @@ The effect is that these values will be accessible during export." ((stringp org-beamer-frame-level-now) (setq org-beamer-frame-level-now (string-to-number org-beamer-frame-level-now)))) - ;; Find the header additons, most likely theme commands + ;; Find the header additions, most likely theme commands (setq org-beamer-header-extra (or (and (org-region-active-p) (save-excursion diff --git a/lisp/org-capture.el b/lisp/org-capture.el index 8cc503509..0fd800384 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -374,7 +374,7 @@ to avoid conflicts with other active capture processes." (plist-get (if local org-capture-current-plist org-capture-plist) prop)) (defun org-capture-member (prop &optional local) - "Is PROP a preperty in `org-capture-plist'. + "Is PROP a property in `org-capture-plist'. When LOCAL is set, use the local variable `org-capture-current-plist', this is necessary after initialization of the capture process, to avoid conflicts with other active capture processes." @@ -1455,7 +1455,7 @@ The template may still contain \"%?\" for cursor positioning." (goto-char (point-min)) (while (looking-at "[ \t]*\n") (replace-match "")) (if (re-search-forward "[ \t\n]*\\'" nil t) (replace-match "\n")) - ;; Return the expanded tempate and kill the temporary buffer + ;; Return the expanded template and kill the temporary buffer (untabify (point-min) (point-max)) (set-buffer-modified-p nil) (prog1 (buffer-string) (kill-buffer (current-buffer)))))) diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 793ae57d3..95a8a56a8 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -2117,7 +2117,7 @@ the currently selected interval size." "Write out a clock table at position IPOS in the current buffer. TABLES is a list of tables with clocking data as produced by `org-clock-get-table-data'. PARAMS is the parameter property list obtained -from the dynamic block defintion." +from the dynamic block definition." ;; This function looks quite complicated, mainly because there are a ;; lot of options which can add or remove columns. I have massively ;; commented this function, the I hope it is understandable. If diff --git a/lisp/org-compat.el b/lisp/org-compat.el index c053758bd..159bdbf23 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -275,7 +275,7 @@ Works on both Emacs and XEmacs." nil)) (defmacro org-xemacs-without-invisibility (&rest body) - "Turn off exents with invisibility while executing BODY." + "Turn off extents with invisibility while executing BODY." `(let ((ext-inv (extent-list nil (point-at-bol) (point-at-eol) 'all-extents-closed-open 'invisible)) ext-inv-specs) diff --git a/lisp/org-ctags.el b/lisp/org-ctags.el index 609c09414..b17e06c51 100644 --- a/lisp/org-ctags.el +++ b/lisp/org-ctags.el @@ -35,7 +35,7 @@ ;; links to these 'tagged' destinations, allowing seamless navigation between ;; multiple org-mode files. Topics can be created in any org mode file and ;; will always be found by plain links from other files. Other file types -;; recognised by ctags (source code files, latex files, etc) will also be +;; recognized by ctags (source code files, latex files, etc) will also be ;; available as destinations for plain links, and similarly, org-mode links ;; will be available as tags from source files. Finally, the function ;; `org-ctags-find-tag-interactive' lets you choose any known tag, using diff --git a/lisp/org-exp.el b/lisp/org-exp.el index be7c82890..995a63735 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -2792,7 +2792,7 @@ continue numbering from the last numbered block. REPLACE-LABELS is dual-purpose. 1. It controls the retention of labels in the exported block. 2. It specifies in what manner the links (or references) to a - labelled line be formatted. + labeled line be formatted. REPLACE-LABELS is the symbol `keep' if the literal example specifies \"-k\" option, is numeric if the literal example @@ -2800,12 +2800,12 @@ specifies \"-r\" option and is nil otherwise. Handle REPLACE-LABELS as below: - If nil, retain labels in the exported block and use - user-provided labels for referencing the labelled lines. + user-provided labels for referencing the labeled lines. - If it is a number, remove labels in the exported block and use - one of line numbers or labels for referencing labelled lines based + one of line numbers or labels for referencing labeled lines based on NUMBER option. - If it is a keep, retain labels in the exported block and use - one of line numbers or labels for referencing labelled lines + one of line numbers or labels for referencing labeled lines based on NUMBER option. LABEL-FORMAT is the value of \"-l\" switch associated with @@ -2815,8 +2815,8 @@ PREPROCESS is intended for backend-agnostic handling of source block numbering. When non-nil do the following: - do not number the lines - always strip the labels from exported block -- do not make the labelled line a target of an incoming link. - Instead mark the labelled line with `org-coderef' property and +- do not make the labeled line a target of an incoming link. + Instead mark the labeled line with `org-coderef' property and store the label in it." (setq skip1 (or skip1 0) skip2 (or skip2 0)) (if (and number (not cont)) (setq org-export-last-code-line-counter-value 0)) @@ -3013,7 +3013,7 @@ to the value of `temporary-file-directory'." (org-load-modules-maybe) (unless org-local-vars (setq org-local-vars (org-get-local-variables))) - (eval ;; convert to fmt -- mimicing `org-run-like-in-org-mode' + (eval ;; convert to fmt -- mimicking `org-run-like-in-org-mode' (list 'let org-local-vars (list (intern (format "org-export-as-%s" fmt)) nil nil nil ''string t)))) diff --git a/lisp/org-list.el b/lisp/org-list.el index df14625bc..20765af85 100644 --- a/lisp/org-list.el +++ b/lisp/org-list.el @@ -71,7 +71,7 @@ ;; few thousand lines long). Thus, code should follow the rule: ;; "collect once, use many". As a corollary, it is usually a bad idea ;; to use directly an interactive function inside the code, as those, -;; being independant entities, read the whole list structure another +;; being independent entities, read the whole list structure another ;; time. ;;; Code: @@ -685,7 +685,7 @@ Assume point is at an item." (cond ((<= (point) lim-up) ;; At upward limit: if we ended at an item, store it, - ;; else dimiss useless data recorded above BEG-CELL. + ;; else dismiss useless data recorded above BEG-CELL. ;; Jump to part 2. (throw 'exit (setq itm-lst @@ -2674,7 +2674,7 @@ If a region is active, all items inside will be moved." (defvar org-tab-ind-state) (defun org-cycle-item-indentation () "Cycle levels of indentation of an empty item. -The first run indents the item, if applicable. Subsequents runs +The first run indents the item, if applicable. Subsequent runs outdent it at meaningful levels in the list. When done, item is put back at its original position with its original bullet. @@ -3047,7 +3047,7 @@ Valid parameters PARAMS are: Alternatively, each parameter can also be a form returning a string. These sexp can use keywords `counter' and `depth', -reprensenting respectively counter associated to the current +representing respectively counter associated to the current item, and depth of the current sub-list, starting at 0. Obviously, `counter' is only available for parameters applying to items." diff --git a/lisp/org-lparse.el b/lisp/org-lparse.el index a84dade2e..6448b0f65 100644 --- a/lisp/org-lparse.el +++ b/lisp/org-lparse.el @@ -850,7 +850,7 @@ version." (throw 'nextline nil)) ;; Notes: The baseline version of org-html.el (git commit - ;; 3d802e), while encoutering a *line-long* protected text, + ;; 3d802e), while encountering a *line-long* protected text, ;; does one of the following two things based on the state ;; of the export buffer. @@ -865,10 +865,10 @@ version." ;; I think ---> ;; Scenario 1 mentioned above kicks in when a block of - ;; protected text has to be inserted enbloc. For example, + ;; protected text has to be inserted en bloc. For example, ;; this happens, when inserting an source or example block ;; or preformatted content enclosed in #+backend, - ;; #+begin_bakend ... #+end_backend) + ;; #+begin_backend ... #+end_backend) ;; Scenario 2 mentioned above kicks in when the protected ;; text is part of a running sentence. For example this @@ -1186,7 +1186,7 @@ version." (t (current-buffer)))))) (defun org-lparse-format-table (lines olines) - "Retuns backend-specific code for org-type and table-type tables." + "Returns backend-specific code for org-type and table-type tables." (if (stringp lines) (setq lines (org-split-string lines "\n"))) (if (string-match "^[ \t]*|" (car lines)) diff --git a/lisp/org-odt.el b/lisp/org-odt.el index 3cde3f4fe..ca6a563f6 100644 --- a/lisp/org-odt.el +++ b/lisp/org-odt.el @@ -297,7 +297,7 @@ FILE-MEMBERS. Use options 1, 2 or 3 only if styles.xml alone suffices for achieving the desired formatting. Use option 4, if the styles.xml references additional files like header and footer images for -achieving the desired formattting. +achieving the desired formatting. Use \"#+ODT_STYLES_FILE: ...\" directive to set this variable on a per-file basis. For example, @@ -1940,7 +1940,7 @@ ATTR is a string of other attributes of the a element." (cons width height))) (defvar org-odt-entity-labels-alist nil - "Associate Labels with the Labelled entities. + "Associate Labels with the Labeled entities. Each element of the alist is of the form (LABEL-NAME CATEGORY-NAME SEQNO LABEL-STYLE-NAME). LABEL-NAME is same as that specified by \"#+LABEL: ...\" line. CATEGORY-NAME is the @@ -2277,7 +2277,7 @@ visually." (with-current-buffer (find-file-noselect (expand-file-name "styles.xml") t) ;; Don't make automatic backup of styles.xml file. This setting - ;; prevents the backedup styles.xml file from being zipped in to + ;; prevents the backed-up styles.xml file from being zipped in to ;; odt file. This is more of a hackish fix. Better alternative ;; would be to fix the zip command so that the output odt file ;; includes only the needed files and excludes any auto-generated @@ -2292,7 +2292,7 @@ visually." (org-odt-configure-outline-numbering (if org-export-with-section-numbers org-export-headline-levels 0))) - ;; Write custom stlyes for source blocks + ;; Write custom styles for source blocks (org-odt-insert-custom-styles-for-srcblocks (mapconcat (lambda (style) @@ -2543,7 +2543,7 @@ Do this when translation to MathML fails." ;; `org-export-preprocess-after-blockquote-hook'. Note that this hook ;; is the one that is closest and well before the call to ;; `org-export-attach-captions-and-attributes' in -;; `org-export-preprocess-stirng'. The above arrangement permits +;; `org-export-preprocess-string'. The above arrangement permits ;; captions, labels and attributes to be attached to png images ;; generated out of latex equations. (add-hook 'org-export-preprocess-after-blockquote-hook diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el index 8bda9556a..4cb341285 100644 --- a/lisp/org-protocol.el +++ b/lisp/org-protocol.el @@ -145,8 +145,8 @@ (defgroup org-protocol nil "Intercept calls from emacsclient to trigger custom actions. -This is done by advising `server-visit-files' to scann the list of filenames -for `org-protocol-the-protocol' and sub-procols defined in +This is done by advising `server-visit-files' to scan the list of filenames +for `org-protocol-the-protocol' and sub-protocols defined in `org-protocol-protocol-alist' and `org-protocol-protocol-alist-default'." :version "22.1" :group 'convenience diff --git a/lisp/org-publish.el b/lisp/org-publish.el index 228666b97..e1861bce9 100644 --- a/lisp/org-publish.el +++ b/lisp/org-publish.el @@ -277,12 +277,12 @@ in the sitemap." :type 'string) (defcustom org-publish-sitemap-file-entry-format "%t" - "How a sitemap file entry is formated. + "How a sitemap file entry is formatted. You could use brackets to delimit on what part the link will be. %t is the title. %a is the author. -%d is the date formated using `org-publish-sitemap-date-format'." +%d is the date formatted using `org-publish-sitemap-date-format'." :group 'org-publish :type 'string) diff --git a/lisp/org-table.el b/lisp/org-table.el index 3bb645bbd..2625f3b99 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -50,7 +50,7 @@ (defvar orgtbl-after-send-table-hook nil "Hook for functions attaching to `C-c C-c', if the table is sent. This can be used to add additional functionality after the table is sent -to the receiver position, othewise, if table is not sent, the functions +to the receiver position, otherwise, if table is not sent, the functions are not run.") (defcustom orgtbl-optimized (eq org-enable-table-editor 'optimized) @@ -1299,7 +1299,7 @@ However, when FORCE is non-nil, create new columns if necessary." (defun org-table-line-to-dline (line &optional above) "Turn a buffer line number into a data line number. If there is no data line in this line, return nil. -If there is no matchin dline (most likely te refrence was a hline), the +If there is no matching dline (most likely te reference was a hline), the first dline below it is used. When ABOVE is non-nil, the one above is used." (catch 'exit (let ((ll (length org-table-dlines)) @@ -2671,7 +2671,7 @@ in the buffer and column1 and column2 are table column numbers." (prog1 (org-trim (org-table-get-field c1)) (if highlight (org-table-highlight-rectangle (point) (point))))) ;; A range, return a vector - ;; First sort the numbers to get a regular ractangle + ;; First sort the numbers to get a regular rectangle (if (< r2 r1) (setq tmp r1 r1 r2 r2 tmp)) (if (< c2 c1) (setq tmp c1 c1 c2 c2 tmp)) (if corners-only @@ -2931,7 +2931,7 @@ known that the table will be realigned a little later anyway." (defun org-table-iterate (&optional arg) "Recalculate the table until it does not change anymore. -The maximun number of iterations is 10, but you can chose a different value +The maximun number of iterations is 10, but you can choose a different value with the prefix ARG." (interactive "P") (let ((imax (if arg (prefix-numeric-value arg) 10)) diff --git a/lisp/org-taskjuggler.el b/lisp/org-taskjuggler.el index 78b38be57..e8259e621 100644 --- a/lisp/org-taskjuggler.el +++ b/lisp/org-taskjuggler.el @@ -69,7 +69,7 @@ ;; "taskjuggler_project" (or whatever you customized ;; `org-export-taskjuggler-project-tag' to). You are now ready to ;; export the project plan with `org-export-as-taskjuggler-and-open' -;; which will export the project plan and open a gant chart in +;; which will export the project plan and open a Gantt chart in ;; TaskJugglerUI. ;; ;; * Resources @@ -572,7 +572,7 @@ with separator \"\n\"." (and filtered-items (mapconcat 'identity filtered-items "\n")))) (defun org-taskjuggler-get-attributes (item attributes) - "Return all attribute as a single formated string. ITEM is an + "Return all attribute as a single formatted string. ITEM is an alist representing either a resource or a task. ATTRIBUTES is a list of symbols. Only entries from ITEM are considered that are listed in ATTRIBUTES." diff --git a/lisp/org.el b/lisp/org.el index 93f03d6f3..79c29cc67 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -4718,7 +4718,7 @@ but the stars and the body are.") "\\(?: +" org-todo-regexp "\\)?" "\\(?: +\\(\\[#.\\]\\)\\)?" "\\(?: +" - ;; Stats cookies can be sticked to body. + ;; Stats cookies can be stuck to body. "\\(?:\\[[0-9%%/]+\\] *\\)?" "\\(%s\\)" "\\(?: *\\[[0-9%%/]+\\]\\)?" @@ -5242,7 +5242,7 @@ The time stamps may be either active or inactive.") (defvar org-emph-face nil) (defun org-do-emphasis-faces (limit) - "Run through the buffer and add overlays to emphasised strings." + "Run through the buffer and add overlays to emphasized strings." (let (rtn a) (while (and (not rtn) (re-search-forward org-emph-re limit t)) (if (not (= (char-after (match-beginning 3)) @@ -5754,7 +5754,7 @@ Use `org-reduced-level' to remove the effect of `org-odd-levels'." (defvar org-font-lock-set-keywords-hook nil "Functions that can manipulate `org-font-lock-extra-keywords'. -This is calles after `org-font-lock-extra-keywords' is defined, but before +This is called after `org-font-lock-extra-keywords' is defined, but before it is installed to be used by font lock. This can be useful if something needs to be inserted at a specific position in the font-lock sequence.") @@ -5871,7 +5871,7 @@ needs to be inserted at a specific position in the font-lock sequence.") (org-set-local 'org-pretty-entities (not org-pretty-entities)) (org-restart-font-lock) (if org-pretty-entities - (message "Entities are displayed as UTF8 characers") + (message "Entities are displayed as UTF8 characters") (save-restriction (widen) (org-decompose-region (point-min) (point-max)) @@ -11459,7 +11459,7 @@ changes. Such blocking occurs when: (forward-line 1) (re-search-forward org-not-done-heading-regexp pos t)) (throw 'dont-block nil)) ; block, there is an older sibling not done. - ;; Search further up the hierarchy, to see if an anchestor is blocked + ;; Search further up the hierarchy, to see if an ancestor is blocked (while t (goto-char parent-pos) (if (not (looking-at org-not-done-heading-regexp)) @@ -15143,7 +15143,7 @@ user." (setq ans (replace-match (format "%04d-%02d-%02d\\5" year month day) t nil ans))) - ;; Help matching dottet european dates + ;; Help matching dotted european dates (when (string-match "^ *\\(3[01]\\|0?[1-9]\\|[12][0-9]\\)\\. ?\\(0?[1-9]\\|1[012]\\)\\. ?\\([1-9][0-9][0-9][0-9]\\)?" ans) (setq year (if (match-end 3) From cb5d5121f54fd27614bdd8637c8900640bac1dde Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Wed, 11 Jan 2012 08:33:22 +0100 Subject: [PATCH 24/30] org.texi: fix tiny typo. Thanks to Paul Eggert for this fix in Emacs trunk. --- doc/org.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/org.texi b/doc/org.texi index 7cc0a587e..613807a33 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -7336,7 +7336,7 @@ If you are using the Big Brothers Database to store your contacts, you will very likely prefer to store anniversaries in BBDB rather than in a separate Org or diary file. Org supports this and will show BBDB anniversaries as part of the agenda. All you need to do is to add the -following to one your your agenda files: +following to one of your agenda files: @example * Anniversaries From d2a0a5378b6777a6145be4df19ccc2a9719e9002 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 24 Jan 2012 15:42:36 +0100 Subject: [PATCH 25/30] org.el: Fix missing angle brackets for muse export style. * org.el (org-structure-template-alist): Fix missing angle brackets for muse export style. Thanks to Eric S Fraga for this fix. Conflicts: lisp/org.el --- lisp/org.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 79c29cc67..2e4ab336b 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -11046,11 +11046,11 @@ This function can be used in a hook." "\n?\n") ("q" "#+begin_quote\n?\n#+end_quote" "\n?\n") - ("v" "#+begin_verse\n?\n#+end_verse" - "\n?\n/verse>") - ("c" "#+begin_center\n?\n#+end_center" - "
\n?\n/center>") - ("l" "#+begin_latex\n?\n#+end_latex" + ("v" "#+BEGIN_VERSE\n?\n#+END_VERSE" + "\n?\n") + ("c" "#+BEGIN_CENTER\n?\n#+END_CENTER" + "
\n?\n
") + ("l" "#+BEGIN_LaTeX\n?\n#+END_LaTeX" "\n?\n") ("L" "#+latex: " "?") From 50a35c42dbc1df91c69cf9bcf03fc72cc3a518d7 Mon Sep 17 00:00:00 2001 From: Martyn Jago Date: Tue, 24 Jan 2012 16:12:29 +0000 Subject: [PATCH 26/30] Fix `org-babel-result-end' command to provide consistent result removal where result is type `wrap'. * lisp/ob.el: Fix `org-babel-result-end' command to provide consistent result removal where result is type `wrap'. Prior to this fix multiple (org-ctrl-c-ctrl-c) commands will add multiple newlines to the end of results (one newline per block execution). This fixes the test `test-ob/org-babel-remove-result--results-wrap' * testing/lisp/test-ob.el: Uncomment test since it now passes. Conflicts: testing/lisp/test-ob.el --- lisp/ob.el | 3 +- testing/lisp/test-ob.el | 108 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 1 deletion(-) diff --git a/lisp/ob.el b/lisp/ob.el index 9f4d1ccbc..6b62c6335 100644 --- a/lisp/ob.el +++ b/lisp/ob.el @@ -1921,7 +1921,8 @@ code ---- the results are extracted in the syntax of the source (prvs (org-list-prevs-alist struct))) (org-list-get-list-end (point-at-bol) struct prvs))) ((looking-at "^\\([ \t]*\\):RESULTS:") - (re-search-forward (concat "^" (match-string 1) ":END:"))) + (progn (re-search-forward (concat "^" (match-string 1) ":END:")) + (forward-char 1) (point))) (t (let ((case-fold-search t) (blocks-re (regexp-opt diff --git a/testing/lisp/test-ob.el b/testing/lisp/test-ob.el index 3c6b27db8..5de3e6948 100644 --- a/testing/lisp/test-ob.el +++ b/testing/lisp/test-ob.el @@ -618,6 +618,114 @@ on two lines (buffer-substring-no-properties (point-min) (point-max))))))) +(ert-deftest test-ob/org-babel-remove-result--results-default () + "Test `org-babel-remove-result' with default :results." + (mapcar (lambda (language) + (test-ob-verify-result-and-removed-result + "\n" + (concat +"* org-babel-remove-result +#+begin_src " language " +#+end_src + +* next heading"))) + '("sh" "emacs-lisp"))) + +(ert-deftest test-ob/org-babel-remove-result--results-list () + "Test `org-babel-remove-result' with :results list." + (test-ob-verify-result-and-removed-result + "- 1 +- 2 +- 3 +- (quote (4 5))" + +"* org-babel-remove-result +#+begin_src emacs-lisp :results list +'(1 2 3 '(4 5)) +#+end_src + +* next heading")) + +(ert-deftest test-ob/org-babel-remove-result--results-wrap () + "Test `org-babel-remove-result' with :results wrap." + (test-ob-verify-result-and-removed-result + ":RESULTS: +hello there +:END:" + + "* org-babel-remove-result + +#+begin_src emacs-lisp :results wrap +\"hello there\" +#+end_src + +* next heading")) + +(ert-deftest test-ob/org-babel-remove-result--results-org () + "Test `org-babel-remove-result' with :results org." + (test-ob-verify-result-and-removed-result + "#+BEGIN_ORG +* heading +** subheading +content +#+END_ORG" + +"* org-babel-remove-result +#+begin_src emacs-lisp :results org +\"* heading +** subheading +content\" +#+end_src + +* next heading")) + +(ert-deftest test-ob/org-babel-remove-result--results-html () + "Test `org-babel-remove-result' with :results html." + (test-ob-verify-result-and-removed-result + "#+BEGIN_HTML + +#+END_HTML" + +"* org-babel-remove-result +#+begin_src emacs-lisp :results html +\"\" +#+end_src + +* next heading")) + +(ert-deftest test-ob/org-babel-remove-result--results-latex () + "Test `org-babel-remove-result' with :results latex." + (test-ob-verify-result-and-removed-result + "#+BEGIN_LaTeX +Line 1 +Line 2 +Line 3 +#+END_LaTeX" + +"* org-babel-remove-result +#+begin_src emacs-lisp :results latex +\"Line 1 +Line 2 +Line 3\" +#+end_src + +* next heading")) + +(ert-deftest test-ob/org-babel-remove-result--results-code () + "Test `org-babel-remove-result' with :results code." + + (test-ob-verify-result-and-removed-result + "#+BEGIN_SRC emacs-lisp +\"I am working!\" +#+END_SRC" + +"* org-babel-remove-result +#+begin_src emacs-lisp :results code +(message \"I am working!\") +#+end_src + +* next heading")) + (ert-deftest test-org-babel/inline-src_blk-preceded-by-letter () "Test inline source block invalid where preceded by letter" From b3274408e2133ead9bc1fa37e1025bc6c43ab829 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Wed, 25 Jan 2012 07:16:46 +0100 Subject: [PATCH 27/30] org.texi: fix typo. Thanks to Takaaki ISHIKAWA for spotting this. --- doc/org.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/org.texi b/doc/org.texi index 613807a33..b65d3c928 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -15265,7 +15265,7 @@ not accept any arguments, and return the full link with prefix. @vindex org-ctrl-c-ctrl-c-hook Org has several commands that act differently depending on context. The most -important example it the @kbd{C-c C-c} (@pxref{The very busy C-c C-c key}). +important example is the @kbd{C-c C-c} (@pxref{The very busy C-c C-c key}). Also the @kbd{M-cursor} and @kbd{M-S-cursor} keys have this property. Add-ons can tap into this functionality by providing a function that detects From 2189b9ac4746f2035b81117414ce52c9be7353ab Mon Sep 17 00:00:00 2001 From: Martyn Jago Date: Fri, 6 Jan 2012 19:36:28 +0000 Subject: [PATCH 28/30] Regression tests regarding code block results and result removal/replacement. * testing/lisp/test-ob.el: Regression tests regarding code block results and result removal/replacement Conflicts: testing/lisp/test-ob.el --- testing/lisp/test-ob.el | 143 +++++++++++++++++++++++++--------------- 1 file changed, 91 insertions(+), 52 deletions(-) diff --git a/testing/lisp/test-ob.el b/testing/lisp/test-ob.el index 5de3e6948..3f4186eaa 100644 --- a/testing/lisp/test-ob.el +++ b/testing/lisp/test-ob.el @@ -122,9 +122,16 @@ (ert-deftest test-org-babel/simple-named-code-block () "Test that simple named code blocks can be evaluated." - (org-test-at-id "0d82b52d-1bb9-4916-816b-2c67c8108dbb" - (org-babel-next-src-block 1) - (should (= 42 (org-babel-execute-src-block))))) + (org-test-with-temp-text-in-file " + +#+name: i-have-a-name +#+begin_src emacs-lisp + 42 +#+end_src" + + (progn + (org-babel-next-src-block 1) + (should (= 42 (org-babel-execute-src-block)))))) (ert-deftest test-org-babel/simple-variable-resolution () "Test that simple variable resolution is working." @@ -587,34 +594,80 @@ on two lines '(":a 1" "b [2 3]" "c (4 :d (5 6))") (org-babel-balanced-split ":a 1 :b [2 3] :c (4 :d (5 6))" '((32 9) . 58))))) - -(ert-deftest test-org-babel/inline-src_blk-preceded-punct-preceded-by-point () - (let ((test-line ".src_emacs-lisp[ :results verbatim ]{ \"x\" }")) - (org-test-with-temp-text - test-line - (forward-char 1) +(ert-deftest test-ob/commented-last-block-line-no-var () + (org-test-with-temp-text-in-file " +#+begin_src emacs-lisp +;; +#+end_src" + (progn + (org-babel-next-src-block) (org-ctrl-c-ctrl-c) - (should (string= (concat test-line " =\"x\"=") + (should (re-search-forward "\\#\\+results:" nil t)) + (forward-line) + (should + (string= + "" + (buffer-substring-no-properties (point-at-bol) (point-at-eol)))))) + (org-test-with-temp-text-in-file " +#+begin_src emacs-lisp +\"some text\";; +#+end_src" + + (progn + (org-babel-next-src-block) + (org-ctrl-c-ctrl-c) + (should (re-search-forward "\\#\\+results:" nil t)) + (forward-line) + (should + (string= + ": some text" + (buffer-substring-no-properties (point-at-bol) (point-at-eol))))))) + +(ert-deftest test-ob/commented-last-block-line-with-var () + (org-test-with-temp-text-in-file " +#+begin_src emacs-lisp :var a=1 +;; +#+end_src" + (progn + (org-babel-next-src-block) + (org-ctrl-c-ctrl-c) + (re-search-forward "\\#\\+results:" nil t) + (forward-line) + (should (string= + "" + (buffer-substring-no-properties (point-at-bol) (point-at-eol)))))) + (org-test-with-temp-text-in-file " +#+begin_src emacs-lisp :var a=2 +2;; +#+end_src" + (progn + (org-babel-next-src-block) + (org-ctrl-c-ctrl-c) + (re-search-forward "\\#\\+results:" nil t) + (forward-line) + (should (string= + ": 2" + (buffer-substring-no-properties (point-at-bol) (point-at-eol))))))) + +(defun test-ob-verify-result-and-removed-result (result buffer-text) + "Test helper function to test `org-babel-remove-result'. +A temp buffer is populated with BUFFER-TEXT, the first block is executed, +and the result of execution is verified against RESULT. + +The block is actually executed /twice/ to ensure result +replacement happens correctly." + (org-test-with-temp-text + buffer-text + (progn + (org-babel-next-src-block) (org-ctrl-c-ctrl-c) (org-ctrl-c-ctrl-c) + (should (re-search-forward "\\#\\+results:" nil t)) + (forward-line) + (should (string= result (buffer-substring-no-properties - (point-min) (point-max))))))) - -(ert-deftest test-org-babel/inline-src-block-preceded-by-equality () - (let ((test-line "=src_emacs-lisp[ :results verbatim ]{ \"x\" }")) - (org-test-with-temp-text - test-line - (forward-char 1) - (org-ctrl-c-ctrl-c) - (should (string= (concat test-line " =\"x\"=") - (buffer-substring-no-properties - (point-min) (point-max))))))) - -(ert-deftest test-org-babel/inline-src-block-enclosed-within-parenthesis () - (let ((test-line "(src_emacs-lisp[ :results verbatim ]{ \"x\" }")) - (org-test-with-temp-text - (concat test-line ")") - (forward-char 1) - (org-ctrl-c-ctrl-c) - (should (string= (concat test-line " =\"x\"=)" ) + (point-at-bol) + (- (point-max) 16)))) + (org-babel-previous-src-block) (org-babel-remove-result) + (should (string= buffer-text (buffer-substring-no-properties (point-min) (point-max))))))) @@ -726,31 +779,17 @@ Line 3\" * next heading")) -(ert-deftest test-org-babel/inline-src_blk-preceded-by-letter () - "Test inline source block invalid where preceded by letter" +(ert-deftest test-ob/org-babel-remove-result--results-pp () + "Test `org-babel-remove-result' with :results pp." + (test-ob-verify-result-and-removed-result + ": \"I /am/ working!\"" - ;; inline-src-blk preceded by letter - (org-test-with-temp-text - "asrc_emacs-lisp[ :results verbatim ]{ \"x\" }" - (forward-char 1) - (let ((error-result - (should-error - (org-ctrl-c-ctrl-c)))) - (should (equal `(error "C-c C-c can do nothing useful at this location") - error-result))))) +"* org-babel-remove-result +#+begin_src emacs-lisp :results pp +\"I /am/ working!\") +#+end_src -(ert-deftest test-org-babel/inline-src_blk-preceded-by-number () - "Test inline source block invalid where preceded by number" - - ;; inline-src-blk preceded by number - (org-test-with-temp-text - "0src_emacs-lisp[ :results verbatim ]{ \"x\" }" - (forward-char 1) - (let ((error-result - (should-error - (org-ctrl-c-ctrl-c)))) - (should (equal `(error "C-c C-c can do nothing useful at this location") - error-result))))) +* next heading")) (provide 'test-ob) From 4fd652d3614aae391f1800577f8ce222987704e4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 13 Feb 2012 11:22:37 +0100 Subject: [PATCH 29/30] Correctly unfold headlines containing an inlinetask * lisp/org.el (org-cycle-internal-local): Correctly unfold headlines containing an inlinetask. Based on a patch from Marc-Oliver Ihm. --- lisp/org.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org.el b/lisp/org.el index 2e4ab336b..74329b517 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -6312,7 +6312,7 @@ in special contexts. (if (org-at-item-p) (org-list-set-item-visibility (point-at-bol) struct 'children) (org-show-entry) - (show-children) + (org-with-limited-levels (show-children)) (when (memq 'org-cycle-hide-drawers org-cycle-hook) (org-cycle-hide-drawers 'subtree)) ;; Fold every list in subtree to top-level items. From 8b7a3f249803aba612f9ad3ae50c2fc986247da4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 16 Feb 2012 23:47:43 +0100 Subject: [PATCH 30/30] org-list: Remove two defcustoms * lisp/org-list.el (org-list-ending-method, org-list-end-regexp): Removed variables. (org-in-item-p, org-list-separating-blank-lines-number, org-list-parse-list, org-list-struct): Apply changes. * lisp/org-exp.el (org-export-mark-list-end, org-export-mark-list-properties): Apply changes. * lisp/org-latex.el (org-export-latex-lists): Apply changes. * doc/org.texi (Plain lists): Document removal. Conflicts: lisp/org-list.el --- doc/org.texi | 11 ++----- lisp/org-exp.el | 6 ++-- lisp/org-latex.el | 4 +-- lisp/org-list.el | 83 ++++++++++------------------------------------- 4 files changed, 23 insertions(+), 81 deletions(-) diff --git a/doc/org.texi b/doc/org.texi index b65d3c928..a4cb39dc6 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -1587,16 +1587,11 @@ line. In particular, if an ordered list reaches number @samp{10.}, then the list. An item ends before the next line that is less or equally indented than its bullet/number. -@vindex org-list-ending-method -@vindex org-list-end-regexp @vindex org-empty-line-terminates-plain-lists -Two methods@footnote{To disable either of them, configure -@code{org-list-ending-method}.} are provided to terminate lists. A list ends -whenever every item has ended, which means before any line less or equally -indented than items at top level. It also ends before two blank +A list ends whenever every item has ended, which means before any line less +or equally indented than items at top level. It also ends before two blank lines@footnote{See also @code{org-empty-line-terminates-plain-lists}.}. In -that case, all items are closed. For finer control, you can end lists with -any pattern set in @code{org-list-end-regexp}. Here is an example: +that case, all items are closed. Here is an example: @example @group diff --git a/lisp/org-exp.el b/lisp/org-exp.el index 995a63735..c338c7b2d 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -1808,8 +1808,7 @@ These special cookies will later be interpreted by the backend." (top (point-at-bol)) (top-ind (org-list-get-ind top struct))) (goto-char bottom) - (when (and (not (eq org-list-ending-method 'indent)) - (not (looking-at "[ \t]*$")) + (when (and (not (looking-at "[ \t]*$")) (looking-at org-list-end-re)) (replace-match "")) (unless (bolp) (insert "\n")) @@ -1867,8 +1866,7 @@ These special properties will later be interpreted by the backend." ;; useful to line processing exporters. (goto-char bottom) (when (or (looking-at "^ORG-LIST-END-MARKER\n") - (and (not (eq org-list-ending-method 'indent)) - (not (looking-at "[ \t]*$")) + (and (not (looking-at "[ \t]*$")) (looking-at org-list-end-re))) (replace-match "")) (unless (bolp) (insert "\n")) diff --git a/lisp/org-latex.el b/lisp/org-latex.el index 57cb5bac7..905779750 100644 --- a/lisp/org-latex.el +++ b/lisp/org-latex.el @@ -2572,9 +2572,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER." "Convert plain text lists in current buffer into LaTeX lists." ;; `org-list-end-re' output has changed since preprocess from ;; org-exp.el. Make sure it is taken into account. - (let ((org-list-ending-method - (if (eq org-list-ending-method 'regexp) 'regexp 'both)) - (org-list-end-re "^ORG-LIST-END-MARKER\n")) + (let ((org-list-end-re "^ORG-LIST-END-MARKER\n")) (mapc (lambda (e) ;; For each type of context allowed for list export (E), find diff --git a/lisp/org-list.el b/lisp/org-list.el index 20765af85..d62adb5be 100644 --- a/lisp/org-list.el +++ b/lisp/org-list.el @@ -229,42 +229,12 @@ spaces instead of one after the bullet in each item of the list." (const :tag "never" nil) (regexp))) -(defcustom org-list-ending-method 'both - "Determine where plain lists should end. -Valid values are: `regexp', `indent' or `both'. - -When set to `regexp', Org will look into two variables, -`org-empty-line-terminates-plain-lists' and the more general -`org-list-end-regexp', to determine what will end lists. - -When set to `indent', a list will end whenever a line following -an item, but not starting one, is less or equally indented than -the first item of the list. - -When set to `both', each of the preceding methods is applied to -determine lists endings. This is the default method." - :group 'org-plain-lists - :type '(choice - (const :tag "With a regexp defining ending" regexp) - (const :tag "With indentation of regular (no bullet) text" indent) - (const :tag "With both methods" both))) - (defcustom org-empty-line-terminates-plain-lists nil "Non-nil means an empty line ends all plain list levels. -This variable only makes sense if `org-list-ending-method' is set -to `regexp' or `both'. This is then equivalent to set -`org-list-end-regexp' to \"^[ \\t]*$\"." +Otherwise, two of them will be necessary." :group 'org-plain-lists :type 'boolean) -(defcustom org-list-end-regexp "^[ \t]*\n[ \t]*\n" - "Regexp matching the end of all plain list levels. -It must start with \"^\" and end with \"\\n\". It defaults to 2 -blank lines. `org-empty-line-terminates-plain-lists' has -precedence over it." - :group 'org-plain-lists - :type 'string) - (defcustom org-list-automatic-rules '((bullet . t) (checkbox . t) (indent . t)) @@ -381,9 +351,8 @@ specifically, type `block' is determined by the variable ;;; Predicates and regexps -(defconst org-list-end-re (if org-empty-line-terminates-plain-lists - "^[ \t]*\n" - org-list-end-regexp) +(defconst org-list-end-re (if org-empty-line-terminates-plain-lists "^[ \t]*\n" + "^[ \t]*\n[ \t]*\n") "Regex corresponding to the end of a list. It depends on `org-empty-line-terminates-plain-lists'.") @@ -432,8 +401,7 @@ group 4: description tag") (not (org-in-block-p org-list-forbidden-blocks))) (defun org-in-item-p () - "Return item beginning position when in a plain list, nil otherwise. -This checks `org-list-ending-method'." + "Return item beginning position when in a plain list, nil otherwise." (save-excursion (beginning-of-line) (let* ((case-fold-search t) @@ -460,8 +428,7 @@ This checks `org-list-ending-method'." ;; to compute its boundaries END-BOUNDS. When point is ;; in-between, move cursor before regexp beginning. (let ((hl 0) (i -1) end-bounds) - (when (and (not (eq org-list-ending-method 'indent)) - (progn + (when (and (progn (while (setq i (string-match "[\r\n]" org-list-end-re (1+ i))) (setq hl (1+ hl))) @@ -470,23 +437,18 @@ This checks `org-list-ending-method'." (< (point) (cdr end-bounds))) (goto-char (car end-bounds)) (forward-line -1))) - ;; Look for an item, less indented that reference line if - ;; `org-list-ending-method' isn't `regexp'. + ;; Look for an item, less indented that reference line. (catch 'exit (while t (let ((ind (org-get-indentation))) (cond ;; This is exactly what we want. - ((and (looking-at item-re) - (or (< ind ind-ref) - (eq org-list-ending-method 'regexp))) + ((and (looking-at item-re) (< ind ind-ref)) (throw 'exit (point))) ;; At upper bound of search or looking at the end of a ;; previous list: search is over. ((<= (point) lim-up) (throw 'exit nil)) - ((and (not (eq org-list-ending-method 'indent)) - (looking-at org-list-end-re)) - (throw 'exit nil)) + ((looking-at org-list-end-re) (throw 'exit nil)) ;; Skip blocks, drawers, inline-tasks, blank lines ((and (looking-at "^[ \t]*#\\+end_") (re-search-backward "^[ \t]*#\\+begin_" lim-up t))) @@ -703,8 +665,7 @@ Assume point is at an item." (forward-line -1)) ;; Looking at a list ending regexp. Dismiss useless ;; data recorded above BEG-CELL. Jump to part 2. - ((and (not (eq org-list-ending-method 'indent)) - (looking-at org-list-end-re)) + ((looking-at org-list-end-re) (throw 'exit (setq itm-lst (memq (assq (car beg-cell) itm-lst) itm-lst)))) @@ -716,9 +677,7 @@ Assume point is at an item." ((looking-at item-re) (push (funcall assoc-at-point ind) itm-lst) (push (cons ind (point)) end-lst) - (when (or (and (eq org-list-ending-method 'regexp) - (<= ind (cdr beg-cell))) - (< ind text-min-ind)) + (when (or (<= ind (cdr beg-cell)) (< ind text-min-ind)) (setq beg-cell (cons (point) ind))) (forward-line -1)) ;; Skip blocks, drawers, inline tasks, blank lines. @@ -732,14 +691,13 @@ Assume point is at an item." (forward-line -1)) ((looking-at "^[ \t]*$") (forward-line -1)) - ;; From there, point is not at an item. Unless ending - ;; method is `regexp', interpret line's indentation: + ;; From there, point is not at an item. Interpret + ;; line's indentation: ;; - text at column 0 is necessarily out of any list. ;; Dismiss data recorded above BEG-CELL. Jump to ;; part 2. ;; - any other case may be an ending position for an ;; hypothetical item above. Store it and proceed. - ((eq org-list-ending-method 'regexp) (forward-line -1)) ((zerop ind) (throw 'exit (setq itm-lst @@ -771,8 +729,7 @@ Assume point is at an item." (next-single-property-change (point) 'org-example nil lim-down))) ;; Looking at a list ending regexp. Save point as an ;; ending position and jump to part 3. - ((and (not (eq org-list-ending-method 'indent)) - (looking-at org-list-end-re)) + ((looking-at org-list-end-re) (throw 'exit (push (cons 0 (point)) end-lst-2))) ((looking-at item-re) ;; Point is at an item. Add data to ITM-LST-2. It may @@ -788,16 +745,14 @@ Assume point is at an item." ;; Ind is lesser or equal than BEG-CELL's. The list is ;; over: store point as an ending position and jump to ;; part 3. - ((and (not (eq org-list-ending-method 'regexp)) - (<= ind (cdr beg-cell))) + ((<= ind (cdr beg-cell)) (throw 'exit (push (cons 0 (funcall end-before-blank)) end-lst-2))) ;; Else, if ind is lesser or equal than previous item's, ;; this is an ending position: store it. In any case, ;; skip block or drawer at point, and move to next line. (t - (when (and (not (eq org-list-ending-method 'regexp)) - (<= ind (nth 1 (car itm-lst-2)))) + (when (<= ind (nth 1 (car itm-lst-2))) (push (cons ind (point)) end-lst-2)) (cond ((and (looking-at "^[ \t]*#\\+begin_") @@ -1192,9 +1147,7 @@ some heuristics to guess the result." (point)))))))) (cond ;; Trivial cases where there should be none. - ((or (and (not (eq org-list-ending-method 'indent)) - org-empty-line-terminates-plain-lists) - (not insert-blank-p)) 0) + ((or org-empty-line-terminates-plain-lists (not insert-blank-p)) 0) ;; When `org-blank-before-new-entry' says so, it is 1. ((eq insert-blank-p t) 1) ;; `plain-list-item' is 'auto. Count blank lines separating @@ -2929,9 +2882,7 @@ Point is left at list end." (goto-char top) (when delete (delete-region top bottom) - (when (and (not (eq org-list-ending-method 'indent)) - (not (looking-at "[ \t]*$")) - (looking-at org-list-end-re)) + (when (and (not (looking-at "[ \t]*$")) (looking-at org-list-end-re)) (replace-match ""))) out))