Merge branch 'master' of orgmode.org:org-mode

5 files changed, 40 insertions, 27 deletions

diff --git a/Makefile b/Makefile
index 00742ea..fa03d6e 100644
--- a/Makefile
+++ b/Makefile
@@ -264,9 +264,6 @@ doc/orgcard_letter.pdf: doc/orgcard_letter.tex
 
 # Below here are special targets for maintenance only
 
-updateweb:
-	ssh cdominik@orgmode.org 'pull-worg-orgweb.sh && publish-worg-orgweb.sh'
-
 html: doc/org.html
 
 html_manual: doc/org.texi
@@ -299,7 +296,7 @@ testrelease:
 	git checkout master
 	git branch -D testrelease
 
-# The following target makes a full release fro the stuff that is
+# The following target makes a full release for the stuff that is
 # currently on master.  Do it like this:
 #
 #   make release TAG=7.01
@@ -323,7 +320,7 @@ release:
 	git push
 	make updateweb
 
-# The following target makes a release, but from the studd that is on
+# The following target makes a release, but from the stuff that is on
 # maint, not from the stuff that is on master.  The idea is that it pushes
 # out a minor fix into a minor update, while development on master
 # already went full steam ahead.  To make a micro-relesse, cherry-pick
@@ -425,7 +422,7 @@ cleancontrib:
 cleanelc:
 	rm -f $(ELCFILES)
 cleandoc:
-	(cd doc; rm -f org.pdf org org.html orgcard.pdf)
+	(cd doc; rm -f org.pdf org org.html orgcard.pdf orgguide.pdf)
 	(cd doc; rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.pg *.pgs)
 	(cd doc; rm -f *.toc *.tp *.tps *.vr *.vrs *.log *.html *.ps)
 	(cd doc; rm -f orgcard_letter.tex orgcard_letter.pdf)
@@ -441,15 +438,15 @@ cleanrel:
 
 
 push:
-	git-push git+ssh://repo.or.cz/srv/git/org-mode.git master
+	git-push orgmode@orgmode.org:org-mode.git master
 
 pushtag:
 	git-tag -m "Adding tag" -a $(TAG)
-	git-push git+ssh://repo.or.cz/srv/git/org-mode.git $(TAG)
+	git-push orgmode@orgmode.org:org-mode.git $(TAG)
 
 pushreleasetag:
 	git-tag -m "Adding release tag" -a release_$(TAG)
-	git-push git+ssh://repo.or.cz/srv/git/org-mode.git release_$(TAG)
+	git-push orgmode@orgmode.org:org-mode.git release_$(TAG)
 
 # Dependencies
 
diff --git a/README_maintainer b/README_maintainer
index f939347..3497654 100644
--- a/README_maintainer
+++ b/README_maintainer
@@ -61,7 +61,7 @@ changes to the same branch =t/patchNNN=.
 If you ask the contributor to make the changes, the patch should be
 marked on the patchwork server as "changes requested".
 
-: pw update -s "Changed Requested" -m "What to change" NNN
+: pw update -s "Changes Requested" -m "What to change" NNN
 
 This will send an email to the contributor and the mailing list with a
 request for changes.  The =-m= message should not be more than one
@@ -90,7 +90,7 @@ has been accepted, along with the comment given in the =-m= message.
 
 At some point you might then want to remove the topic branch
 
-: git -d t/patchNNN
+: git branch -d t/patchNNN
 
 * Releases
 
diff --git a/UTILITIES/set-version.pl b/UTILITIES/set-version.pl
index ec91ae2..ed185ea 100755
--- a/UTILITIES/set-version.pl
+++ b/UTILITIES/set-version.pl
@@ -43,10 +43,3 @@ if (not $only) {
   $c1 = "perl -pi -e '$cmd' README_DIST";
   system($c1);
 }
-
-if ($all or $only) {
-  print STDERR "ORGWEBPAGE/index.org\n";
-  $cmd = qq{s/^(\\* Current Version )\\(\\S+?\\)/\$1($version)/;s/^(The current version is)\\s+(\\S+)\\. /\$1 $version. /;s/org-[6-9].*?\\.(zip|tar\\.gz)/org-$version.\$1/g};
-  $c1 = "perl -pi -e '$cmd' ORGWEBPAGE/index.org";
-  system($c1);
-}
diff --git a/doc/org.texi b/doc/org.texi
index e83909d..e7bf078 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -12379,7 +12379,8 @@ execution of a code block regardless of the value of the
 
 The way in which results are handled depends on whether a session is invoked,
 as well as on whether @code{:results value} or @code{:results output} is
