Commit Graph

14879 Commits

Author SHA1 Message Date
Nicolas Goaziou b44fbb920c Merge branch 'maint' 2013-12-16 21:04:57 +01:00
Nicolas Goaziou b22714a88d org-element: Keep compatibility with Babel's regexps
* lisp/org-element.el (org-element-inline-babel-call-successor): Use
  original regexp to stay up-to-date with Babel changes.
2013-12-16 21:00:57 +01:00
Eric Schulte 085b7e8d16 no spaces in call line names
* lisp/ob-lob.el (org-babel-inline-lob-one-liner-regexp): Don't allow
  spaces in call line function names.
2013-12-16 08:04:59 -07:00
Aaron Ecay 5b9e79c8b8 org.el: use a shy regex for fontifying macros
* lisp/org.el (org-set-font-lock-defaults): use a shy regex for
identifying macros to fontify

Before this change, the xxx in the following text would be erroneously
fontified with the macro face:

{{{macro1()}}} xxx {{{macro2()}}}
2013-12-15 23:31:47 -05:00
Nicolas Goaziou d55f0632b5 Merge branch 'maint' 2013-12-15 16:18:31 +01:00
Nicolas Goaziou f1b9339aa5 org-element: Fix affiliated keyword regexp
* lisp/org-element.el (org-element--affiliated-re): Fix affiliated
  keyword regexp.
2013-12-15 16:16:20 +01:00
Nicolas Goaziou 29c02c3810 ox-org: Remove attr_backend keywords
* lisp/ox-org.el (org-org-identity): Since back-end specific keywords
  are stripped from output, also remove attr_backend keywords.
2013-12-15 15:17:24 +01:00
Nicolas Goaziou 4e02e48fa3 Merge branch 'maint'
Conflicts:
	doc/org.texi
2013-12-15 14:59:33 +01:00
Nicolas Goaziou 18d3057e62 org.texi: Document `org' back-end
* doc/org.texi (Org export): New section.
* lisp/ox-org.el: Remove initial code comments since this is now in
  manual.
2013-12-15 14:52:46 +01:00
Nicolas Goaziou b617d407ed Merge branch 'maint' 2013-12-15 11:55:44 +01:00
Nicolas Goaziou 7a80881d65 org.texi: Fix some whitespace errors
* doc/org.texi (HTML doctypes): Fix whitespace error.
2013-12-15 11:54:59 +01:00
Nicolas Goaziou c356b114d7 Merge branch 'maint' 2013-12-15 11:40:55 +01:00
Nicolas Goaziou 64d9159ad0 org.texi: Add html related publishing options
* doc/org.texi (HTML doctypes): Fix display.
(Publishing options): Add missing html publishing options.
2013-12-15 11:38:37 +01:00
Nick Dokos 17e11fe419 Delete :grouptags from tags list when creating org-mobile index file
* org-mobile.el (org-mobile-create-index-file): delete :grouptags
  entries from tags list when creating the org-mobile index file.

Reported by Dror Atariah - see

    http://thread.gmane.org/gmane.emacs.orgmode/79803

and (the continuation of the above thread)

    http://thread.gmane.org/gmane.emacs.orgmode/79856
2013-12-14 15:17:18 -05:00
Bastien Guerry 059dc08dec ob-clojure.el (org-babel-execute:clojure): Don't pretty print results
* ob-clojure.el (org-babel-execute:clojure): Don't pretty
print results.

Thanks to Daniel Szmulewicz for reporting this.
2013-12-14 14:26:56 +01:00
Achim Gratz 01b42f91de Makefile: optionally switch to a specific git branch
* mk/default.mk (GIT_BRANCH): New configuration variable to specify a
  Git branch that is checked out before updating.

* mk/targets.mk (up0 up1 up2): Check out the branch in GIT_BRANCH
  before doing an update.  Stays on the current branch if GIT_BRANCH
  is undefined or empty.
2013-12-14 10:35:13 +01:00
Achim Gratz 49c128c300 Makefile: some refactoring for "make vanilla"
* mk/default.mk (BTEST_INIT): Isolate load-path manipulation into
  BTEST_LOAD and do whitespace cleanup.  (EMACSQ): New variable for an
  Emacs with no configuration files.  (NOBATCH, BATCH): Use EMACSQ.

* mk/targets.mk (vanilla): Do not echo command line and explicitly say
  that we don't get a return value.  (CONF_CALL): Add NOBATCH to the
  list of things shown in `make config-all´.
