Commit Graph

17332 Commits

Author SHA1 Message Date
Kyle Meyer 6f9184a294 Merge branch 'maint' into backport-master 2015-07-26 23:56:50 -04:00
Paul Eggert fa1a61c2ef Backport commit 85aa6ed from Emacs master branch
Use \r rather than ^M in string literals
85aa6ede9fe1b8165a99a4046dd8262ec93a02d5
Paul Eggert
Sat May 30 09:44:38 2015 -0700
2015-07-26 23:29:32 -04:00
Paul Eggert 6df6806311 Backport commit dfc2ef1 from Emacs master branch
Fix minor quoting problems in doc strings
dfc2ef11a84d33eab916ff87b8537f8e28c05c92
Paul Eggert
Thu May 28 00:22:03 2015 -0700
2015-07-26 23:29:31 -04:00
Paul Eggert 6b04312e85 Backport commit 96794d2 from Emacs master branch
Don't quote nil and t in doc strings
96794d2f97cd064e4c2bf4f71459b42558cc8c79
Paul Eggert
Thu May 21 10:06:44 2015 -0700
2015-07-26 23:29:31 -04:00
Paul Eggert 9dcbe163cc Backport commit 9d35bb8 from Emacs master branch
* lisp/org-compat.el (org-number-sequence):
* lisp/org.el (org-remove-highlights-with-change)
(org-structure-template-alist):
* lisp/ox-html.el (org-html-link-org-files-as-html):
Fix minor quoting problems in doc strings, e.g., missing quote,
``x'' where `x' was meant, etc.

Fix minor quoting problems in doc strings
9d35bb8d6518bb913ab08bace2af08963c003177
Paul Eggert
Tue May 19 15:01:16 2015 -0700
2015-07-26 23:29:31 -04:00
Paul Eggert 9347da11bf Backport commit 08782a2 from Emacs master branch
Prefer plain characters to Texinfo circumlocutions
08782a2ea95dec5662954a1de353a7da699ac339
Paul Eggert
Fri May 1 12:58:53 2015 -0700
2015-07-26 23:29:31 -04:00
Paul Eggert d3df9d203b Backport commit c33d89c from Emacs master branch
* doc/docstyle.texi: New file, which specifies treatment for
grave accent and apostrophe, as well as the document encoding.
* doc/org.texi: Use it instead of '@documentencoding UTF-8', to lessen the need for
global changes like this in the future.

Fix single-quoting style in PDF manuals
c33d89cc644f995510b13b951e4201879de2b6f8
Paul Eggert
Fri May 1 12:06:38 2015 -0700
2015-07-26 23:29:31 -04:00
Paul Eggert 961cf22823 Backport commit 279558f from Emacs master branch
Minor quoting etc. fixes to misc manuals
279558f472246dd19864f4175cb1d6061bc1ed92
Paul Eggert
2015-07-26 23:29:31 -04:00
Stefan Monnier c6164293fc Backport commit c9a75a4 from Emacs master branch
* lisp/org.el (org-insert-heading, org-sort-entries):
* lisp/org-mouse.el (org-mouse-end-headline)
(org-mouse-context-menu):
* lisp/org-clock.el (org-clock-cancel):
Add explicit second arg to looking-back.

Fix byte-compiler warnings about looking-back.
c9a75a4030a556d700fd95222ec0bf4c1a9f67b5
Stefan Monnier
Mon Apr 20 21:55:00 2015 -0400
2015-07-26 23:29:31 -04:00
Paul Eggert 0cec91d039 Backport commit b884ff3 from Emacs master branch
Spelling fix for 'hfy-optimizations'
b884ff380dc341ca8dc8fcfe4357110e191216ce
Paul Eggert
Sun Apr 5 23:43:22 2015 -0700
2015-07-26 23:29:31 -04:00
Paul Eggert 0ee18fcf48 Backport commit 41278b7 from Emacs master branch
Spacing and punctuation fixes
41278b775bd3ebc213ff8b9eda2f2c04a5354bba
Paul Eggert
Tue Mar 17 16:56:21 2015 -0700
2015-07-26 23:29:30 -04:00
Paul Eggert 3935f05990 Backport commit 52a4e87 from Emacs master branch
Fix copyright years by hand
52a4e87c630ea397408efe4f8486be55e1199905
Paul Eggert
2015-07-26 23:29:30 -04:00
Paul Eggert bb77dd2e88 Backport commit 7e09ef0 from Emacs master branch
Update copyright year to 2015
7e09ef09a479731d01b1ca46e94ddadd73ac98e3
Paul Eggert
Thu Jan 1 14:26:41 2015 -0800
2015-07-26 23:29:30 -04:00
Dmitry Antipov d77b7c6c7b Backport commit 9c3883b from Emacs master branch
* lisp/org-mouse.el (org-mouse-do-remotely): Prefer point-marker to
  copy-marker of point.
* lisp/ob-core.el (org-babel-insert-result): Prefer point-min-marker and
  point-max-marker.

Conflicts:
  lisp/org-mouse.el
2015-07-26 23:29:30 -04:00
Glenn Morris fcce57324d Backport commit 2999341 from Emacs master branch
Add .info extension to @setfilename commands in doc
29993416fb4d19c1c3bb146367fc4bed74845486
Glenn Morris
Mon Jun 9 22:20:31 2014 -0400
2015-07-26 23:29:30 -04:00
Kyle Meyer c115c7b4e8 org-compat: Use different font-lock-ensure alias
* lisp/org-compat.el (org-font-lock-ensure): Remove in favor of
  font-lock-ensure alias from dcbaebc.

Instead of org-font-lock-ensure alias introduced in dcbaebc ("Backport
commit 6711a21 from Emacs master branch", 2014-05-28), use
font-lock-ensure alias added in e6883dd ("org-compat: Provide
compatibility definition for font-lock-ensure", 2014-06-01).
2015-07-26 23:29:14 -04:00
Stefan Monnier d81e6b52b7 Backport commit 6711a21 from Emacs master branch
* lisp/org-compat.el (org-font-lock-ensure): New function.
* lisp/ox-odt.el (org-odt-do-format-code):
* lisp/ox-html.el (org-html-fontify-code):
* lisp/org.el (org-fontify-like-in-org-mode):
* lisp/org-src.el (org-src-font-lock-fontify-block):
* lisp/org-clock.el (org-clock-get-clocktable): Use it.
* lisp/ox-org.el (org-org-publish-to-org):
Use it. Avoid using find-file from Elisp.

6711a21f1125c0047c56eb266eb374c1ec90a967
Stefan Monnier
Wed May 28 23:45:29 2014 -0400
2015-07-26 23:28:25 -04:00
Paul Eggert a55b5a4269 Backport commit f9acac7 from Emacs master branch
* lisp/org-clock.el (org-clock-save):
Prefer (system-name) to system-name, and avoid naming
locals 'system-name'.

system-name's returned value can vary
f9acac751d4cd22480e62cc63936b1208ca9fe48
Paul Eggert
Mon Dec 29 12:38:58 2014 -0800
2015-07-26 23:28:25 -04:00
Paul Eggert 72416b82ac Backport commit 7aa506e from Emacs master branch
Spelling fixes
7aa506eed8881788485a9774165454404bac2623
Paul Eggert
Thu Dec 25 18:08:47 2014 -0800
2015-07-26 23:28:25 -04:00
Paul Eggert 81272053cd Backport commit 3de474e from Emacs master branch
Spelling fixes
3de474e4ac7418d06b9f37489f939a16d9bde1c2
Paul Eggert
Sat Dec 13 23:41:33 2014 -0800
2015-07-26 23:28:25 -04:00
Paul Eggert bfbc2bb304 Backport commit cc857dd from Emacs master branch
Fix misspellings like "an unibyte buffer"
cc857dd0db0fad257747134bdbd8318a21d12cab
Paul Eggert
Tue Dec 9 16:27:23 2014 -0800
2015-07-26 23:28:24 -04:00
Paul Eggert bf75f1bff8 Backport commit 02073b2 from Emacs master branch
* doc/misc/org.texi (The date/time prompt, Matching tags and properties):
Use leading zero with 24-hour times less than 10:00.

Fix some 24-hour time stamps in documentation.
02073b2e84022ff9c9b76d58061e9aa810056229
Paul Eggert
Thu Nov 13 19:16:15 2014 -0800
2015-07-26 23:28:24 -04:00
Paul Eggert 6873c9088b Backport commit 78d45b6 from Emacs master branch
* lisp/org-compat.el (org-float-time):
Use 2-arg defalias, since XEmacs 21.4 doesn't support 3-arg.

Port current-time change to XEmacs 21.4.
78d45b66d41859ab9bdd571fea18fc06a7670911
Paul Eggert
Tue Oct 28 20:21:06 2014 -0700
2015-07-26 23:28:24 -04:00
Kyle Meyer 5a01b116a4 Pass current-time as optional arg for tests
* lisp/org.el (org-read-date-analyze):
* lisp/org-timer.el (org-timer-seconds): Explicitly pass current-time as
  optional time argument and explain reason in comment.

This reverts some changes from 91ab6c4 ("Backport commit 123ddec from
Emacs master branch", 2014-10-28).
2015-07-26 23:28:09 -04:00
Paul Eggert 217ad4aafb Backport commit 123ddec from Emacs master branch
* doc/org.texi (Dynamic blocks):
* lisp/org-archive.el (org-archive-subtree)
(org-archive-to-archive-sibling):
* lisp/org-clock.el (org-resolve-clocks, org-clock-get-sum-start)
(org-clock-special-range):
* lisp/org-timer.el (org-timer-seconds):
* lisp/org.el (org-read-date-analyze, org-get-cursor-date):
* lisp/ox-html.el (org-html-format-spec):
* lisp/ox-icalendar.el (org-icalendar--vtodo):
Omit unnecessary call to current-time.
* lisp/org.el (org-get-cursor-date):
Don't call current-time twice to get the current time stamp,
as this can lead to inconsistent results.
* lisp/org-compat.el (org-float-time):
Simplify to an alias because time-to-seconds now behaves like float-time
with respect to nil arg.
* lisp/org-clock.el (org-clock-get-table-data): Omit unnecessary, lossy
conversion from floating point to Emacs time and back.
(org-resolve-clocks): Prefer two-argument floor.

Simplify use of current-time and friends.
123ddec7f807f4bd7400bbbe08219afb02269c00
Paul Eggert
Tue Oct 28 18:42:51 2014 -0700
2015-07-26 23:25:11 -04:00
Ruben Maher eccd704aea ox.el: Remove docstring for nonexistent argument
* lisp/ox.el (org-export-output-file-name): Remove docstring for
  nonexistent argument VISIBLE-ONLY.
2015-07-25 14:17:49 +02:00
Paul Sexton c923bf3630 Updated org-drill to version 2.4.7. 2015-07-24 18:35:44 -04:00
Nicolas Goaziou bf37cd09b1 org-table: Do not trim output of radio tables
* lisp/org-table.el (orgtbl-to-generic): Leading and trailing spaces
  could be significant, so do not trim result.  However, remove the
  final newline character.

Reported-by: lom pik <lompikvoila@gmail.com> <>
<http://permalink.gmane.org/gmane.emacs.orgmode/99171>
2015-07-23 00:34:02 +02:00
Nicolas Goaziou 6e1d7bc8fe Fix `org-beginning-of-line'
* lisp/org.el (org-beginning-of-line): Prevent an error when buffer
  contains only a single star.

