From 7e1799e5fc7ba6f050b40c228e7957090426bb96 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 5 Jul 2013 13:57:46 +0200 Subject: [PATCH 1/2] ox-latex: Update a docstring * lisp/ox-latex.el (org-latex-listings): Update docstring. --- lisp/ox-latex.el | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el index 55553cf99..0f6fbb5b4 100644 --- a/lisp/ox-latex.el +++ b/lisp/ox-latex.el @@ -613,6 +613,7 @@ in order to mimic default behaviour: (defcustom org-latex-listings nil "Non-nil means export source code using the listings package. + This package will fontify source code, possibly even with color. If you want to use this, you also need to make LaTeX use the listings package, and if you want to have color, the color @@ -620,8 +621,8 @@ package. Just add these to `org-latex-packages-alist', for example using customize, or with something like: \(require 'ox-latex) - \(add-to-list 'org-latex-packages-alist '\(\"\" \"listings\")) - \(add-to-list 'org-latex-packages-alist '\(\"\" \"color\")) + \(add-to-list 'org-latex-packages-alist '(\"\" \"listings\")) + \(add-to-list 'org-latex-packages-alist '(\"\" \"color\")) Alternatively, @@ -633,12 +634,18 @@ the minted package to `org-latex-packages-alist', for example using customize, or with \(require 'ox-latex) - \(add-to-list 'org-latex-packages-alist '\(\"\" \"minted\")) + \(add-to-list 'org-latex-packages-alist '(\"\" \"minted\")) In addition, it is necessary to install pygments \(http://pygments.org), and to configure the variable `org-latex-pdf-process' so that the -shell-escape option is -passed to pdflatex." +passed to pdflatex. + +The minted choice has possible repercussions on the preview of +latex fragments (see `org-preview-latex-fragment'). If you run +into previewing problems, please consult + + http://orgmode.org/worg/org-tutorials/org-latex-preview.html" :group 'org-export-latex :type '(choice (const :tag "Use listings" t) From ce08e04629cc7c85921e8a30bfbc867b3d906754 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Fri, 5 Jul 2013 14:29:51 +0200 Subject: [PATCH 2/2] org-agenda.el (org-agenda-archive-with): Save window excursion * org-agenda.el (org-agenda-archive-with): Save window excursion. --- lisp/org-agenda.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 6ba04b65c..270a73d01 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -8378,7 +8378,7 @@ Point is in the buffer where the item originated.") (if (and confirm (not (y-or-n-p "Archive this subtree or entry? "))) (error "Abort") - (save-excursion + (save-window-excursion (goto-char pos) (let ((org-agenda-buffer-name bufname-orig)) (org-remove-subtree-entries-from-agenda))