2013-12-14 10:27:31 +01:00
schulte.eric@gmail.com 04eb8d7d85 make vanilla: run Emacs -Q with *this* Org loaded
This change should make it easier to run interactive tests or to
  reproduce problems with the current Org-mode loaded and without any
  personal config.
2013-12-13 16:26:13 -07:00
Eric Schulte fb09863fbb more shell names 2013-12-13 16:04:41 -07:00
Eric Schulte ea993c6d8c fixed insertion of results with hashes
No longer overwrites intervening #+ lines.

* lisp/ob-core.el (org-babel-where-is-src-block-result): Fixed
  insertion of results with hashes.
2013-12-13 15:06:06 -07:00
Eric Schulte b319475a86 fix tests with the renamed ob-shell.el
Note, users may have to edit their local.mk files to change the
  value of BTEST_OB_LANGUAGES to remove sh and include shell.
2013-12-13 10:03:05 -07:00
Eric Schulte 3b3dbca13c finish rename (split up for git) 2013-12-13 09:54:48 -07:00
Eric Schulte 583e7ab175 rename ob-sh to ob-shell 2013-12-13 09:54:28 -07:00
Eric Schulte 7a6c0e3541 multiple code block types for multiple shells
* lisp/ob-sh.el (org-babel-sh-command): Now set from
  `shell-file-name'.
  (org-babel-shell-names): List of specific shells known to Org mode
  shell code blocks.
  (org-babel-execute:shell): New generic shell execution function.
2013-12-13 09:52:05 -07:00
Eric Schulte d286d81b57 Revert "change default sh code block shell to bash"
This reverts commit 1f498c93f2.
2013-12-13 09:19:00 -07:00
Nicolas Goaziou 149eafb487 org-element: Small change to cache optimization
* lisp/org-element.el (org-element-at-point): Simplify opportunistic
  shortcut by looking only for blank lines and headlines or
  inlinetasks.  Since regexp is simpler, we can afford to make more
  searches.
2013-12-12 23:49:49 +01:00
Nicolas Goaziou 4423d750a4 org-element: Fix holes in cache
* lisp/org-element.el (org-element--cache-stable-types): New variable.
(org-element--cache-sync): Do not store elements with missing parents
in cache.

The bug was introduced in 71c8474ae9.
Parsing doesn't always start from beginning of section, which means
that missing parents aren't always repaired while moving to the
current element.  Therefore, we need to remove any element from cache
with an invalid parent property.
2013-12-12 23:04:29 +01:00
Eric Schulte 20852aa958 need to turn on noweb expansion in test 2013-12-11 07:17:26 -07:00
Eric Schulte 031d2565f7 don't change code block body during sha1 hashing
* lisp/ob-core.el (org-babel-sha1-hash): Don't change code block body
  during sha1 hashing.
2013-12-10 11:11:27 -07:00
Eric Schulte ed64845fd6 fix bug introduced by e6a6fed
* lisp/ob-core.el (org-babel-sha1-hash): Don't reference non-existent
  params variable.
2013-12-10 11:00:29 -07:00
Eric Schulte e6a6fed934 expanded noweb references when calculating hashes
The bulk of the new code in org-babel-sha1-hash is borrowed from
org-babel-expand-src-block.

* lisp/ob-core.el (org-babel-sha1-hash): Expanded noweb references
  when calculating hashes.
2013-12-10 00:36:16 -07:00
Eric Schulte 5edf6e103b exercise inclusion of noweb expansions in caches 2013-12-10 00:33:43 -07:00
Carsten Dominik ece429d43e Documentation fixes.
* contrib/lisp/org-mac-link.el (org-mac-grab-Chrome-app-p): Fix docstring.

Patch by Daniil Frumin
2013-12-08 11:20:33 +01:00
Bastien Guerry 0eb020a377 Merge branch 'maint' 2013-12-07 08:17:46 +01:00
Bastien Guerry 7fe99af695 Fix bug when using both electric-pair-mode and delete-selection-mode
* org.el (org-self-insert-command)
(orgtbl-self-insert-command): Change the value of the
`delete-selection' property to allow other commands like
`electric-pair-will-use-region' to be run before deletion.

Thanks to Harald Hanche-Olsen for reporting this.
2013-12-07 08:17:33 +01:00
Eric Schulte ea9d55d8d7 this test should pass with the current code 2013-12-06 12:04:06 -07:00
Nicolas Goaziou 5d359d864f Merge branch 'maint'
Conflicts:
	lisp/ob-exp.el
2013-12-06 16:42:43 +01:00
Nicolas Goaziou ba20e937ae ob-exp: Fix duplicate evaluation with :wrap src
* lisp/ob-exp.el (org-babel-exp-process-buffer): Fix duplicate
  evaluation with :wrap src.
(org-babel-exp-non-block-elements): Removed function.
* testing/lisp/test-ob-lob.el (test-ob-lob/export-lob-lines): Fix test.
2013-12-06 16:40:23 +01:00
Nicolas Goaziou 37eb0df867 Move `org-comment-dwim' in an appropriate section
* lisp/org.el (org-comment-dwim): Move function into "comment" related
  part of the library.
