From b59074eca8896080ab8f6481ca367b938846fcbe Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Sun, 14 Nov 2010 15:50:47 +0000 Subject: [PATCH 1/6] babel: Avoid addition of unnecessary ellipsis * lisp/ob-table.el (org-babel-table-truncate-at-newline): Only add "..." if there is something after the newline. --- lisp/ob-table.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/ob-table.el b/lisp/ob-table.el index cdc7a6250..c0ca653e9 100644 --- a/lisp/ob-table.el +++ b/lisp/ob-table.el @@ -57,9 +57,9 @@ "Replace newline character with ellipses. If STRING ends in a newline character, then remove the newline character and replace it with ellipses." - (if (and (stringp string) (string-match "[\n\r]" string)) - (concat (substring string 0 (match-beginning 0)) "...") - string)) + (if (and (stringp string) (string-match "[\n\r]\\(.\\)?" string)) + (concat (substring string 0 (match-beginning 0)) + (if (match-string 1 string) "...")) string)) (defmacro sbe (source-block &rest variables) "Return the results of calling SOURCE-BLOCK with VARIABLES. From 674bc9230a728e93fec4674aa7d1bdbe5aa74d0d Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Tue, 16 Nov 2010 15:17:15 +0100 Subject: [PATCH 2/6] Fix typos --- README_maintainer | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README_maintainer b/README_maintainer index 76a039109..88e9e97b3 100644 --- a/README_maintainer +++ b/README_maintainer @@ -61,7 +61,7 @@ marked on the patchwork server as "changes requested". : pw update -s "Changed Requested" -m "What to change" NNN -This will sand an email to the contributor and the mailing list with a +This will send an email to the contributor and the mailing list with a request for changes. The =-m= message should not be more than one sentence and describe the requested changes. If you need to explain in more detail, write a separate email to the contributor. @@ -82,7 +82,7 @@ the HEAD state in the branch =t/patchNNN=. To merge, do this: : pw merge -m "maintainer comment" NNN -This will merge than patch into master, switch back to master and send +This will merge the patch into master, switch back to master and send an email to both contributor and mailing list stating that this change has been accepted, along with the comment given in the =-m= message. @@ -121,7 +121,7 @@ The release number for minor releases look like this: =7.13.01= Minor releases are small amends to main releases. Usually they fix bugs discovered in a main release. Only the fix to the bug is bundled into a release, without the main development work going on in -the master branch. Since the big fix will also be needed in the +the master branch. Since the bug fix will also be needed in the master branch, usually the fix is made in master and then cherry-picked into maint. When this is done, a release is made from maint with this command: @@ -145,7 +145,7 @@ change only this file, use =--only=. This is still a significant headache. Some hand work is needed here. -Emacs uses bzr, and while I see all the advantages thiswould have, I +Emacs uses bzr, and while I see all the advantages this would have, I cannot bring myself to switch away from git for my day-to-day work. So the way I have been doing things with Emacs is this: From 1fc14329a96c1046aaa4fd8614c3cdd8cf01446d Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Tue, 16 Nov 2010 15:22:14 +0100 Subject: [PATCH 3/6] Fix typos --- README_maintainer | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README_maintainer b/README_maintainer index 88e9e97b3..c76758742 100644 --- a/README_maintainer +++ b/README_maintainer @@ -1,8 +1,7 @@ - # -*- mode:org -*- #+title: Maintainer tasks -#+startup: indent +#+startup: noindent This document describes the tasks the Org-mode maintainer has to do and how they are performed. From 9b8118c48c2987a14b7c247858bf56471fab1687 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Tue, 16 Nov 2010 17:28:13 +0100 Subject: [PATCH 4/6] Fix typo --- doc/org.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/org.texi b/doc/org.texi index c2314fab7..57e020406 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -9326,7 +9326,7 @@ These options take effect in both the HTML and La@TeX{} export, except for @code{TeX} and @code{LaTeX}, which are respectively @code{t} and @code{nil} for the La@TeX{} export. The default values for these and many other options are given by a set of variables. For a list of such variables, the -corresponding OPTIONS keys and also the publishing keys (pxref{Project +corresponding OPTIONS keys and also the publishing keys (@pxref{Project alist}), see the constant @code{org-export-plist-vars}. When exporting only a single subtree by selecting it with @kbd{C-c @@} before From d08d603465bc44524aefc09b068e6848a059c660 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 16 Nov 2010 23:10:27 +0100 Subject: [PATCH 5/6] Makefile: use `staff' as the group name when building packages. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e6bdfbef8..5353c99d1 100644 --- a/Makefile +++ b/Makefile @@ -382,7 +382,7 @@ pkg: $(MKDIR) org-$(PKG_TAG) cp -r $(PKG_FILES) org-$(PKG_TAG) echo "(define-package \"org\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" > org-$(PKG_TAG)/org-pkg.el - tar cf org-$(PKG_TAG).tar org-$(PKG_TAG) --remove-files + tar cf org-$(PKG_TAG).tar org-$(PKG_TAG) --remove-files --group=staff makerelease: @if [ "X$(TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi From 026541365de411fd5d524398675c074b9c0beb09 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 16 Nov 2010 23:15:12 +0100 Subject: [PATCH 6/6] Revert "Makefile: use `staff' as the group name when building packages." This reverts commit d08d603465bc44524aefc09b068e6848a059c660. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5353c99d1..e6bdfbef8 100644 --- a/Makefile +++ b/Makefile @@ -382,7 +382,7 @@ pkg: $(MKDIR) org-$(PKG_TAG) cp -r $(PKG_FILES) org-$(PKG_TAG) echo "(define-package \"org\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" > org-$(PKG_TAG)/org-pkg.el - tar cf org-$(PKG_TAG).tar org-$(PKG_TAG) --remove-files --group=staff + tar cf org-$(PKG_TAG).tar org-$(PKG_TAG) --remove-files makerelease: @if [ "X$(TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi