From mboxrd@z Thu Jan 1 00:00:00 1970 From: Martyn Jago Subject: Re: Org release 7.8.04 (BUGFIX-only release) Date: Sun, 18 Mar 2012 21:49:06 +0000 Message-ID: References: <87haxopcoj.fsf@gnu.org> <87vcm39oqw.fsf@gnu.org> <8762e3m6x6.fsf@Rainer.invalid> <87d38a5fgg.fsf@gnu.org> <87y5qxhfh8.fsf@Rainer.invalid> <87ty1lhb1m.fsf@Rainer.invalid> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([208.118.235.92]:58372) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S9Nya-00040h-76 for emacs-orgmode@gnu.org; Sun, 18 Mar 2012 17:49:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S9NyY-0004kX-2m for emacs-orgmode@gnu.org; Sun, 18 Mar 2012 17:49:19 -0400 Received: from plane.gmane.org ([80.91.229.3]:34059) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S9NyX-0004kP-Oo for emacs-orgmode@gnu.org; Sun, 18 Mar 2012 17:49:18 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1S9NyW-0005Et-9z for emacs-orgmode@gnu.org; Sun, 18 Mar 2012 22:49:16 +0100 Received: from 88-96-171-142.dsl.zen.co.uk ([88.96.171.142]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 18 Mar 2012 22:49:16 +0100 Received: from martyn.jago by 88-96-171-142.dsl.zen.co.uk with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 18 Mar 2012 22:49:16 +0100 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org Hi Since all the `errors' are whitespace it may be better to work around the release? Best Martyn Achim Gratz writes: > Achim Gratz writes: >> Well, all this "manual reverting" messed up master quite royally. I >> haven't checked maint, but things might be a bit easier there. I'm >> currently trying to re-trace what master and maint should have been and >> make a patch on top of the mangled versions... > > Here are two patches to clean up master and maint to where they should > be (IMHO, please check). Needless to say, you _will_ have to do another > release with these fixes. > > diff --git a/contrib/babel/langs/ob-oz.el b/contrib/babel/langs/ob-oz.el > index 2482ed61685cde75f38f803f564ed128e1063e68..b778b4a228c6e75d982db81f280515806cbed4d6 100644 > --- a/contrib/babel/langs/ob-oz.el > +++ b/contrib/babel/langs/ob-oz.el > @@ -1,6 +1,6 @@ > ;;; ob-oz.el --- org-babel functions for Oz evaluation > > -;; Copyright (C) 2009-2012 Torsten Anders and Eric Schulte > +;; Copyright (C) 2009-2012 Torsten Anders and Eric Schulte > > ;; Author: Torsten Anders and Eric Schulte > ;; Keywords: literate programming, reproducible research > diff --git a/contrib/scripts/StartOzServer.oz b/contrib/scripts/StartOzServer.oz > index 9d41e838dc121b8a82e1516cb0e0d7fb7d0e6b72..db12dec58d783992529aa51273eeaf2e8e5fba38 100644 > --- a/contrib/scripts/StartOzServer.oz > +++ b/contrib/scripts/StartOzServer.oz > @@ -1,5 +1,5 @@ > %%% ************************************************************* > -%%% Copyright (C) 2009-2012 Torsten Anders (www.torsten-anders.de) > +%%% Copyright (C) 2009-2012 Torsten Anders (www.torsten-anders.de) > %%% This program 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 2 > diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el > index 2299dd47f4117ad16f3368f2c56df4b72dcd3424..06d193a1a17ce1054086c1a6e1386de3a3989593 100644 > --- a/lisp/ob-exp.el > +++ b/lisp/ob-exp.el > @@ -120,7 +120,7 @@ (defun org-babel-exp-src-block (body &rest headers) > (org-babel-noweb-wrap) "" (nth 1 info)) > (if (org-babel-noweb-p (nth 2 info) :export) > (org-babel-expand-noweb-references > - info (org-babel-exp-get-export-buffer)) > + info (org-babel-exp-get-export-buffer)) > (nth 1 info)))) > (org-babel-exp-do-export info 'block hash))))) > > diff --git a/lisp/org-inlinetask.el b/lisp/org-inlinetask.el > index dbb9b22ef3cb825cd603c766d2a7ce47e63cea1c..d969a29213a0b92635afc4350ec7a722f1c7350d 100644 > --- a/lisp/org-inlinetask.el > +++ b/lisp/org-inlinetask.el > @@ -90,7 +90,7 @@ (defgroup org-inlinetask nil > > (defcustom org-inlinetask-min-level 15 > "Minimum level a headline must have before it is treated as an inline task. > -Don't set it to something higher than `29' or clocking will break since this > +Don't set it to something higher than `29' or clocking will break since this > is the hardcoded maximum number of stars `org-clock-sum' will work with. > > It is strongly recommended that you set `org-cycle-max-level' not at all, > diff --git a/lisp/org-vm.el b/lisp/org-vm.el > index 16987495b142fb10c81f4d61e21c6b43eda2b97b..b509c4108d16819bcb383ac89810484d9473f789 100644 > --- a/lisp/org-vm.el > +++ b/lisp/org-vm.el > @@ -71,7 +71,7 @@ (defun org-vm-store-link () > (save-excursion > (vm-select-folder-buffer) > (let* ((message (car vm-message-pointer)) > - (subject (vm-su-subject message)) > + (subject (vm-su-subject message)) > (to (vm-get-header-contents message "To")) > (from (vm-get-header-contents message "From")) > (message-id (vm-su-message-id message)) > diff --git a/testing/lisp/test-ob-exp.el b/testing/lisp/test-ob-exp.el > index f86d84ae336f940f5096007fad8a65e43a75ab68..342ebed0bf5e24a16d5d32f6732f48d3483c5530 100644 > --- a/testing/lisp/test-ob-exp.el > +++ b/testing/lisp/test-ob-exp.el > @@ -267,3 +267,4 @@ > (provide 'test-ob-exp) > > ;;; test-ob-exp.el ends here > + > diff --git a/testing/lisp/test-ob.el b/testing/lisp/test-ob.el > index 5f9e29cb4e2bf03044cefe6a0e7318a6faf8f497..b01e4b2ba2b8c350f1b81991b76a7a45050122cb 100644 > --- a/testing/lisp/test-ob.el > +++ b/testing/lisp/test-ob.el > @@ -875,7 +875,7 @@ (defun test-ob-verify-result-and-removed-result (result buffer-text) > (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 > @@ -887,7 +887,7 @@ (defun test-ob-verify-result-and-removed-result (result buffer-text) > (re-search-forward "\\#\\+results:" nil t) > (forward-line) > (should (string= > - ": 2" > + ": 2" > (buffer-substring-no-properties (point-at-bol) (point-at-eol))))))) > > (defun test-ob-verify-result-and-removed-result (result buffer-text) > @@ -903,7 +903,7 @@ (defun test-ob-verify-result-and-removed-result (result buffer-text) > (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 > + (should (string= result > (buffer-substring-no-properties > (point-at-bol) > (- (point-max) 16)))) > @@ -1036,7 +1036,7 @@ (defun test-ob-verify-result-and-removed-result (result buffer-text) > (org-test-with-temp-text "Block two has a space after the name. > > #+name: foo > - #+begin_src emacs-lisp > + #+begin_src emacs-lisp > 1 > #+end_src emacs-lisp > > diff --git a/testing/lisp/test-org-table.el b/testing/lisp/test-org-table.el > index 92c136d651e1d1f1800863f27081317d98fa6970..cdcc5dd0b95a4879dd86e9b94f590860c2d2bdc9 100644 > --- a/testing/lisp/test-org-table.el > +++ b/testing/lisp/test-org-table.el > @@ -60,7 +60,7 @@ > | | > #+TBLFM: $1=vsum(@1..@-1) > " > - (progn > + (progn > (re-search-forward (regexp-quote "#+tblname: simple-formula") nil t) > (forward-line 1) > (should (org-at-table-p)) > > > HTH, > Achim.