* [PATCH] default base-extension .org for org-publish @ 2010-07-05 8:14 Daniel Clemente 2010-07-06 10:57 ` Patchwork: Patch 112 Accepted Carsten Dominik 2010-07-06 10:58 ` [PATCH] default base-extension .org for org-publish Carsten Dominik 0 siblings, 2 replies; 3+ messages in thread From: Daniel Clemente @ 2010-07-05 8:14 UTC (permalink / raw) To: org-mode Mailinglist Org-publish: correctly find files in projects which didn't define a base-extension. Previously, (org-publish-get-project-from-filename "~/org/file.org") would return nil because the constructed regular expression "^/home/dc/org/.+\\.\\(\\)$" required a dot at the end. #+BEGIN_QUOTE diff --git a/lisp/org-publish.el b/lisp/org-publish.el index b387e7b..a50cf56 100644 --- a/lisp/org-publish.el +++ b/lisp/org-publish.el @@ -466,7 +466,7 @@ matching filenames." ;; [[info:org:Selecting%20files]] shows how this is supposed to work: (let* ((r (plist-get (cdr prj) :recursive)) (b (expand-file-name (plist-get (cdr prj) :base-directory))) - (x (plist-get (cdr prj) :base-extension)) + (x (or (plist-get (cdr prj) :base-extension) "org")) (e (plist-get (cdr prj) :exclude)) (i (plist-get (cdr prj) :include)) (xm (concat "^" b (if r ".+" "[^/]+") "\\.\\(" x "\\)$"))) #+END_QUOTE ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Patchwork: Patch 112 Accepted 2010-07-05 8:14 [PATCH] default base-extension .org for org-publish Daniel Clemente @ 2010-07-06 10:57 ` Carsten Dominik 2010-07-06 10:58 ` [PATCH] default base-extension .org for org-publish Carsten Dominik 1 sibling, 0 replies; 3+ messages in thread From: Carsten Dominik @ 2010-07-06 10:57 UTC (permalink / raw) To: emacs-orgmode Patch 112 (http://patchwork.newartisans.com/patch/112/) is now Accepted. This relates to the following submission: http://mid.gmane.org/%3C87sk3y2vlo.wl%25n142857%40gmail.com%3E ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] default base-extension .org for org-publish 2010-07-05 8:14 [PATCH] default base-extension .org for org-publish Daniel Clemente 2010-07-06 10:57 ` Patchwork: Patch 112 Accepted Carsten Dominik @ 2010-07-06 10:58 ` Carsten Dominik 1 sibling, 0 replies; 3+ messages in thread From: Carsten Dominik @ 2010-07-06 10:58 UTC (permalink / raw) To: Daniel Clemente; +Cc: org-mode Mailinglist Applied, thanks. - Carsten On Jul 5, 2010, at 10:14 AM, Daniel Clemente wrote: > > Org-publish: correctly find files in projects which didn't define a > base-extension. > Previously, (org-publish-get-project-from-filename "~/org/file.org") > would return nil because the constructed regular expression "^/home/ > dc/org/.+\\.\\(\\)$" required a dot at the end. > > #+BEGIN_QUOTE > diff --git a/lisp/org-publish.el b/lisp/org-publish.el > index b387e7b..a50cf56 100644 > --- a/lisp/org-publish.el > +++ b/lisp/org-publish.el > @@ -466,7 +466,7 @@ matching filenames." > ;; [[info:org:Selecting%20files]] shows how this is supposed to > work: > (let* ((r (plist-get (cdr prj) :recursive)) > (b (expand-file-name (plist-get (cdr prj) :base-directory))) > - (x (plist-get (cdr prj) :base-extension)) > + (x (or (plist-get (cdr prj) :base-extension) "org")) > (e (plist-get (cdr prj) :exclude)) > (i (plist-get (cdr prj) :include)) > (xm (concat "^" b (if r ".+" "[^/]+") "\\.\\(" x "\\)$"))) > > #+END_QUOTE > > _______________________________________________ > Emacs-orgmode mailing list > Please use `Reply All' to send replies to the list. > Emacs-orgmode@gnu.org > http://lists.gnu.org/mailman/listinfo/emacs-orgmode - Carsten ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-07-06 10:58 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-07-05 8:14 [PATCH] default base-extension .org for org-publish Daniel Clemente 2010-07-06 10:57 ` Patchwork: Patch 112 Accepted Carsten Dominik 2010-07-06 10:58 ` [PATCH] default base-extension .org for org-publish Carsten Dominik
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/emacs/org-mode.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).