* testing/lisp/test-org.el (test-org/beginning-of-line): Add tests.
2015-07-22 09:39:07 +02:00
Nicolas Goaziou 7037eb591e org-mime: Fix a docstring
* contrib/lisp/org-mime.el (org-mime-htmlize): Fix docstring.
2015-07-22 09:36:06 +02:00
Matt Price b9a9f5aa22 org-mime.el: Fix org-mime-htmlize
* org-mime.el (org-mime-htmlize): Make argument optional.
2015-07-21 15:04:07 +02:00
Nicolas Goaziou 985420eceb Speed improvement for `org-goto'
* lisp/org.el (org-goto-local-search-headings): Do not rely on
  `org-context' just to check if point is on a headline but not on its
  tags.

Reported-by: Gregor Zattler <telegraph@gmx.net> <w>
<http://permalink.gmane.org/gmane.emacs.orgmode/99111>
2015-07-20 11:40:44 +02:00
Rasmus 216a53d6cc ox-html: Better customize for org-html-viewport
* ox-html.el (org-html-viewport): Allow disabling via customize.
2015-07-20 10:40:26 +02:00
Nicolas Goaziou d6e6016ba6 test-org-clock: Fix failing test (again)
* testing/lisp/test-org-clock.el (test-org-clock/clocktable): Update
  test.
