From 9aed2398a73ef1ef2bd274519c01e5ca6daa623e Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Fri, 6 Sep 2013 07:41:59 +0200 Subject: contrib/ox-rss.el: Use the :html-link-use-abs-url option in the example. --- contrib/lisp/ox-rss.el | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/lisp/ox-rss.el b/contrib/lisp/ox-rss.el index 7f024620e..672e97002 100644 --- a/contrib/lisp/ox-rss.el +++ b/contrib/lisp/ox-rss.el @@ -51,6 +51,7 @@ ;; :base-extension "org" ;; :rss-image-url "http://lumiere.ens.fr/~guerry/images/faces/15.png" ;; :html-link-home "http://lumiere.ens.fr/~guerry/" +;; :html-link-use-abs-url t ;; :rss-extension "xml" ;; :publishing-directory "/home/guerry/public_html/" ;; :publishing-function (org-rss-publish-to-rss) -- cgit v1.2.3-70-g09d2 From fd763c229a4e3c5dc2a11146548f36329e00ede7 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Fri, 6 Sep 2013 07:42:30 +0200 Subject: Update ORG-NEWS with changelogs for Org 8.1 --- etc/ORG-NEWS | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index 1ba85b251..3d26383df 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -8,6 +8,119 @@ See the end of the file for license conditions. Please send Org bug reports to emacs-orgmode@gnu.org. +* Version 8.1 + +** Incompatible changes + +*** Combine org-mac-message.el and org-mac-link-grabber into org-mac-link.el + +Please remove calls to =(require 'org-mac-message)= and =(require +'org-mac-link-grabber)= in your =.emacs= initialization file. All you +need now is =(require 'org-mac-link)=. + +*** HTML export: Replace "HTML_HTML5_FANCY" by :html-html5-fancy (...) + +Some of the HTML specific export options in Org <8.1 are either nil or +t, like =#+HTML_INCLUDE_STYLE=. We replaced these binary options with +option keywords like :html-include-style. + +So you need to replace + +: #+HTML_INCLUDE_STYLE: t + +by + +#+OPTIONS: :html-include-style t + +Options affected by this change: =HTML5_FANCY=, =HTML_INCLUDE_SCRIPTS= +and =HTML_INCLUDE_STYLE=. + +** Important bugfixes + +*** [[doc:org-insert-heading][org-insert-heading]] has been rewritten and bugs are now fixed +*** The replacement of disputed keys is now turned of when reading a date + +** New features + +*** You can now use =xdg-open= to control how to open files +*** =C-c ^ x= will now sort checklist items by their checked status + +See [[doc:org-sort-list][org-sort-list]]: hitting =C-c ^ x= will put checked items at the end +of the list. +*** Various LaTeX export enhancements + +- support SVG images +- Support for pgf files +- LaTeX Babel blocks can now be exported as =.tikz= files +- Allow =latexmk= as an option for [[doc:org-latex-pdf-process][org-latex-pdf-process]] + +Also, the dependency on the =latexsym= LaTeX package has been removed, +We now use =amssymb= symbols by default instead. + +*** Remapping =forward-paragraph= and =backward-paragraph= + +=forward-paragraph= and =backward-paragraph= are now remapped to +[[doc:org-forward-element][org-forward-element]] and [[doc:org-backward-element][org-backward-element]] respectively. +E.g. hitting =C-= on a headline will move to the next headline. + +*** New entities in =org-entities.el= + +Add support for ell, imath, jmath, varphi, varpi, aleph, gimel, beth, +dalet, cdots, S (§), dag, ddag, colon, therefore, because, triangleq, +leq, geq, lessgtr, lesseqgtr, ll, lll, gg, ggg, prec, preceq, +preccurleyeq, succ, succeq, succurleyeq, setminus, nexist(s), mho, +check, frown, diamond. Changes loz, vert, checkmark, smile and tilde. + +** New options + +*** New option [[doc:org-bookmark-names-plist][org-bookmark-names-plist]] + +This allows to specify the names of automatic bookmarks. +*** New option [[doc:org-agenda-ignore-drawer-properties][org-agenda-ignore-drawer-properties]] + +This allows more flexibility when optimizing the agenda generation. +See http://orgmode.org/worg/agenda-optimization.html for details. +*** New option: [[doc:org-html-link-use-abs-url][org-html-link-use-abs-url]] to force using absolute URLs + +This is an export/publishing option, and should be used either within +the =#+OPTIONS= line(s) or within a [[doc:org-publish-project-alist][org-publish-project-alist]]. + +Setting this option to =t= is needed when the HTML output does not +allow relative URLs. For example, the =contrib/lisp/ox-rss.el= +library produces a RSS feed, and RSS feeds need to use absolute URLs, +so a combination of =:html-link-home "..." and :html-link-use-abs-url +t= is required---see the configuration example in the comment section +of =ox-rss.el=. + +*** New option [[doc:org-babel-ditaa-java-cmd][org-babel-ditaa-java-cmd]] + +This makes java executable configurable for ditaa blocks. + +*** New options [[doc:org-babel-latex-htlatex][org-babel-latex-htlatex]] and [[doc:org-babel-latex-htlatex-packages][org-babel-latex-htlatex-packages]] + +This enables SVG generation from latex code blocks. + +*** New option: [[doc:org-habit-show-done-alwyays-green][org-habit-show-done-alwyays-green]] + +See [[http://lists.gnu.org/archive/html/emacs-orgmode/2013-05/msg00214.html][this message]] from Max Mikhanosha. + +*** New option: [[doc:org-babel-inline-result-wrap][org-babel-inline-result-wrap]] + +If you set this to the following + +: (setq org-babel-inline-result-wrap "$%s$") + +then inline code snippets will be wrapped into the formatting string. + +** New contributed packages + +- =ox-bibtex.el= by Nicolas Goaziou :: an utility to handle BibTeX + export to both LaTeX and HTML exports. It uses the [[http://www.lri.fr/~filliatr/bibtex2html/][bibtex2html]] + software. + +- =org-screenshot.el= by Max Mikhanosha :: an utility to handle + screenshots easily from Org, using the external tool [[http://freecode.com/projects/scrot][scrot]]. + * Version 8.0.1 ** Installation -- cgit v1.2.3-70-g09d2 From d16465b082ec5324fe4958ed19969310a1760ded Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Fri, 6 Sep 2013 07:47:57 +0200 Subject: README_maintainer: add a new "Updating etc/ORG-NEWS" section --- README_maintainer | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/README_maintainer b/README_maintainer index cfa2544ef..fed9867b6 100644 --- a/README_maintainer +++ b/README_maintainer @@ -87,7 +87,19 @@ Org and contributed libraries. org-latest* snapshots are built from the *master* branch. -* Synchonization with Emacs +* Synchronization with Emacs + +** Updating etc/ORG-NEWS + +Latest changes in Emacs are described in Emacs =etc/NEWS=, and latest +changes in major Emacs packages are described in =etc/ORG-NEWS=. + +If a major release is meant to be merged with the Emacs trunk (as it +always should), you need to update Org's =etc/ORG-NEWS= file so that +you can merge it with that of Emacs. There is one top-level section +for each release that is merged with Emacs. + +** Merging with Emacs trunk branch This is still a significant headache. Some hand work is needed here. -- cgit v1.2.3-70-g09d2 From f902ab8d59a2547766ab807668d483c591a01dc7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 6 Sep 2013 10:59:12 +0200 Subject: orgguide: Fix documentation * doc/orgguide.texi (Comment lines): A whitespace is mandatory after the "#" sign. (Export options): Along with plain text, DATE expects an Org timestamp, not a format string. Also fix OPTIONS items and remove back-end specific keywords. (The export dispatcher): An active region is not sufficient to trigger subtree export. (DocBook export): Remove section. (ASCII/Latin-1/UTF-8 export, HTML export, @LaTeX{} and PDF export, Publishing): Update keybindings. (iCalendar export): Update keybindings and fix variable name. --- doc/orgguide.texi | 82 ++++++++++++++++++++++--------------------------------- 1 file changed, 32 insertions(+), 50 deletions(-) diff --git a/doc/orgguide.texi b/doc/orgguide.texi index eb18db9a0..e7ba1734c 100644 --- a/doc/orgguide.texi +++ b/doc/orgguide.texi @@ -209,8 +209,7 @@ Exporting * ASCII/Latin-1/UTF-8 export:: Exporting to flat files with encoding * HTML export:: Exporting to HTML * @LaTeX{} and PDF export:: Exporting to @LaTeX{}, and processing to PDF -* DocBook export:: Exporting to DocBook -* iCalendar export:: +* iCalendar export:: Exporting to iCalendar Miscellaneous @@ -2195,10 +2194,10 @@ consisting of only dashes, and at least 5 of them. @subheading Comment lines Lines starting with zero or more whitespace characters followed by @samp{#} -are treated as comments and will never be exported. Also entire subtrees -starting with the word @samp{COMMENT} will never be exported. Finally, -regions surrounded by @samp{#+BEGIN_COMMENT} ... @samp{#+END_COMMENT} will -not be exported. +and a whitespace are treated as comments and will never be exported. Also +entire subtrees starting with the word @samp{COMMENT} will never be exported. +Finally, regions surrounded by @samp{#+BEGIN_COMMENT} +... @samp{#+END_COMMENT} will not be exported. @table @kbd @item C-c ; @@ -2329,8 +2328,7 @@ that planning information can be incorporated into desktop calendars. * ASCII/Latin-1/UTF-8 export:: Exporting to flat files with encoding * HTML export:: Exporting to HTML * @LaTeX{} and PDF export:: Exporting to @LaTeX{}, and processing to PDF -* DocBook export:: Exporting to DocBook -* iCalendar export:: +* iCalendar export:: Exporting to iCalendar @end menu @node Export options, The export dispatcher, Exporting, Exporting @@ -2349,25 +2347,21 @@ Insert template with export options, see example below. @smallexample #+TITLE: the title to be shown (default is the buffer name) #+AUTHOR: the author (default taken from @code{user-full-name}) -#+DATE: a date, fixed, of a format string for @code{format-time-string} +#+DATE: a date, fixed, or an Org timestamp #+EMAIL: his/her email address (default from @code{user-mail-address}) #+DESCRIPTION: the page description, e.g.@: for the XHTML meta tag #+KEYWORDS: the page keywords, e.g.@: for the XHTML meta tag #+LANGUAGE: language for HTML, e.g.@: @samp{en} (@code{org-export-default-language}) -#+OPTIONS: H:2 num:t toc:t \n:nil @@:t ::t |:t ^:t f:t TeX:t ... -#+LINK_UP: the ``up'' link of an exported page -#+LINK_HOME: the ``home'' link of an exported page -#+LATEX_HEADER: extra line(s) for the @LaTeX{} header, like \usepackage@{xyz@} +#+OPTIONS: H:2 num:t toc:t \n:nil ::t |:t ^:t f:t tex:t ... @end smallexample @node The export dispatcher, ASCII/Latin-1/UTF-8 export, Export options, Exporting @section The export dispatcher -All export commands can be reached using the export dispatcher, which is a -prefix key that prompts for an additional key specifying the command. -Normally the entire file is exported, but if there is an active region that -contains one outline tree, the first heading is used as document title and -the subtrees are exported. +All export commands can be reached using the export dispatcher, which is +a prefix key that prompts for an additional key specifying the command. +Normally the entire file is exported, but if a region is active, it will be +exported instead. @table @kbd @item C-c C-e @@ -2382,11 +2376,11 @@ file, containing only plain ASCII. Latin-1 and UTF-8 export augment the file with special characters and symbols available in these encodings. @table @kbd -@item C-c C-e a -Export as ASCII file. -@item C-c C-e n @ @ @r{and} @ @ C-c C-e N +@item C-c C-e t a @ @ @r{and} @ @ C-c C-e t A +Export as ASCII file or temporary buffer. +@item C-c C-e t n @ @ @r{and} @ @ C-c C-e t N Like the above commands, but use Latin-1 encoding. -@item C-c C-e u @ @ @r{and} @ @ C-c C-e U +@item C-c C-e t u @ @ @r{and} @ @ C-c C-e t U Like the above commands, but use UTF-8 encoding. @end table @@ -2394,9 +2388,9 @@ Like the above commands, but use UTF-8 encoding. @section HTML export @table @kbd -@item C-c C-e h +@item C-c C-e h h Export as HTML file @file{myfile.html}. -@item C-c C-e b +@item C-c C-e h o Export as HTML file and immediately open it with a browser. @end table @@ -2413,49 +2407,37 @@ All lines between these markers are exported literally #+END_HTML @end smallexample -@node @LaTeX{} and PDF export, DocBook export, HTML export, Exporting +@node @LaTeX{} and PDF export, iCalendar export, HTML export, Exporting @section @LaTeX{} and PDF export @table @kbd -@item C-c C-e l +@item C-c C-e l l Export as @LaTeX{} file @file{myfile.tex}. -@item C-c C-e p +@item C-c C-e l p Export as @LaTeX{} and then process to PDF. -@item C-c C-e d +@item C-c C-e l o Export as @LaTeX{} and then process to PDF, then open the resulting PDF file. @end table By default, the @LaTeX{} output uses the class @code{article}. You can -change this by adding an option like @code{#+LaTeX_CLASS: myclass} in your +change this by adding an option like @code{#+LATEX_CLASS: myclass} in your file. The class must be listed in @code{org-latex-classes}. Embedded @LaTeX{} as described in @ref{Embedded @LaTeX{}}, will be correctly inserted into the @LaTeX{} file. Similarly to the HTML exporter, you can use -@code{#+LaTeX:} and @code{#+BEGIN_LaTeX ... #+END_LaTeX} construct to add +@code{#+LATEX:} and @code{#+BEGIN_LATEX ... #+END_LATEX} construct to add verbatim @LaTeX{} code. -@node DocBook export, iCalendar export, @LaTeX{} and PDF export, Exporting -@section DocBook export - -@table @kbd -@item C-c C-e D -Export as DocBook file. -@end table - -Similarly to the HTML exporter, you can use @code{#+DOCBOOK:} and -@code{#+BEGIN_DOCBOOK ... #+END_DOCBOOK} construct to add verbatim @LaTeX{} -code. - -@node iCalendar export, , DocBook export, Exporting +@node iCalendar export, , @LaTeX{} and PDF export, Exporting @section iCalendar export @table @kbd -@item C-c C-e i +@item C-c C-e c f Create iCalendar entries for the current file in a @file{.ics} file. -@item C-c C-e c +@item C-c C-e c c Create a single large iCalendar file from all files in @code{org-agenda-files} and write it to the file given by -@code{org-combined-agenda-icalendar-file}. +@code{org-icalendar-combined-agenda-file}. @end table @seealso{ @@ -2491,13 +2473,13 @@ Here is an example: @end smalllisp @table @kbd -@item C-c C-e C +@item C-c C-e P x Prompt for a specific project and publish all files that belong to it. -@item C-c C-e P +@item C-c C-e P p Publish the project containing the current file. -@item C-c C-e F +@item C-c C-e P f Publish only the current file. -@item C-c C-e E +@item C-c C-e P a Publish every project. @end table -- cgit v1.2.3-70-g09d2 From 2e3f5558d74e29877fe9dfc04233891e90c571ae Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 6 Sep 2013 12:30:30 +0200 Subject: Do not handle `adaptive-fill-regexp' in comments * lisp/org.el (org-adaptive-fill-function): Do not handle `adaptive-fill-regexp' in comments as the behaviour is not satisfying. * testing/lisp/test-org.el: Remove test. --- lisp/org.el | 135 +++++++++++++++++++++++------------------------ testing/lisp/test-org.el | 9 ---- 2 files changed, 65 insertions(+), 79 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 2abcb4a7c..77662774f 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -22182,78 +22182,73 @@ hierarchy of headlines by UP levels before marking the subtree." Return fill prefix, as a string, or nil if current line isn't meant to be filled. For convenience, if `adaptive-fill-regexp' matches in paragraphs or comments, use it." - (let (prefix) - (catch 'exit - (when (derived-mode-p 'message-mode) - (save-excursion - (beginning-of-line) - (cond ((or (not (message-in-body-p)) - (looking-at orgtbl-line-start-regexp)) - (throw 'exit nil)) - ((looking-at message-cite-prefix-regexp) - (throw 'exit (match-string-no-properties 0))) - ((looking-at org-outline-regexp) - (throw 'exit (make-string (length (match-string 0)) ? )))))) - (org-with-wide-buffer - (let* ((p (line-beginning-position)) - (element (save-excursion - (beginning-of-line) - (or (ignore-errors (org-element-at-point)) - (user-error "An element cannot be parsed line %d" - (line-number-at-pos (point)))))) - (type (org-element-type element)) - (post-affiliated (org-element-property :post-affiliated element))) - (unless (and post-affiliated (< p post-affiliated)) - (case type - (comment + (catch 'exit + (when (derived-mode-p 'message-mode) + (save-excursion + (beginning-of-line) + (cond ((or (not (message-in-body-p)) + (looking-at orgtbl-line-start-regexp)) + (throw 'exit nil)) + ((looking-at message-cite-prefix-regexp) + (throw 'exit (match-string-no-properties 0))) + ((looking-at org-outline-regexp) + (throw 'exit (make-string (length (match-string 0)) ? )))))) + (org-with-wide-buffer + (let* ((p (line-beginning-position)) + (element (save-excursion + (beginning-of-line) + (or (ignore-errors (org-element-at-point)) + (user-error "An element cannot be parsed line %d" + (line-number-at-pos (point)))))) + (type (org-element-type element)) + (post-affiliated (org-element-property :post-affiliated element))) + (unless (and post-affiliated (< p post-affiliated)) + (case type + (comment + (save-excursion + (beginning-of-line) + (looking-at "[ \t]*") + (concat (match-string 0) "# "))) + (footnote-definition "") + ((item plain-list) + (make-string (org-list-item-body-column + (or post-affiliated + (org-element-property :begin element))) + ? )) + (paragraph + ;; Fill prefix is usually the same as the current line, + ;; unless the paragraph is at the beginning of an item. + (let ((parent (org-element-property :parent element))) (save-excursion (beginning-of-line) - (looking-at "[ \t]*#") - (goto-char (match-end 0)) - (let ((comment-prefix (match-string 0))) - (if (looking-at adaptive-fill-regexp) - (concat comment-prefix (match-string 0)) - comment-prefix)))) - (footnote-definition "") - ((item plain-list) - (make-string (org-list-item-body-column - (or post-affiliated - (org-element-property :begin element))) - ? )) - (paragraph - ;; Fill prefix is usually the same as the current line, - ;; unless the paragraph is at the beginning of an item. - (let ((parent (org-element-property :parent element))) - (save-excursion - (beginning-of-line) - (cond ((eq (org-element-type parent) 'item) - (make-string (org-list-item-body-column - (org-element-property :begin parent)) - ? )) - ((and adaptive-fill-regexp - ;; Locally disable - ;; `adaptive-fill-function' to let - ;; `fill-context-prefix' handle - ;; `adaptive-fill-regexp' variable. - (let (adaptive-fill-function) - (fill-context-prefix - post-affiliated - (org-element-property :end element))))) - ((looking-at "[ \t]+") (match-string 0)) - (t ""))))) - (comment-block - ;; Only fill contents if P is within block boundaries. - (let* ((cbeg (save-excursion (goto-char post-affiliated) - (forward-line) - (point))) - (cend (save-excursion - (goto-char (org-element-property :end element)) - (skip-chars-backward " \r\t\n") - (line-beginning-position)))) - (when (and (>= p cbeg) (< p cend)) - (if (save-excursion (beginning-of-line) (looking-at "[ \t]+")) - (match-string 0) - ""))))))))))) + (cond ((eq (org-element-type parent) 'item) + (make-string (org-list-item-body-column + (org-element-property :begin parent)) + ? )) + ((and adaptive-fill-regexp + ;; Locally disable + ;; `adaptive-fill-function' to let + ;; `fill-context-prefix' handle + ;; `adaptive-fill-regexp' variable. + (let (adaptive-fill-function) + (fill-context-prefix + post-affiliated + (org-element-property :end element))))) + ((looking-at "[ \t]+") (match-string 0)) + (t ""))))) + (comment-block + ;; Only fill contents if P is within block boundaries. + (let* ((cbeg (save-excursion (goto-char post-affiliated) + (forward-line) + (point))) + (cend (save-excursion + (goto-char (org-element-property :end element)) + (skip-chars-backward " \r\t\n") + (line-beginning-position)))) + (when (and (>= p cbeg) (< p cend)) + (if (save-excursion (beginning-of-line) (looking-at "[ \t]+")) + (match-string 0) + "")))))))))) (declare-function message-goto-body "message" ()) (defvar message-cite-prefix-regexp) ; From message.el diff --git a/testing/lisp/test-org.el b/testing/lisp/test-org.el index ef5e60e80..8a1e9f1cc 100644 --- a/testing/lisp/test-org.el +++ b/testing/lisp/test-org.el @@ -305,15 +305,6 @@ (end-of-line) (org-auto-fill-function) (buffer-string))))) - ;; Auto fill comments when `adaptive-fill-regexp' matches. - (should - (equal " # > 12345\n # > 7890" - (org-test-with-temp-text " # > 12345 7890" - (let ((fill-column 10) - (adaptive-fill-regexp "[ \t]*>+[ \t]*")) - (end-of-line) - (org-auto-fill-function) - (buffer-string))))) ;; A hash within a line isn't a comment. (should-not (equal "12345 # 7890\n# 1" -- cgit v1.2.3-70-g09d2 From d3805adba7c8ed17064b369d540f03dac5b354c3 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Fri, 6 Sep 2013 15:36:43 +0200 Subject: Fix typo in ORG-NEWS. Thanks to Rick Frankel for reporting it. --- etc/ORG-NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index 3d26383df..f332884c8 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -30,7 +30,7 @@ So you need to replace by -#+OPTIONS: :html-include-style t +: #+OPTIONS: :html-include-style t Options affected by this change: =HTML5_FANCY=, =HTML_INCLUDE_SCRIPTS= and =HTML_INCLUDE_STYLE=. -- cgit v1.2.3-70-g09d2 From 0f4cce89ca78b15d4a9f0c82f084e13ee1507385 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Fri, 6 Sep 2013 15:38:52 +0200 Subject: etc/ORG-NEWS: Rephrase the "Combine org-mac-message.el ..." section Thanks to Anthony Lander for the new version. --- etc/ORG-NEWS | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index f332884c8..80ce9f361 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -18,7 +18,16 @@ Please remove calls to =(require 'org-mac-message)= and =(require 'org-mac-link-grabber)= in your =.emacs= initialization file. All you need now is =(require 'org-mac-link)=. -*** HTML export: Replace "HTML_HTML5_FANCY" by :html-html5-fancy (...) +Additionally, replace any calls to =ogml-grab-link= to +=org-mac-grab-link=. For example, replace this line: + +: (define-key org-mode-map (kbd "C-c g") 'omgl-grab-link) + +with this: + +: (define-key org-mode-map (kbd "C-c g") 'org-mac-grab-link) + +*** HTML export: Replace =HTML_HTML5_FANCY= by =:html-html5-fancy= (...) Some of the HTML specific export options in Org <8.1 are either nil or t, like =#+HTML_INCLUDE_STYLE=. We replaced these binary options with -- cgit v1.2.3-70-g09d2 From 41da6e14d02789643b1f98ae82e34cbb0a07c887 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Fri, 6 Sep 2013 15:58:55 +0200 Subject: contrib/lisp/org-mac-link.el: Small formatting fix in the comment section * contrib/lisp/org-mac-link.el: Small formatting fix in the comment section. --- contrib/lisp/org-mac-link.el | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/contrib/lisp/org-mac-link.el b/contrib/lisp/org-mac-link.el index 0ab035462..e3fe79df3 100644 --- a/contrib/lisp/org-mac-link.el +++ b/contrib/lisp/org-mac-link.el @@ -39,7 +39,7 @@ ;; Suckling. ;; ;; Detailed comments for each application interface are inlined with -;; the code. Here is a brief overview of how the code interacts with +;; the code. Here is a brief overview of how the code interacts with ;; each application: ;; ;; Finder.app - grab links to the selected files in the frontmost window @@ -61,18 +61,17 @@ ;; (add-hook 'org-mode-hook (lambda () ;; (define-key org-mode-map (kbd "C-c g") 'org-mac-grab-link))) ;; -;; ;; Usage: ;; ;; Type C-c g (or whatever key you defined, as above), or type M-x -;; org-mac-grab-link RET to activate the link grabber. This will present +;; org-mac-grab-link RET to activate the link grabber. This will present ;; you with a menu to choose an application from which to grab a link -;; to insert at point. You may also type C-g to abort. +;; to insert at point. You may also type C-g to abort. ;; ;; Customizing: ;; ;; You may customize which applications appear in the grab menu by -;; customizing the group org-mac-link-grabber. Changes take effect +;; customizing the group `org-mac-link'. Changes take effect ;; immediately. ;; ;; -- cgit v1.2.3-70-g09d2 From 54d805aed441713386593d8e6967b44568dfef18 Mon Sep 17 00:00:00 2001 From: Roberto Huelga Díaz Date: Tue, 3 Sep 2013 11:53:15 +0200 Subject: Timer: play a sound as configured by `org-clock-sound' actualy only beep MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * lisp/org-timer.el (org-timer-set-timer): Use the variable `org-clock-sound' when calling `org-notify'. When org-notify second parameter is t we only get the standard beep. Evaluating with coma we can use different sounds for differents running timers, as `org-clock-sound' was set when `org-timer-set-timer' get execute Patch proposal by Roberto Huelga Díaz. TINYCHANGE --- lisp/org-timer.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org-timer.el b/lisp/org-timer.el index 2351c4c19..2ea1c354b 100644 --- a/lisp/org-timer.el +++ b/lisp/org-timer.el @@ -429,7 +429,7 @@ replace any running timer." (run-with-timer secs nil `(lambda () (setq org-timer-current-timer nil) - (org-notify ,(format "%s: time out" hl) t) + (org-notify ,(format "%s: time out" hl) ,org-clock-sound) (setq org-timer-timer-is-countdown nil) (org-timer-set-mode-line 'off) (run-hooks 'org-timer-done-hook)))) -- cgit v1.2.3-70-g09d2 From b43403d0eae2d9e599558db3cc1b2850ea5e77b8 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Fri, 6 Sep 2013 16:25:19 +0200 Subject: etc/ORG-NEWS: Mention support for AUTO in \usepackage[AUTO]{inputenc} See commit 755251fdade23ef83d1a1841445488187471cebe Thanks to Rasmus for reporting this change. --- etc/ORG-NEWS | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index 80ce9f361..4fd9f8ecf 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -58,13 +58,14 @@ See [[doc:org-sort-list][org-sort-list]]: hitting =C-c ^ x= will put checked ite of the list. *** Various LaTeX export enhancements -- support SVG images -- Support for pgf files +- Support SVG images +- Support for .pgf files - LaTeX Babel blocks can now be exported as =.tikz= files - Allow =latexmk= as an option for [[doc:org-latex-pdf-process][org-latex-pdf-process]] - -Also, the dependency on the =latexsym= LaTeX package has been removed, -We now use =amssymb= symbols by default instead. +- When using =\usepackage[AUTO]{inputenc}=, AUTO will automatically be + replaced with a coding system derived from =buffer-file-coding-system=. +- The dependency on the =latexsym= LaTeX package has been removed, we + now use =amssymb= symbols by default instead. *** Remapping =forward-paragraph= and =backward-paragraph= -- cgit v1.2.3-70-g09d2 From 0e9efe0f14ed72fd400c1e60ca3f24d5e603ba32 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Fri, 6 Sep 2013 17:07:23 +0200 Subject: contrib/lisp/org-mac-link.el: Fix typo in the comment section * contrib/lisp/org-mac-link.el: Fix typo in the comment section. --- contrib/lisp/org-mac-link.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/lisp/org-mac-link.el b/contrib/lisp/org-mac-link.el index e3fe79df3..b0c2aedd5 100644 --- a/contrib/lisp/org-mac-link.el +++ b/contrib/lisp/org-mac-link.el @@ -35,7 +35,7 @@ ;; hyperlinks into the current org-mode document at point. ;; ;; This code is heavily based on, and indeed incorporates, -;; org-mac-message.el written by John Weigley and Christopher +;; org-mac-message.el written by John Wiegley and Christopher ;; Suckling. ;; ;; Detailed comments for each application interface are inlined with -- cgit v1.2.3-70-g09d2