58af2e01be
Merge branch 'maint'
2016-01-21 10:42:58 +01:00
3dcd1a345f
Use `org-back-to-heading' instead of `outline-back-to-heading'
...
* lisp/org-agenda.el (org-search-view):
* lisp/org-clock.el (org-with-clock):
(org-clock-jump-to-current-clock):
* lisp/org.el (org-entry-beginning-position): Use `org-back-to-heading'
instead of `outline-back-to-heading'.
Reported-by: Derek Feichtinger <dfeich@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/104375 >
2016-01-21 10:42:03 +01:00
cb7f44f1af
Fix lexical variable warning
...
* lisp/org.el (org-fast-tag-selection): Don't use add-to-list with
lexical variable.
Reported-by: Vicente Vera <vicentemvp@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/104363 >
2016-01-21 00:50:32 -05:00
d15cae7e0f
Merge branch 'maint'
2016-01-21 00:54:37 +01:00
0d53e5f9e8
org-colview: Fix column view editing
...
* lisp/org-colview.el (org-columns-next-allowed-value): Fix error when
trying to edit a column from a headline starting at the very beginning
of the buffer.
This patch also prepares for lexical binding.
Reported-by: "T.F. Torrey" <tftorrey@tftorrey.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/104370 >
2016-01-21 00:51:13 +01:00
3142d139fa
ob-R.el: Trim extraneous newline from results
...
* lisp/ob-R.el: org-babel-R-evaluate-external-process and
org-babel-R-evaluate-session trim the extraneous newlines from the
end of R output.
* testing/lisp/test-ob-R.el: test-ob-R/results-file tests that
`:results file' yields one line enclosed in square brackets for a
result like "abc/def.ghi".
Fixes issue noted by Andreas Leha
Subject: [babel] return file from R
Archived-At: <http://permalink.gmane.org/gmane.emacs.orgmode/103658 >
2016-01-19 20:10:43 -08:00
2e77161519
Remove unused code related to isearch
...
* lisp/org.el (org-mode): Remove compatibility cruft.
(org-isearch-end, org-isearch-post-command): Remove functions.
2016-01-18 23:13:11 +01:00
f3f4b21c57
ORG-NEWS: signal new option for org-latex-custom-lang-environments
2016-01-18 15:40:43 +01:00
5d78665c8c
org-effectiveness.el: Add org-effectiveness-ntasks-in-date and org-effectiveness-plot-ascii-ntasks
...
* contrib/lisp/org-effectiveness.el (org-effectiveness-ntasks-in-date, org-effectiveness-plot-ascii-ntasks): Add functions.
2016-01-18 10:21:02 +01:00
a20abaa725
org-effectiveness.el: Add org-effectiveness-count-task
...
* contrib/lisp/org-effectiveness.el (org-effectiveness-count-task): Add function.
2016-01-18 09:45:21 +01:00
0f8c6b0b2e
Fix last commit
...
* lisp/org.el (org-do-latex-and-related): Extract face from the correct
location.
2016-01-18 00:58:34 +01:00
74bb33d464
Fix fontification of properties with an underscore
...
* lisp/org.el (org-do-latex-and-related): Prevent properties with an
underscore from being fontified like a subscript.
2016-01-17 23:49:28 +01:00
02c9dca64c
Ignore repeaters in protected areas
...
* lisp/org.el (org-auto-repeat-maybe): Only consider repeaters in
regular text, not within, e.g., example blocks.
Reported-by: Karl Voit <devnull@Karl-Voit.at>
<http://permalink.gmane.org/gmane.emacs.orgmode/104260 >
2016-01-17 22:21:15 +01:00
457e3298de
`org-font-lock-extra-keywords' is dynamically scoped
...
Reported-by: mc <mc@aiguphonie.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/104265 >
2016-01-17 21:59:23 +01:00
791e52bfdd
Merge branch 'maint'
2016-01-16 15:59:05 +01:00
ce80a0e727
Fix memory leak in `org-agenda-prepare-buffers'
...
* lisp/org.el (org-agenda-prepare-buffers): Do not use
`org-uniquify-alist' since it uses `eq' for comparison, whereas where
are using strings as keys.
Reported-by: Vincent Emanuele <vincent.emanuele@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/104196 >
2016-01-16 15:56:03 +01:00
4fe777fdae
ox-latex: Add option support to custom environment
...
* lisp/ox-latex.el (org-latex-src-block): make the options from
attr_latex available to the custom environment using %o.
2016-01-16 15:09:10 +01:00
1c8ed102e9
Merge branch 'maint'
2016-01-16 14:53:48 +01:00
6e57a371ff
Fix tags looking like plain links
...
* lisp/org-element.el (org-element-context): Do not look for objects
within TODO keyword, priority cookie, comment keyword or tags.
* lisp/org.el (org-activate-tags): Fix regexp.
* testing/lisp/test-org-element.el (test-org-element/context): Add test.
Reported-by: John Kitchin <jkitchin@andrew.cmu.edu>
2016-01-16 14:50:25 +01:00
164555b46e
org: Fix declaration of variable `org-state'
...
* lisp/org.el: The declaration of `org-state' fixes function `org-todo'.
Without the declaration the progressing of todo-states fails in some
cases with "Debugger entered--Lisp error: (void-variable org-state)".
Cf. thread http://permalink.gmane.org/gmane.emacs.orgmode/104179 .
2016-01-15 11:45:41 +01:00
cb744d0446
Merge branch 'maint'
2016-01-14 21:33:40 +01:00
671ed99d23
org-table: Fix editing multiple TBLFM lines
...
* lisp/org-table.el (org-table-store-formulas):
(org-table-get-stored-formulas): Add an optional argument to handle
subsequent TBLFM lines.
(org-table--fedit-source): New variable.
(org-table-edit-formulas):
(org-table-fedit-finish): Handle additional TBLFM lines.
Reported-by: Nick Dokos <ndokos@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/104158 >
2016-01-14 21:27:14 +01:00
a8f278fedf
org-table: Fix a comment
...
* lisp/org-table.el (org-table-end): Fix a comment.
2016-01-14 21:27:14 +01:00
5a4e8d2239
org-table: Fix infloop in `org-table-current-field-formula'
...
* lisp/org-table.el (org-table-current-field-formula): Fix infloop when
called from outside the table, e.g., on a TBLFM line.
2016-01-14 21:27:14 +01:00
e79e437c32
org-table: Fix `org-table-current-field-formula'
...
* lisp/org-table.el (org-table-current-field-formula): Column formulas
are stored with a leading dollar sign. Also raise an error when no
field applies, unless NOERROR is non-nil.
* lisp/org-table.el (org-table-eval-formula): Remove unnecessary error.
2016-01-14 21:26:04 +01:00
4e913b1c62
org-table: Fix formula editor
...
* lisp/org-table.el (org-table-edit-formulas):
(org-table-fedit-finish): Do not remove "$" from column formulas when
exiting the editor.
2016-01-14 11:57:09 +01:00
d85ff34086
Merge branch 'maint'
2016-01-14 09:41:22 +01:00
7d0104f449
org-element: Fix footnote definition parsing
...
* lisp/org-element.el (org-element--footnote-separator): New variable.
(org-element-footnote-definition-parser): Handle footnotes with
affiliated keywords.
* testing/lisp/test-org-element.el (test-org-element/footnote-definition-parser):
Add test.
2016-01-14 09:40:43 +01:00
6baece62fc
org-feed: Fix failing test
...
testing/lisp/test-org-feed.el (test-org-feed/fill-template): Fix test
when called from an environment with another locale.
2016-01-13 17:08:58 +01:00
2520fd654a
Test `org-map-entries'
...
* lisp/org.el (org-make-tags-matcher): Small refactoring.
* testing/lisp/test-org.el (test-org/map-entries): New test.
2016-01-13 17:03:46 +01:00
23f31a9b6b
Silence byte-compiler
...
* lisp/org-datetree.el (org-datetree-find-date-create):
(org-datetree-find-iso-week-create):
(org-datetree-file-entry-under):
* lisp/org.el (calendar-check-holidays):
(org-version):
(org--setup-process-tags):
(org-assign-fast-keys):
(org-cycle-level):
(org-clone-subtree-with-time-shift):
(orgstruct++-mode):
(orgstruct-setup):
(org-contextualize-keys):
(org-insert-all-links):
(org-offer-links-in-entry):
(org-agenda-buffer-tmp-name):
(org-agenda-start-on-weekday):
(org-get-outline-path):
(org-format-outline-path):
(org-todo-yesterday):
(org-auto-repeat-maybe):
(org-add-planning-info):
(org-sparse-tree):
(org-show-set-visibility):
(org-tags-expand):
(org-change-tag-in-region):
(org-fast-tag-selection):
(org-agenda-skip-comment-trees):
(org-agenda-skip-function):
(org-property-action):
(org-set-effort):
(org-delete-property-globally):
(org-read-date-analyze):
(org-re-timestamp):
(org-calendar-holiday):
(org-duration-string-to-minutes):
(org-cdlatex-environment-indent):
(org-format-latex):
(org-create-formula-image):
(org-create-formula-image-with-dvipng):
(org-create-formula-image-with-imagemagick):
(org-edit-special):
(org-ctrl-c-ctrl-c):
(org-get-at-eol):
(org-mark-subtree):
(org--get-expected-indentation):
(org-indent-line):
(org-indent-region):
(org-adaptive-fill-function):
(org-fill-paragraph):
(org-next-block):
(org-forward-paragraph):
(org-imenu-get-tree):
(org--flyspell-object-check-p):
(org-mode-flyspell-verify): Silence byte-compiler.
2016-01-13 11:43:54 +01:00
531985d21c
Add ERTs for feed templates
...
* testing/lisp/test-org-capture.el (test-org-capture/fill-template):
Strengthen some expectations, add new tests.
* testing/lisp/test-org-feed.el: New file derived from
testing/lisp/test-org-capture.el.
2016-01-13 08:19:23 +01:00
3365ad596d
Merge branch 'maint'
2016-01-13 00:50:50 -05:00
6c6b94e274
org-directory: Update docstring
...
* lisp/org.el (org-directory): Fix docstring description of where this
variable is used.
2016-01-13 00:49:12 -05:00
4eccbce9dc
org-bibtex: Fix type error in non-file buffers
...
* lisp/org-bibtex.el (org-bibtex): Fix type error in cases where the
buffer is not visiting a file. In an indirect buffer, use the file
name for the base buffer.
2016-01-13 00:18:42 -05:00
abb9a0f88a
org-bibtex: Mark filename argument as required
...
* lisp/org-bibtex.el (org-bibtex): Mark FILENAME argument as required
because, when called from Lisp, the function does not provide a
default file name when FILENAME is nil, leading to a type error.
2016-01-13 00:16:07 -05:00
8ddc7314b8
Store notes outside drawers at a correct location
...
* lisp/org.el (org-log-beginning): Move to an appropriate location even
when `org-log-state-notes-insert-after-drawers' is nil and notes are
not stored within a drawer.
Reported-by: swflint@flintfam.org (Samuel W. Flint)
<http://permalink.gmane.org/gmane.emacs.orgmode/104107 >
2016-01-12 21:28:32 +01:00
32ccc854cf
Merge remote-tracking branch 'origin/maint' into maint
2016-01-12 02:22:47 -05:00
4de71e483a
Merge branch 'maint'
2016-01-12 02:18:34 -05:00
ba5e1be148
ox-bibtex: Fix bibliography location in HTML
...
* contrib/lisp/ox-bibtex.el (org-bibtex-process-bib-files): Fix
insertion location of bibliography in HTML export.
Reported-by: gongzhitaao <zhitaao.gong@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/104117 >
2016-01-11 23:32:29 -05:00
b78a9badcd
Merge branch 'maint'
2016-01-12 00:27:57 +01:00
47c92146a9
org-clock.el: Fix column count for :formula %
...
* lisp/org-clock.el (org-clocktable-write-default): Count properties
columns when using special :formula %
The previous count did not consider properties columns, so the generated
formula was incorrect.
2016-01-12 00:27:27 +01:00
a971366910
org-capture: Fix interactive template placeholders
...
* lisp/org-capture.el (org-capture-fill-template): Allow spaces in
interactive placeholders.
Reported-by: Charles Millar <millarc@verizon.net>
<http://permalink.gmane.org/gmane.emacs.orgmode/104113 >
2016-01-11 23:51:54 +01:00
a1b1eaf3b4
Merge branch 'maint'
2016-01-11 22:59:22 +01:00
93fe1072f6
org-agenda: Fix filter for org-habits in agenda
...
* lisp/org-agenda.el (org-agenda-filter-apply): Get text at bol instead
of eol. Note that eol can be overwritten by org-habits.
2016-01-11 22:54:09 +01:00
9db78611b4
Tweak `org-auto-repeat-maybe'
...
* lisp/org.el (org-auto-repeat-maybe): Only clear non-repeated SCHEDULED
information in a repeated task.
* doc/org.texi (Repeated tasks): Document behavior.
Do not clear non-repeated DEADLINE information however, as it could be
a global deadline for all occurrences of the task. Also, this case is
taken care of by `org-agenda-skip-scheduled-if-deadline-is-shown' with
a value set to `repeated-after-deadline'.
2016-01-11 12:11:22 +01:00
157f91c31c
Fix `org-auto-repeat-maybe'
...
* lisp/org.el (org-auto-repeat-maybe): Do not remove SCHEDULED time
stamp when encountering a time stamp without a repeater. Also, ensure
"REPEAT_TO_STATE" property can be inherited. Small refactoring.
Reported-by: "Bradley M. Kuhn" <bkuhn@ebb.org>
<http://permalink.gmane.org/gmane.emacs.orgmode/104103 >
2016-01-11 00:58:53 +01:00
e2e5fc2f58
Tiny fixes to docstrings
...
* lisp/org.el (org-execute-file-search-functions):
(org-after-todo-statistics-hook):
(org-sparse-tree): Fix docstrings.
2016-01-11 00:00:25 +01:00
ef01789804
org.el: Use `dolist' instead of `mapc' + `lambda'
...
* lisp/org.el (org-babel-do-load-languages):
(org-load-modules-maybe):
(org-mode-transpose-word-syntax-table):
(org-cycle-internal-local):
(org-remove-empty-overlays-at):
(org-reinstall-markers-in-region):
(orgstruct++-mode):
(orgstruct++-mode):
(org-offer-links-in-entry):
(org-refile-cache-clear):
(org-revert-all-org-buffers):
(org-ctrl-c-ctrl-c):
(org-in-block-p):
(org-uniquify-alist):
(org-unindent-buffer):
(org-imenu-get-tree): Use `dolist' instead of `mapc' + `lambda'.
(org-show-block-all):
(org-remove-occur-highlights):
(org-remove-inline-images):
(org-speed-command-help):
(org-require-autoloaded-modules): Use #'fun instead of 'fun for clarity.
2016-01-10 21:16:29 +01:00
1f49e9fdfd
org.el: Switch to lexical binding
...
* lisp/org.el (org-version):
(org-extract-log-state-settings):
(org-before-change-function):
(org-mode):
(org-emphasize):
(org-fontify-meta-lines-and-blocks-1):
(org-update-radio-target-regexp):
(org-unfontify-region):
(org-set-visibility-according-to-property):
(org-set-outline-overlay-data):
(org-goto-ret):
(org-insert-heading):
(org-contextualize-validate-key):
(org--links-history):
(org-insert-link):
(ido-enter-matching-directory):
(org-offer-links-in-entry):
(org-link-search):
(org-open-file):
(org-refile):
(org-add-log-note):
(org-occur-next-match):
(org-remove-occur-highlights):
(org-priority):
(org-tags-completion-function):
(org-map-entries):
(org-entry-properties):
(org-buffer-property-keys):
(org-property-values):
(org-property-previous-allowed-value):
(org-find-olp):
(calendar-setup):
(org-read-date):
(org-read-date-analyze):
(org-check-before-date):
(org-check-after-date):
(org-calendar-holiday):
(org-diary-sexp-entry):
(org-closest-date):
(org-date-to-gregorian):
(org-recenter-calendar):
(org-agenda-prepare-buffers):
(org-cdlatex-underscore-caret):
(org-cdlatex-math-modify):
(org-create-math-formula):
(org-display-inline-remove-overlay):
(org-shiftmetaup):
(org-shiftmetadown):
(org-metaleft):
(org-metaright):
(org-metaup):
(org-metadown):
(org-in-src-block-p):
(org-replace-escapes):
(org-indent-region):
(org-comment-dwim):
(org-drag-line-forward): Silence byte-compiler
2016-01-10 21:16:29 +01:00
Nicolas Goaziou
Kyle Meyer
Charles Berry
Alan Schmitt
David Arroyo Menéndez
Marco Wahl
Michael Brand
Fernando Varesi