Re: [O] [PATCH] Modifications to enable test script to run with emacs-23 and emacs-22
Achim Gratz writes: > Eric Schulte writes: >> Hmm, the problem could be on my end. I manually copy and paste inline >> patches into files (I never found out how to write an inline attachment >> to a file with gnus), so it is possible that I am breaking commit >> messages during that step. I'll look more closely during the next >> patch. > > a) You don't need to extract the patch at all, git apply is smart > enough to do this by itself. > > b) K b will switch the display in Gnus so that the MIME part markers > become visible (W M v switches back) and you can use the context menu on > those to save parts (or do a K o on the part). > > c) Save MIME parts as with K m and select text/x-patch as the type to > save. > Great, thanks, this is very helpful. -- Eric > > > Regards, > Achim. -- Eric Schulte http://cs.unm.edu/~eschulte/
Re: [O] [PATCH] Modifications to enable test script to run with emacs-23 and emacs-22
Eric Schulte writes: > Hmm, the problem could be on my end. I manually copy and paste inline > patches into files (I never found out how to write an inline attachment > to a file with gnus), so it is possible that I am breaking commit > messages during that step. I'll look more closely during the next > patch. a) You don't need to extract the patch at all, git apply is smart enough to do this by itself. b) K b will switch the display in Gnus so that the MIME part markers become visible (W M v switches back) and you can use the context menu on those to save parts (or do a K o on the part). c) Save MIME parts as with K m and select text/x-patch as the type to save. Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ Factory and User Sound Singles for Waldorf Blofeld: http://Synth.Stromeko.net/Downloads.html#WaldorfSounds
Re: [O] [PATCH] Modifications to enable test script to run with emacs-23 and emacs-22
Martyn Jago writes: > Hi David > > David Maus writes: > >> Hi Eric, >> Hi Martyn, >> >> At Tue, 20 Sep 2011 09:03:27 -0600, >> Eric Schulte wrote: >>> >>> Applied, Thanks! -- Eric >> >> I noticed that newlines in the commit messages of patches by Martyn >> are somehow messed up: >> >> , >> | Modifications to enable test script to run with emacs-23 and >> emacs-22 * testing/org-test.el: enable test script to run with >> emacs-23 and emacs-22 * testing/lisp/test-org-exp.el: added org-ascii >> requirement >> ` > > I too have noticed this - I generate the commit message in magit and > generate the patch with git format-patch, and at that point newlines > still appear to be honoured here. I then attach the patch inline to > gnus. Any solutions welcome. > Hmm, the problem could be on my end. I manually copy and paste inline patches into files (I never found out how to write an inline attachment to a file with gnus), so it is possible that I am breaking commit messages during that step. I'll look more closely during the next patch. Cheers -- Eric > > Best, Martyn > > -- Eric Schulte http://cs.unm.edu/~eschulte/
Re: [O] [PATCH] Modifications to enable test script to run with emacs-23 and emacs-22
Hi David David Maus writes: > Hi Eric, > Hi Martyn, > > At Tue, 20 Sep 2011 09:03:27 -0600, > Eric Schulte wrote: >> >> Applied, Thanks! -- Eric > > I noticed that newlines in the commit messages of patches by Martyn > are somehow messed up: > > , > | Modifications to enable test script to run with emacs-23 and > emacs-22 * testing/org-test.el: enable test script to run with > emacs-23 and emacs-22 * testing/lisp/test-org-exp.el: added org-ascii > requirement > ` I too have noticed this - I generate the commit message in magit and generate the patch with git format-patch, and at that point newlines still appear to be honoured here. I then attach the patch inline to gnus. Any solutions welcome. Best, Martyn
Re: [O] [PATCH] Modifications to enable test script to run with emacs-23 and emacs-22
Hi Eric, Hi Martyn, At Tue, 20 Sep 2011 09:03:27 -0600, Eric Schulte wrote: > > Applied, Thanks! -- Eric I noticed that newlines in the commit messages of patches by Martyn are somehow messed up: , | Modifications to enable test script to run with emacs-23 and emacs-22 * testing/org-test.el: enable test script to run with emacs-23 and emacs-22 * testing/lisp/test-org-exp.el: added org-ascii requirement ` Best, -- David -- OpenPGP... 0x99ADB83B5A4478E6 Jabber dmj...@jabber.org Email. dm...@ictsoc.de pgpdSTFxk8QrI.pgp Description: PGP signature
Re: [O] [PATCH] Modifications to enable test script to run with emacs-23 and emacs-22
Applied, Thanks! -- Eric Martyn Jago writes: > Hi > > With this patch, the command-line test script now passes all tests on > Emacs 24, 23 and 22. > > On 23 and 22, testing directory should include ert.el and ert-x.el > > Best, Martyn > > From 6ab323b099f55462f690d44f6ad482c962461a97 Mon Sep 17 00:00:00 2001 > From: Martyn Jago > Date: Tue, 20 Sep 2011 08:44:24 +0100 > Subject: [PATCH] Modifications to enable test script to run with emacs-23 and > emacs-22 > * testing/org-test.el: > enable test script to run with emacs-23 and emacs-22 > * testing/lisp/test-org-exp.el: added org-ascii requirement > > --- > testing/lisp/test-org-exp.el | 15 +++-- > testing/org-test.el | 112 + > 2 files changed, 66 insertions(+), 61 deletions(-) > > diff --git a/testing/lisp/test-org-exp.el b/testing/lisp/test-org-exp.el > index 348538f..0ed8d68 100644 > --- a/testing/lisp/test-org-exp.el > +++ b/testing/lisp/test-org-exp.el > @@ -7,11 +7,12 @@ > ;; see: http://www.gnu.org/licenses/gpl-3.0.html > > (let ((load-path (cons (expand-file-name > - ".." (file-name-directory > - (or load-file-name buffer-file-name))) > -load-path))) > +".." (file-name-directory > + (or load-file-name buffer-file-name))) > + load-path))) >(require 'org-test) > - (require 'org-test-ob-consts)) > + (require 'org-test-ob-consts) > + (require 'org-ascii)) > > (ert-deftest test-org-exp/stripping-commas () >"Test the stripping of commas from within blocks during export." > @@ -19,5 +20,7 @@ > ;; don't strip internal commas > (org-narrow-to-subtree) > (should (string-match > - ", 2" > - (org-export-as-ascii nil nil nil 'string) > + ", 2" > + (org-export-as-ascii nil nil nil 'string) > + > +(provide 'test-org-exp) > diff --git a/testing/org-test.el b/testing/org-test.el > index 7789cbe..9b4313f 100644 > --- a/testing/org-test.el > +++ b/testing/org-test.el > @@ -30,17 +30,20 @@ > > > Code: > -(let ((org-test-dir (expand-file-name > +(let* ((org-test-dir (expand-file-name > (file-name-directory > -(or load-file-name buffer-file-name) > - (let ((org-lisp-dir (expand-file-name > -(concat org-test-dir "../lisp" > - (unless (featurep 'org) > - (setq load-path (cons org-lisp-dir load-path)) > - (org-babel-do-load-languages > - 'org-babel-load-languages '((sh . t) > - (let* ((load-path (cons > - (expand-file-name "ert" org-test-dir) > +(or load-file-name buffer-file-name > + (org-lisp-dir (expand-file-name > + (concat org-test-dir "../lisp" > + > + (unless (featurep 'org) > +(setq load-path (cons org-lisp-dir load-path)) > +(require 'org) > +(org-babel-do-load-languages > + 'org-babel-load-languages '((sh . t > + > + (let* ((load-path (cons > + org-test-dir >(cons > (expand-file-name "jump" org-test-dir) > load-path > @@ -69,8 +72,7 @@ > (when (file-exists-p > (expand-file-name "jump/jump.el" org-test-dir)) >(require 'jump) > - (require 'which-func)) > -(require 'org))) > + (require 'which-func > > (defconst org-test-default-test-file-name "tests.el" >"For each defun a separate file with tests may be defined. > @@ -181,49 +183,49 @@ then remove it and place the point there before running > BODY." > > ;;; Navigation Functions > (when (featurep 'jump) > -(defjump org-test-jump > - (("lisp/\\1.el" . "testing/lisp/test-\\1.el") > - ("lisp/\\1.el" . "testing/lisp/\\1.el/test.*.el") > - ("contrib/lisp/\\1.el" . "testing/contrib/lisp/test-\\1.el") > - ("contrib/lisp/\\1.el" . "testing/contrib/lisp/\\1.el/test.*.el") > - ("testing/lisp/test-\\1.el" . "lisp/\\1.el") > - ("testing/lisp/\\1.el" . "lisp/\\1.el/test.*.el") > - ("testing/contrib/lisp/test-\\1.el" . "contrib/lisp/\\1.el") > - ("testing/contrib/lisp/test-\\1.el" . "contrib/lisp/\\1.el/test.*.el")) > - (concat org-base-dir "/") > - "Jump between org-mode files and their tests." > - (lambda (path) > -(let* ((full-path (expand-file-name path org-base-dir)) > - (file-name (file-name-nondirectory path)) > - (name (file-name-sans-extension file-name))) > - (find-file full-path) > - (insert > - ";;; " file-name "\n\n" > - ";; Copyright (c) " (nth 5 (decode-time (current-time))) > - " " user-full-name "\n" > - ";; Authors: " user-full-name "\n\n" > - ";; Released under the GNU General Public License version 3\n" > - ";; see: http://www.gnu.org/licenses/gpl-3.0.html\n\n"; > - " Comments:\n\n" > - ";; Template test file f
[O] [PATCH] Modifications to enable test script to run with emacs-23 and emacs-22
Hi With this patch, the command-line test script now passes all tests on Emacs 24, 23 and 22. On 23 and 22, testing directory should include ert.el and ert-x.el Best, Martyn >From 6ab323b099f55462f690d44f6ad482c962461a97 Mon Sep 17 00:00:00 2001 From: Martyn Jago Date: Tue, 20 Sep 2011 08:44:24 +0100 Subject: [PATCH] Modifications to enable test script to run with emacs-23 and emacs-22 * testing/org-test.el: enable test script to run with emacs-23 and emacs-22 * testing/lisp/test-org-exp.el: added org-ascii requirement --- testing/lisp/test-org-exp.el | 15 +++-- testing/org-test.el | 112 + 2 files changed, 66 insertions(+), 61 deletions(-) diff --git a/testing/lisp/test-org-exp.el b/testing/lisp/test-org-exp.el index 348538f..0ed8d68 100644 --- a/testing/lisp/test-org-exp.el +++ b/testing/lisp/test-org-exp.el @@ -7,11 +7,12 @@ ;; see: http://www.gnu.org/licenses/gpl-3.0.html (let ((load-path (cons (expand-file-name - ".." (file-name-directory - (or load-file-name buffer-file-name))) - load-path))) +".." (file-name-directory + (or load-file-name buffer-file-name))) + load-path))) (require 'org-test) - (require 'org-test-ob-consts)) + (require 'org-test-ob-consts) + (require 'org-ascii)) (ert-deftest test-org-exp/stripping-commas () "Test the stripping of commas from within blocks during export." @@ -19,5 +20,7 @@ ;; don't strip internal commas (org-narrow-to-subtree) (should (string-match - ", 2" - (org-export-as-ascii nil nil nil 'string) + ", 2" + (org-export-as-ascii nil nil nil 'string) + +(provide 'test-org-exp) diff --git a/testing/org-test.el b/testing/org-test.el index 7789cbe..9b4313f 100644 --- a/testing/org-test.el +++ b/testing/org-test.el @@ -30,17 +30,20 @@ Code: -(let ((org-test-dir (expand-file-name +(let* ((org-test-dir (expand-file-name (file-name-directory - (or load-file-name buffer-file-name) - (let ((org-lisp-dir (expand-file-name - (concat org-test-dir "../lisp" - (unless (featurep 'org) - (setq load-path (cons org-lisp-dir load-path)) - (org-babel-do-load-languages - 'org-babel-load-languages '((sh . t) - (let* ((load-path (cons - (expand-file-name "ert" org-test-dir) + (or load-file-name buffer-file-name + (org-lisp-dir (expand-file-name + (concat org-test-dir "../lisp" + + (unless (featurep 'org) +(setq load-path (cons org-lisp-dir load-path)) +(require 'org) +(org-babel-do-load-languages + 'org-babel-load-languages '((sh . t + + (let* ((load-path (cons + org-test-dir (cons (expand-file-name "jump" org-test-dir) load-path @@ -69,8 +72,7 @@ (when (file-exists-p (expand-file-name "jump/jump.el" org-test-dir)) (require 'jump) - (require 'which-func)) -(require 'org))) + (require 'which-func (defconst org-test-default-test-file-name "tests.el" "For each defun a separate file with tests may be defined. @@ -181,49 +183,49 @@ then remove it and place the point there before running BODY." ;;; Navigation Functions (when (featurep 'jump) -(defjump org-test-jump - (("lisp/\\1.el" . "testing/lisp/test-\\1.el") - ("lisp/\\1.el" . "testing/lisp/\\1.el/test.*.el") - ("contrib/lisp/\\1.el" . "testing/contrib/lisp/test-\\1.el") - ("contrib/lisp/\\1.el" . "testing/contrib/lisp/\\1.el/test.*.el") - ("testing/lisp/test-\\1.el" . "lisp/\\1.el") - ("testing/lisp/\\1.el" . "lisp/\\1.el/test.*.el") - ("testing/contrib/lisp/test-\\1.el" . "contrib/lisp/\\1.el") - ("testing/contrib/lisp/test-\\1.el" . "contrib/lisp/\\1.el/test.*.el")) - (concat org-base-dir "/") - "Jump between org-mode files and their tests." - (lambda (path) -(let* ((full-path (expand-file-name path org-base-dir)) - (file-name (file-name-nondirectory path)) - (name (file-name-sans-extension file-name))) - (find-file full-path) - (insert - ";;; " file-name "\n\n" - ";; Copyright (c) " (nth 5 (decode-time (current-time))) - " " user-full-name "\n" - ";; Authors: " user-full-name "\n\n" - ";; Released under the GNU General Public License version 3\n" - ";; see: http://www.gnu.org/licenses/gpl-3.0.html\n\n"; - " Comments:\n\n" - ";; Template test file for Org-mode tests\n\n" - "\n" - ";;; Code:\n" - "(let ((load-path (cons (expand-file-name\n" - " \"..\" (file-name-directory\n" - " (or load-file-name buffer-file-name)))\n" - " load-path)))\n" - " (require 'org-test)\n" - " (require 'org-test-ob-consts))\n\n" - "\n" - ";;; Tests\n" - "(ert-deftest " name "/example-test ()\n" - " \"Just an example to get you started.\"\n" - "