(test-org-clock/clocktable1, test-org-clock/clocktable2,
test-org-clock/clocktable-until-now): Merge tests into the previous one.
2015-07-18 18:58:12 +02:00
Nicolas Goaziou cf5cb15743 org-colview: Do not silently modify buffer
* lisp/org-colview.el (org-columns-display-here): Do not modify buffer
  silently.  Small refactoring.

Reported-by: Nicolas Richard <youngfrog@members.fsf.org>
<http://permalink.gmane.org/gmane.emacs.orgmode/98992>
2015-07-18 09:39:23 +02:00
Nicolas Goaziou f6b5178156 test-org-clock: Fix failing test
* testing/lisp/test-org-clock.el (test-org-clock/clocktable): Fix
  clocktable creation.

(test-org-clock/clocktable1):
(test-org-clock/clocktable2):
(test-org-clock/clocktable-until-now): Update tests.
2015-07-18 00:39:43 +02:00
Rasmus a985538093 ox-koma-letter: Add closing special heading
* ox-koma-letter.el (org-koma-letter-special-tags-in-letter):
  Add closing.
  (org-koma-letter-template): Potentially take closing value
  from closing spcical heading.
  (org-koma-letter--build-settings): Potentially take signature
  value from closing special heading.
  (org-koma-letter-closing):
  (org-koma-letter-signature): Update docstring.

