tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2014-01-12 10:03:17 +01:00
parent a4b1fa7ca1 035087777d
commit 72b8a86d9c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/org-list.el
View File

@ -1213,7 +1213,7 @@ some heuristics to guess the result."
;; When `org-blank-before-new-entry' says so, it is 1. ;; When `org-blank-before-new-entry' says so, it is 1.
((eq insert-blank-p t) 1) ((eq insert-blank-p t) 1)
;; `plain-list-item' is 'auto. Count blank lines separating ;; `plain-list-item' is 'auto. Count blank lines separating
;; neighbours items in list. ;; neighbors' items in list.
(t (let ((next-p (org-list-get-next-item item struct prevs))) (t (let ((next-p (org-list-get-next-item item struct prevs)))
(cond (cond
;; Is there a next item? ;; Is there a next item?

4
lisp/org.el
View File

@ -9692,8 +9692,8 @@ active region."
(message "Stored: %s" (or desc link)) (message "Stored: %s" (or desc link))
(when custom-id (when custom-id
(setq link (concat "file:" (abbreviate-file-name (setq link (concat "file:" (abbreviate-file-name
(buffer-file-name)) "::#" custom-id)) (buffer-file-name)) "::#" custom-id)))
(push (list link desc) org-stored-links))))))) (push (list link desc) org-stored-links))))))
(defun org-store-link-props (&rest plist) (defun org-store-link-props (&rest plist)
"Store link properties, extract names and addresses." "Store link properties, extract names and addresses."

2
lisp/ox.el
View File

@ -5200,7 +5200,7 @@ Return the new string."
;;;; Topology ;;;; Topology
;; ;;
;; Here are various functions to retrieve information about the ;; Here are various functions to retrieve information about the
;; neighbourhood of a given element or object. Neighbours of interest ;; neighborhood of a given element or object. Neighbors of interest
;; are direct parent (`org-export-get-parent'), parent headline ;; are direct parent (`org-export-get-parent'), parent headline
;; (`org-export-get-parent-headline'), first element containing an ;; (`org-export-get-parent-headline'), first element containing an
;; object, (`org-export-get-parent-element'), parent table ;; object, (`org-export-get-parent-element'), parent table