-used. The following table shows the possibilities:
+used. The following table shows the table possibilities.  For a full listing
+of the possible results header arguments see @ref{results}.
 
 @multitable @columnfractions 0.26 0.33 0.41
 @item @tab @b{Non-session} @tab @b{Session}
@@ -13423,7 +13424,7 @@ to have other replacement keys, look at the variable
 
 @item @file{yasnippet.el}
 @cindex @file{yasnippet.el}
-The way Org-mode binds the TAB key (binding to @code{[tab]} instead of
+The way Org mode binds the TAB key (binding to @code{[tab]} instead of
 @code{"\t"}) overrules YASnippet's access to this key.  The following code
 fixed this problem:
 
@@ -13434,6 +13435,24 @@ fixed this problem:
             (define-key yas/keymap [tab] 'yas/next-field-group)))
 @end lisp
 
+The latest version of yasnippets doesn't play well with Org mode. If the
+above code does not fix the conflict, start by defining the following
+function:
+@lisp
+(defun yas/org-very-safe-expand ()
+       (let ((yas/fallback-behavior 'return-nil)) (yas/expand)))
+@end lisp
+
+Then, tell Org mode what to do with the new function:
+@lisp
+(add-hook 'org-mode-hook
+          (lambda ()
+              (make-variable-buffer-local 'yas/trigger-key)
+              (setq yas/trigger-key [tab])
+              (add-to-list 'org-tab-first-hook 'yas/org-very-safe-expand)
+              (define-key yas/keymap [tab] 'yas/next-field)))
+@end lisp
+
 @item @file{windmove.el} by Hovav Shacham
 @cindex @file{windmove.el}
 This package also uses the @kbd{S-<cursor>} keys, so everything written
diff --git a/lisp/ob.el b/lisp/ob.el
index 7502875..d6326c7 100644
--- a/lisp/ob.el
+++ b/lisp/ob.el
@@ -592,10 +592,11 @@ results already exist."
 	(if (looking-at org-bracket-link-regexp)
 	    ;; file results
 	    (org-open-at-point)
-	  (pop-to-buffer (get-buffer-create "*Org-Babel Results*"))
-	  (delete-region (point-min) (point-max))
-	  (insert (org-babel-format-result (org-babel-read-result)
-					   (cdr (assoc :sep (nth 2 info))))))
+	  (let ((r (org-babel-format-result
+		    (org-babel-read-result) (cdr (assoc :sep (nth 2 info))))))
+	    (pop-to-buffer (get-buffer-create "*Org-Babel Results*"))
+	    (delete-region (point-min) (point-max))
+	    (insert r)))
 	t))))
 
 ;;;###autoload
@@ -1129,7 +1130,7 @@ org-babel-named-src-block-regexp."
     (when file (find-file file)) (goto-char (point-min))
     (let (names)
       (while (re-search-forward org-babel-src-name-w-name-regexp nil t)
-	(setq names (cons (org-babel-clean-text-properties (match-string 3))
+	(setq names (cons (org-babel-clean-text-properties (match-string 4))
 			  names)))
       names)))
 
@@ -1958,7 +1959,8 @@ of `org-babel-temporary-directory'."
 		prefix temporary-file-directory)
 	       nil suffix))
     (let ((temporary-file-directory
-	   (or (and (file-exists-p org-babel-temporary-directory)
+	   (or (and (boundp 'org-babel-temporary-directory)
+		    (file-exists-p org-babel-temporary-directory)
 		    org-babel-temporary-directory)
 	       temporary-file-directory)))
       (make-temp-file prefix nil suffix))))
@@ -1983,7 +1985,9 @@ of `org-babel-temporary-directory'."
 	  (delete-directory org-babel-temporary-directory))
       (error
        (message "Failed to remove temporary Org-babel directory %s"
-		org-babel-temporary-directory)))))
+		(if (boundp 'org-babel-temporary-directory)
+		    org-babel-temporary-directory
+		  "[directory not defined]"))))))
 
 (add-hook 'kill-emacs-hook 'org-babel-remove-temporary-directory)