From 9ca840a501c89da7d949d2df0beee40fa0c76a63 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 22 Apr 2014 08:02:05 +0200 Subject: [PATCH 01/14] Revert "org.el (org-mode): Use `org-back-to-heading' and `org-end-of-subtree' for C-M-a and C-M-e" This reverts commit 47e456d8a6e1c818b820a31f447496b89ed45445. --- lisp/org.el | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 5e4514e63..31f0433d8 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -5377,9 +5377,8 @@ The following commands are available: ;; Comments. (org-setup-comments-handling) ;; Beginning/end of defun - (org-set-local 'beginning-of-defun-function 'org-back-to-heading) - (org-set-local 'end-of-defun-function - (lambda () (interactive) (org-end-of-subtree nil t))) + (org-set-local 'beginning-of-defun-function 'org-backward-element) + (org-set-local 'end-of-defun-function 'org-forward-element) ;; Next error for sparse trees (org-set-local 'next-error-function 'org-occur-next-match) ;; Make sure dependence stuff works reliably, even for users who set it From 162f8867c90a42d14a3d568f7a12ba669fa5f02b Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 22 Apr 2014 08:03:44 +0200 Subject: [PATCH 02/14] org.el (org-mode): Use `org-*-element' functions again * org.el (org-mode): Use `org-*-element' functions for C-M-a and C-M-e but fix C-M-e. --- lisp/org.el | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/org.el b/lisp/org.el index 31f0433d8..96b18624d 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -5378,7 +5378,12 @@ The following commands are available: (org-setup-comments-handling) ;; Beginning/end of defun (org-set-local 'beginning-of-defun-function 'org-backward-element) - (org-set-local 'end-of-defun-function 'org-forward-element) + (org-set-local 'end-of-defun-function + (lambda () + (if (not (org-at-heading-p)) + (org-forward-element) + (org-forward-element) + (forward-char -1)))) ;; Next error for sparse trees (org-set-local 'next-error-function 'org-occur-next-match) ;; Make sure dependence stuff works reliably, even for users who set it From 6f1b5185c22aefd490147c853b3deadadab7cba4 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 22 Apr 2014 10:41:56 +0200 Subject: [PATCH 03/14] ox-html.el (org-html-infojs-install-script): Don't install infojs scripts when #+INFOJS_OPT: is empty * ox-html.el (org-html-infojs-install-script): Don't install infojs scripts when #+INFOJS_OPT: is empty. Thanks to Diez B. Roggisch for reporting this. --- lisp/ox-html.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/ox-html.el b/lisp/ox-html.el index c82c642ef..88e572084 100644 --- a/lisp/ox-html.el +++ b/lisp/ox-html.el @@ -455,6 +455,7 @@ export back-end currently used." (not org-html-use-infojs) (and (eq org-html-use-infojs 'when-configured) (or (not (plist-get exp-plist :infojs-opt)) + (string= "" (plist-get exp-plist :infojs-opt)) (string-match "\\" (plist-get exp-plist :infojs-opt))))) (let* ((template org-html-infojs-template) From fdb4b54e92aff9bbe7fec6209813af17a14eb876 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 22 Apr 2014 11:18:12 +0200 Subject: [PATCH 04/14] org.el (org-insert-heading): Fix behavior * org.el (org-insert-heading): Fix behavior when point is at the beginning of a heading or a list item. Enhance docstring. Thanks to York Zhao for reporting this. --- lisp/org.el | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 96b18624d..2a451ed54 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -7546,21 +7546,31 @@ When NEXT is non-nil, check the next line instead." (defun org-insert-heading (&optional arg invisible-ok) "Insert a new heading or item with same depth at point. -If point is in a plain list and ARG is nil, create a new list item. -With one universal prefix argument, insert a heading even in lists. -With two universal prefix arguments, insert the heading at the end -of the parent subtree. -If point is at the beginning of a headline, insert a sibling before -the current headline. If point is not at the beginning, split the line -and create a new headline with the text in the current line after point -\(see `org-M-RET-may-split-line' on how to modify this behavior). +If point is at the beginning of a heading or a list item, insert +a heading or a list item before it. -If point is at the beginning of a normal line, turn this line into -a heading. +If point is at the beginning of a normal line, turn this line +into a heading. -When INVISIBLE-OK is set, stop at invisible headlines when going back. -This is important for non-interactive uses of the command." +If point is in the middle of a headline or a list item, split the +headline or the item and create a new headline/item with the text +in the current line after point \(see `org-M-RET-may-split-line' +on how to modify this behavior). + +With one universal prefix argument: If point is within a list, +insert a heading instead of a list item. Otherwise, set the +value of `org-insert-heading-respect-content' to `t' for the +duration of the command. + +With two universal prefix arguments, insert the heading at the +end of the grandparent subtree. For example, if point is within +a 2nd-level heading, then it will insert a 2nd-level heading at +the end of the 1st-level parent heading. + +When INVISIBLE-OK is set, stop at invisible headlines when going +back. This is important for non-interactive uses of the +command." (interactive "P") (if (org-called-interactively-p 'any) (org-reveal)) (let ((itemp (org-in-item-p)) @@ -7640,7 +7650,7 @@ This is important for non-interactive uses of the command." pos hide-previous previous-pos) ;; If we insert after content, move there and clean up whitespace - (when respect-content + (when (and respect-content (not (org-on-heading-p))) (org-end-of-subtree nil t) (skip-chars-backward " \r\n") (and (not (looking-back "^\*+")) From 4346e820b973f1dbc450b36b924723ae2bbba738 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 22 Apr 2014 11:53:48 +0200 Subject: [PATCH 05/14] README_maintainer: Don't display sub/superscript --- README_maintainer | 1 + 1 file changed, 1 insertion(+) diff --git a/README_maintainer b/README_maintainer index 04dc2c087..6b162aa52 100644 --- a/README_maintainer +++ b/README_maintainer @@ -2,6 +2,7 @@ #+TITLE: Org maintainer tasks #+STARTUP: noindent +#+OPTIONS: ^:nil This document describes the tasks the Org-mode maintainer has to do and how they are performed. From 099b6f0fb5b4db43bc9025a71c136f773c8289cb Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 22 Apr 2014 12:08:15 +0200 Subject: [PATCH 06/14] test-org.el: Fix test * test-org.el (test-org/insert-todo-heading-respect-content): Fix test. --- testing/lisp/test-org.el | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/testing/lisp/test-org.el b/testing/lisp/test-org.el index 1540b8ec2..6954a9391 100644 --- a/testing/lisp/test-org.el +++ b/testing/lisp/test-org.el @@ -414,15 +414,12 @@ (org-test-with-temp-text "* H1\n Body" (org-insert-todo-heading-respect-content) (nth 2 (org-heading-components)))) - ;; Add headline after body of current subtree. + ;; Add headline at the end of the first subtree (should - (org-test-with-temp-text "* H1\nBody" + (org-test-with-temp-text "* H1\nH1Body\n** H2\nH2Body" + (search-forward "H1Body") (org-insert-todo-heading-respect-content) - (eobp))) - (should - (org-test-with-temp-text "* H1\n** H2\nBody" - (org-insert-todo-heading-respect-content) - (eobp))) + (and (eobp) (org-at-heading-p)))) ;; In a list, do not create a new item. (should (org-test-with-temp-text "* H\n- an item\n- another one" From 1fa6ccab10c9f97dc9317f9c3eedea82c4cdc357 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 22 Apr 2014 15:24:14 +0200 Subject: [PATCH 07/14] Complete fix 369e3d77 --- 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 e2a062952..18fada15d 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -649,7 +649,7 @@ of custom agenda commands." :tag "Org Agenda Match View" :group 'org-agenda) (defgroup org-agenda-search-view nil - "Options concerning the general tags/property/todo match agenda view." + "Options concerning the search agenda view." :tag "Org Agenda Search View" :group 'org-agenda) From 91da1b4c76c6252bbed75f04cf19ea60f0131cee Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 22 Apr 2014 17:39:01 +0200 Subject: [PATCH 08/14] ox.el (org-export-time-stamp-file): Fix docstring typo * ox.el (org-export-time-stamp-file): Fix docstring typo. --- lisp/ox.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/ox.el b/lisp/ox.el index e90832337..8564b21a5 100644 --- a/lisp/ox.el +++ b/lisp/ox.el @@ -752,7 +752,7 @@ e.g. \"tasks:nil\"." (defcustom org-export-time-stamp-file t "Non-nil means insert a time stamp into the exported file. -The time stamp shows when the file was created. This option can +The time stamp shows when the file was created. This option can also be set with the OPTIONS keyword, e.g. \"timestamp:nil\"." :group 'org-export-general :type 'boolean) From ef5900641c4e5181c979f5748cd443b54b58f9e3 Mon Sep 17 00:00:00 2001 From: Aaron Ecay Date: Tue, 22 Apr 2014 15:03:34 -0400 Subject: [PATCH 09/14] org.el: use `user-error' instead of `error'. * lisp/org.el (org-next-block, org-reftex-citation) (org-create-math-formula, org-check-agenda-file) (org-occur-next-match, org-auto-repeat-maybe) (org-offer-links-in-entry, org-open-at-point) (org-clone-subtree-with-time-shift): Use `user-error' instead of `error'. --- lisp/org.el | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 5d201eabe..36c3dbbc6 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -8593,11 +8593,11 @@ and still retain the repeater to cover future instances of the task." beg end template task idprop shift-n shift-what doshift nmin nmax) (if (not (and (integerp n) (> n 0))) - (error "Invalid number of replications %s" n)) + (user-error "Invalid number of replications %s" n)) (if (and (setq doshift (and (stringp shift) (string-match "\\S-" shift))) (not (string-match "\\`[ \t]*\\+?\\([0-9]+\\)\\([hdwmy]\\)[ \t]*\\'" shift))) - (error "Invalid shift specification %s" shift)) + (user-error "Invalid shift specification %s" shift)) (when doshift (setq shift-n (string-to-number (match-string 1 shift)) shift-what (cdr (assoc (match-string 2 shift) @@ -10631,7 +10631,7 @@ is used internally by `org-open-link-from-string'." (setq clean-buffer-list-kill-buffer-names (cons buf clean-buffer-list-kill-buffer-names)))) - (error "Abort")))) + (user-error "Abort")))) ((equal type "elisp") (let ((cmd path)) (if (or (and (org-string-nw-p @@ -10647,7 +10647,7 @@ is used internally by `org-open-link-from-string'." (if (eq (string-to-char cmd) ?\() (eval (read cmd)) (call-interactively (read cmd)))) - (error "Abort")))) + (user-error "Abort")))) ((equal type "id") (require 'ord-id) (funcall (nth 1 (assoc "id" org-link-protocols)) path)) @@ -10739,7 +10739,7 @@ there is one, return it." (message "Select link to open, RET to open all:") (setq c (read-char-exclusive)) (and (get-buffer "*Select Link*") (kill-buffer "*Select Link*")))) - (when (equal c ?q) (error "Abort")) + (when (equal c ?q) (user-error "Abort")) (if (equal c ?\C-m) (setq link links) (setq nth (- c ?0)) @@ -13040,7 +13040,7 @@ This function is run automatically after each state change to a DONE state." (time-to-days (current-time)))) (when (= (incf nshift) nshiftmax) (or (y-or-n-p (message "%d repeater intervals were not enough to shift date past today. Continue? " nshift)) - (error "Abort"))) + (user-error "Abort"))) (org-timestamp-change n (cdr (assoc what whata))) (org-at-timestamp-p t) (setq ts (match-string 1)) @@ -13724,7 +13724,7 @@ starting point when no match is found." (while (setq p1 (funcall search-func (point) 'org-type)) (when (equal p1 limit) (goto-char pos) - (error "No more matches")) + (user-error "No more matches")) (when (equal (get-char-property p1 'org-type) 'org-occur) (setq n (1- n)) (when (= n 0) @@ -13732,7 +13732,7 @@ starting point when no match is found." (throw 'exit (point)))) (goto-char p1)) (goto-char p1) - (error "No more matches")))) + (user-error "No more matches")))) (defun org-show-context (&optional key) "Make sure point and context are visible. @@ -18155,7 +18155,7 @@ Optional argument FILE means use this file instead of the current." ((equal r ?r) (org-remove-file file) (throw 'nextfile t)) - (t (error "Abort")))))) + (t (user-error "Abort")))))) (defun org-get-agenda-file-buffer (file) "Get a buffer visiting FILE. If the buffer needs to be created, add @@ -18581,7 +18581,7 @@ inspection." (buffer-substring-no-properties (region-beginning) (region-end))))) (read-string "LaTeX Fragment: " frag nil frag)))) - (unless latex-frag (error "Invalid LaTeX fragment")) + (unless latex-frag (user-error "Invalid LaTeX fragment")) (let* ((tmp-in-file (file-relative-name (make-temp-name (expand-file-name "ltxmathml-in")))) (ignore (write-region latex-frag nil tmp-in-file)) @@ -23015,7 +23015,7 @@ package ox-bibtex by Taru Karttunen." (if (not (save-excursion (or (re-search-forward re nil t) (re-search-backward re nil t)))) - (error "No bibliography defined in file") + (user-error "No bibliography defined in file") (setq bib (concat (match-string 1) ".bib") rds (list (list 'bib bib))))))) (call-interactively 'reftex-citation))) @@ -23608,7 +23608,8 @@ When BLOCK-REGEXP is non-nil, use this regexp to find blocks." (if (looking-at re) (forward-char 1)) (condition-case nil (funcall re-search-fn re nil nil arg) - (error (error "No %s code blocks" (if backward "previous" "further" )))) + (error (user-error "No %s code blocks" + (if backward "previous" "further" )))) (goto-char (match-beginning 0)) (org-show-context))) (defun org-previous-block (arg &optional block-regexp) From c7dff7105b417a0cd6d05504121f83f3bc2c0cb4 Mon Sep 17 00:00:00 2001 From: Aaron Ecay Date: Tue, 22 Apr 2014 15:01:27 -0400 Subject: [PATCH 10/14] ob-core.el: Replace a use of remove with remq * lisp/ob-core.el (org-babel-del-hlines): Use `remq' for `remove' --- lisp/ob-core.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/ob-core.el b/lisp/ob-core.el index 401e3f018..d80ea4c59 100644 --- a/lisp/ob-core.el +++ b/lisp/ob-core.el @@ -1591,7 +1591,7 @@ shown below. ;; row and column names (defun org-babel-del-hlines (table) "Remove all 'hlines from TABLE." - (remove 'hline table)) + (remq 'hline table)) (defun org-babel-get-colnames (table) "Return the column names of TABLE. From 935b69e0659653ac3e17a3c2132c7499abc2dc57 Mon Sep 17 00:00:00 2001 From: Aaron Ecay Date: Tue, 22 Apr 2014 14:54:55 -0400 Subject: [PATCH 11/14] Replace org-babel-*-graphical-output-file with generic version * lisp/ob-core.el (org-babel-graphical-output-file): New generic function. * lisp/ob-R.el (org-babel-R-graphical-output-file): Delete specific version. (org-babel-expand-body:R): Use generic version. * lisp/ob-maxima.el (org-babel-maxima-graphical-output-file): Delete specific version. (org-babel-maxima-expand): Use generic version. * lisp/ob-octave.el (org-babel-octave-graphical-output-file): Delete specific version (org-babel-execute:octave): Use generic version. --- lisp/ob-R.el | 9 ++------- lisp/ob-core.el | 7 +++++++ lisp/ob-maxima.el | 7 +------ lisp/ob-octave.el | 11 +++-------- 4 files changed, 13 insertions(+), 21 deletions(-) diff --git a/lisp/ob-R.el b/lisp/ob-R.el index 780d99f9c..1c71e0406 100644 --- a/lisp/ob-R.el +++ b/lisp/ob-R.el @@ -96,7 +96,7 @@ this variable.") (defun org-babel-expand-body:R (body params &optional graphics-file) "Expand BODY according to PARAMS, return the expanded body." (let ((graphics-file - (or graphics-file (org-babel-R-graphical-output-file params)))) + (or graphics-file (org-babel-graphical-output-file params)))) (mapconcat #'identity (append (when (cdr (assoc :prologue params)) @@ -117,7 +117,7 @@ This function is called by `org-babel-execute-src-block'." (cdr (assoc :session params)) params)) (colnames-p (cdr (assoc :colnames params))) (rownames-p (cdr (assoc :rownames params))) - (graphics-file (org-babel-R-graphical-output-file params)) + (graphics-file (org-babel-graphical-output-file params)) (full-body (let ((inside (list (org-babel-expand-body:R body params graphics-file)))) @@ -251,11 +251,6 @@ current code buffer." (process-name (get-buffer-process session))) (ess-make-buffer-current)) -(defun org-babel-R-graphical-output-file (params) - "Name of file to which R should send graphical output." - (and (member "graphics" (cdr (assq :result-params params))) - (cdr (assq :file params)))) - (defvar org-babel-R-graphics-devices '((:bmp "bmp" "filename") (:jpg "jpeg" "filename") diff --git a/lisp/ob-core.el b/lisp/ob-core.el index d80ea4c59..1348f04f5 100644 --- a/lisp/ob-core.el +++ b/lisp/ob-core.el @@ -2890,6 +2890,13 @@ For the format of SAFE-LIST, see `org-babel-safe-header-args'." (member (cdr pair) (cdr entry))) (t nil))))))) + +;;; Used by backends: R, Maxima, Octave. +(defun org-babel-graphical-output-file (params) + "File where a babel block should send graphical output, per PARAMS." + (and (member "graphics" (cdr (assq :result-params params))) + (cdr (assq :file params)))) + (provide 'ob-core) ;; Local variables: diff --git a/lisp/ob-maxima.el b/lisp/ob-maxima.el index 7435f1d32..5d4ec18cc 100644 --- a/lisp/ob-maxima.el +++ b/lisp/ob-maxima.el @@ -52,7 +52,7 @@ (mapconcat 'identity (list ;; graphic output - (let ((graphic-file (org-babel-maxima-graphical-output-file params))) + (let ((graphic-file (org-babel-graphical-output-file params))) (if graphic-file (format "set_plot_option ([gnuplot_term, png]); set_plot_option ([gnuplot_out_file, %S]);" @@ -113,11 +113,6 @@ of the same value." (format "%S: %s$" var (org-babel-maxima-elisp-to-maxima val)))) -(defun org-babel-maxima-graphical-output-file (params) - "Name of file to which maxima should send graphical output." - (and (member "graphics" (cdr (assq :result-params params))) - (cdr (assq :file params)))) - (defun org-babel-maxima-elisp-to-maxima (val) "Return a string of maxima code which evaluates to VAL." (if (listp val) diff --git a/lisp/ob-octave.el b/lisp/ob-octave.el index 8cc66b6f9..1e6102c89 100644 --- a/lisp/ob-octave.el +++ b/lisp/ob-octave.el @@ -84,16 +84,16 @@ end") body params (org-babel-variable-assignments:octave params))) (result (org-babel-octave-evaluate session - (if (org-babel-octave-graphical-output-file params) + (if (org-babel-graphical-output-file params) (mapconcat 'identity (list "set (0, \"defaultfigurevisible\", \"off\");" full-body - (format "print -dpng %s" (org-babel-octave-graphical-output-file params))) + (format "print -dpng %s" (org-babel-graphical-output-file params))) "\n") full-body) result-type matlabp))) - (if (org-babel-octave-graphical-output-file params) + (if (org-babel-graphical-output-file params) nil (org-babel-reassemble-table result @@ -268,11 +268,6 @@ This removes initial blank and comment lines and then calls (match-string 1 string) string)) -(defun org-babel-octave-graphical-output-file (params) - "Name of file to which maxima should send graphical output." - (and (member "graphics" (cdr (assq :result-params params))) - (cdr (assq :file params)))) - (provide 'ob-octave) From e1e5c0776aafbc44f2f981b89fa4adb6be14bab0 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Wed, 23 Apr 2014 08:11:29 +0200 Subject: [PATCH 12/14] org-agenda.el (org-agenda-finalize): Filter by top headline * org-agenda.el (org-agenda-finalize): Filter by top headline if `org-agenda-top-headline-filter' is set. Thanks to Brady Trainor for reporting this. --- lisp/org-agenda.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 18fada15d..c0c87530c 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -3746,6 +3746,9 @@ generating a new one." (delete-dups (mapcar 'downcase (org-get-tags-at)))))))))) (run-hooks 'org-agenda-finalize-hook) + (when org-agenda-top-headline-filter + (org-agenda-filter-top-headline-apply + org-agenda-top-headline-filter)) (when org-agenda-tag-filter (org-agenda-filter-apply org-agenda-tag-filter 'tag)) (when (get 'org-agenda-tag-filter :preset-filter) From 096c9e8b712c4e48ced88a38c96b5295174eb05b Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Wed, 23 Apr 2014 09:50:25 +0200 Subject: [PATCH 13/14] ox-icalendar.el (org-icalendar-use-scheduled): Fix typo * ox-icalendar.el (org-icalendar-use-scheduled): Fix typo. --- lisp/ox-icalendar.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/ox-icalendar.el b/lisp/ox-icalendar.el index a60c2f92f..6f86250e0 100644 --- a/lisp/ox-icalendar.el +++ b/lisp/ox-icalendar.el @@ -101,7 +101,8 @@ This is a list with several symbols in it. Valid symbol are: (defcustom org-icalendar-use-scheduled '(todo-start) "Contexts where iCalendar export should use a scheduling time stamp. -This is a list with several symbols in it. Valid symbol are: +This is a list with possibly several symbols in it. Valid symbols are: + `event-if-todo' Scheduling time stamps in TODO entries become an event. `event-if-not-todo' Scheduling time stamps in non-TODO entries become an event. `todo-start' Scheduling time stamps in TODO entries become start date. From 1fd54bf8e0fdda87d2a3fe9d3d9b4651f03435c1 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Wed, 23 Apr 2014 10:06:43 +0200 Subject: [PATCH 14/14] Fix typos * org.el (org-get-agenda-file-buffer): Fix docstring. * ox-icalendar.el (org-icalendar-use-deadline): Fix typo in docstring. --- lisp/org.el | 5 +++-- lisp/ox-icalendar.el | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 36c3dbbc6..0d02f9fc3 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -18158,8 +18158,9 @@ Optional argument FILE means use this file instead of the current." (t (user-error "Abort")))))) (defun org-get-agenda-file-buffer (file) - "Get a buffer visiting FILE. If the buffer needs to be created, add -it to the list of buffers which might be released later." + "Get an agenda buffer visiting FILE. +If the buffer needs to be created, add it to the list of buffers +which might be released later." (let ((buf (org-find-base-buffer-visiting file))) (if buf buf ; just return it diff --git a/lisp/ox-icalendar.el b/lisp/ox-icalendar.el index 6f86250e0..3571c4ce0 100644 --- a/lisp/ox-icalendar.el +++ b/lisp/ox-icalendar.el @@ -85,10 +85,11 @@ keyword." (defcustom org-icalendar-use-deadline '(event-if-not-todo todo-due) "Contexts where iCalendar export should use a deadline time stamp. -This is a list with several symbols in it. Valid symbol are: +This is a list with possibly several symbols in it. Valid symbols are: + `event-if-todo' Deadlines in TODO entries become calendar events. `event-if-not-todo' Deadlines in non-TODO entries become calendar events. -`todo-due' Use deadlines in TODO entries as due-dates" +`todo-due' Use deadlines in TODO entries as due-dates." :group 'org-export-icalendar :type '(set :greedy t (const :tag "Deadlines in non-TODO entries become events"