Suggested-by: Suvayu Ali <fatkasuvayu+linux@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/99028>
2015-07-16 22:09:53 +02:00
Kyle Meyer ed6349d28c org-closest-date: Don't accept canceled repeater
* lisp/org.el (org-time-string-to-absolute): Don't pass a canceled
  repeater to org-closest-date.
  (org-closest-date): Raise an error when passed a canceled repeater.

Prevent arith-error from occurring when a canceled repeater is passed to
org-closest-date.
2015-07-16 11:44:02 +02:00
Rasmus 20795fd1c4 org-entities: Add frowny
* org-entities.el (org-entities): Add frowny.
2015-07-13 11:40:29 +02:00
Rasmus 77ab3c90d5 org-entities: Change smile and frown
* org-entities.el (org-entities): Reinterpret smile and frown entities.

See: https://en.wikipedia.org/wiki/Cap_product,
     https://en.wikipedia.org/wiki/Cup_product
2015-07-13 11:40:29 +02:00
Rasmus 9b0849b2ef Update ORG-NEWS wrt. ox-latex package removals 2015-07-13 11:40:11 +02:00
Rasmus 788d15e469 org.el: Remove wasysym LaTeX dependency 2015-07-13 11:36:25 +02:00
Rasmus 10b424dd63 org.el: Remove marvosym LaTeX dependency
* org.el (org-latex-default-packages-alist): Remove marvosym.
* org-entities.el (org-entities): \EUR is now replaced with
  \texteuro.  Remove EURdig, EURhv, EURcr, EURtm.
2015-07-13 11:36:25 +02:00
Rasmus 384bc2d200 org.el: Remove default LaTeX tolerance
* org.el (org-latex-default-packages-alist): Remove fixed tolerance.
2015-07-13 11:36:25 +02:00
Rasmus fd990a81e3 ox-html: Change footpara wrapper
* ox-html.el (org-html-footnote-section): Wrap footnote definitions
  content in a div rather than a p.  p is a bad element to use for a
  wrapper as it can neither contain other p elements nor tables.
  (org-html-style-default): Change .footpara to inline display style.

Reported-by: OSiUX <xuiso@osiux.com.ar>
<http://permalink.gmane.org/gmane.emacs.orgmode/98984>
2015-07-13 11:36:25 +02:00
Marco Wahl 4baf015ab4 contrib/lisp/org-eww: Update copyright years 2015-07-11 12:11:22 +02:00
Marco Wahl 9132a79ec9 contrib/org-eww: Quote leading stars at kill
* contrib/lisp/org-eww.el (org-eww-copy-for-org-mode): Lines starting
  with '*' get quoted at special kill.

This allows yanking content containing lines starting with a '*' without
changing the outline structure.
2015-07-11 12:01:02 +02:00
Nicolas Goaziou 120dcd1d13 org-table: Fix table alignment
* lisp/org-table.el (org-table-align): Refactor function fix wrong
  alignment bug.
* lisp/org-compat.el (org-format-transports-properties-p): Remove
  variable.
* testing/lisp/test-org.el (test-org/fill-paragraph): Fix test

Reported-by: William Denton <wtd@pobox.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/98901>
2015-07-09 17:53:33 +02:00
Matt Price 22c652599c ox-deck: parse checkboxes properly
*ox-deck.el
Previously, list items with checkboxes would not build properly. This
trivial and clumsy patch fixes that.
2015-07-08 12:38:16 +02:00
Rasmus be019c4339 Autoload orgtbl-exp-regexp
* org-table.el (orgtbl-exp-regexp): Add autoload cookie.

Reported-by: Robert Klein <roklein@roklein.de>
<http://permalink.gmane.org/gmane.emacs.orgmode/98887>
2015-07-07 14:42:31 +02:00