Merge changes from downstream emacs.

doc/org.texi

@@ -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
 any later version published by the Free Software Foundation; with no
 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
- license is included in the section entitled ``GNU Free Documentation
--License.''
+and with the Back-Cover Texts as in (a) below.  A copy of the license
+is included in the section entitled ``GNU Free Documentation License.''
 
 (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

lisp/org-exp.el

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

lisp/org-mac-message.el

@@ -32,7 +32,8 @@
 
 (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)
   ;; Need to fake this using shell-command-to-string
   (defun do-applescript (script)