2013-12-06 16:37:57 +01:00
Bastien Guerry 3f6b1dcfd4 Merge branch 'maint' 2013-12-06 15:23:05 +01:00
Bastien Guerry 6a86f32c70 org-attach.el: Check whether git is installed
* org-attach.el (vc-git): Require.
(org-attach-commit): Check whether git is installed.

Thanks to Jonathan Leech-Pepin for reporting this.
2013-12-06 15:22:50 +01:00
Bastien Guerry 487c74580c Fix bug when commenting source code.
* org.el (org-babel-do-in-edit-buffer): Declare.
(org-babel-load-file, org-insert-comment)
(org-comment-or-uncomment-region): Don't require 'ob-core.
(org-mode-map): Remap `comment-dwim' to `org-comment-dwim'.
(org-comment-dwim): New command.

* ob-core.el (org-babel-do-in-edit-buffer): Make an autoload.

See http://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00154.html
for a discussion about this bug.
2013-12-06 10:45:35 +01:00
Nicolas Goaziou 3a317abc23 Merge branch 'maint' 2013-12-03 21:50:45 +01:00
Nicolas Goaziou af6f14d907 Fix C-c C-c behaviour on some objects
* lisp/org.el (org-ctrl-c-ctrl-c): When point is on an unsupported
  object, look for something to do at a higher level instead of
  bailing out.

For example, C-c C-c should toggle checkbox in the following example
even though X point is technically on a subscript.

  - [ ] a_Xb
2013-12-03 21:41:48 +01:00
Nicolas Goaziou 3f6c64a8e2 ox-publish: Introduce `org-publish-after-publishing-hook'
* lisp/ox-publish.el (org-publish-after-publishing-hook): New variable.
(org-publish-file): Call hook with file name and output file name as
arguments.  Small refactoring.
(org-publish-attachment): Return output file.
2013-12-03 21:10:59 +01:00
Nicolas Goaziou 317efee93b Merge branch 'maint'
Conflicts:
	contrib/lisp/org-drill.el
2013-12-03 21:02:48 +01:00
Nicolas Goaziou 8953b417f2 ox-html: Fix LaTeX fragments export
* lisp/ox-html.el (org-html-format-latex): Add an argument.  Ensure
  latex header is the same as specified in the original buffer when
  exporting a LaTeX fragment or environment.
(org-html-latex-environment, org-html-latex-fragment): Apply signature
change.
2013-12-03 20:57:08 +01:00
Nicolas Goaziou f9a73edc24 ox-bibtex: Tiny refactoring
* contrib/lisp/ox-bibtex.el (org-bibtex-process-bib-files): Tiny
  refactoring.
2013-12-03 20:21:09 +01:00
Carsten Dominik 0b3657e8d3 Fix customization types in org-drill.el
* contrib/lisp/org-drill.el (org-drill-leech-method):
(org-drill-scope):
(org-drill-spaced-repetition-algorithm): Fix customization types.
2013-12-03 18:05:01 +01:00
Carsten Dominik 64a64856c0 Fix customization types in org-drill.el
* contrib/lisp/org-drill.el (org-drill-leech-method):
(org-drill-scope):
(org-drill-spaced-repetition-algorithm): Fix customization types.
2013-12-03 18:03:49 +01:00