ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes from downstream emacs.

This commit is contained in:
Carsten Dominik 2008-09-10 11:10:21 +02:00
parent c522625d44
commit 21ff23736c
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/org.texi
View File

@ -42,9 +42,8 @@ Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.2 or under the terms of the GNU Free Documentation License, Version 1.2 or
any later version published by the Free Software Foundation; with no any later version published by the Free Software Foundation; with no
Invariant Sections, with the Front-Cover texts being ``A GNU Manual,'' Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the and with the Back-Cover Texts as in (a) below. A copy of the license
license is included in the section entitled ``GNU Free Documentation is included in the section entitled ``GNU Free Documentation License.''
-License.''
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and (a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in modify this GNU manual. Buying copies from the FSF supports it in

4
lisp/org-exp.el
View File

@ -3003,12 +3003,12 @@ lang=\"%s\" xml:lang=\"%s\">
(setq inverse nil) (setq inverse nil)
(throw 'nextline nil)) (throw 'nextline nil))
(when inverse (when inverse
(setq i (org-get-string-indentation line)) (let ((i (org-get-string-indentation line)))
(if (> i 0) (if (> i 0)
(setq line (concat (mapconcat 'identity (setq line (concat (mapconcat 'identity
(make-list (* 2 i) "\\nbsp") "") (make-list (* 2 i) "\\nbsp") "")
" " (org-trim line)))) " " (org-trim line))))
(setq line (concat line " \\\\"))) (setq line (concat line " \\\\"))))
;; make targets to anchors ;; make targets to anchors
(while (string-match "<<<?\\([^<>]*\\)>>>?\\((INVISIBLE)\\)?[ \t]*\n?" line) (while (string-match "<<<?\\([^<>]*\\)>>>?\\((INVISIBLE)\\)?[ \t]*\n?" line)

3
lisp/org-mac-message.el
View File

@ -32,7 +32,8 @@
(org-add-link-type "message" 'org-mac-message-open) (org-add-link-type "message" 'org-mac-message-open)
(declare-function do-applescript "mac.c" (string)) ;; In mac.c, removed in Emacs 23.
(declare-function do-applescript "org-mac-message" (script))
(unless (fboundp 'do-applescript) (unless (fboundp 'do-applescript)
;; Need to fake this using shell-command-to-string ;; Need to fake this using shell-command-to-string
(defun do-applescript (script) (defun do-applescript (script)