Merge from emacs-24; up to 2014-04-22T20:19:17Z!eggert@cs.ucla.edu

1 files changed, 19 insertions, 19 deletions

diff --git a/lisp/org/org-src.el b/lisp/org/org-src.el
index b8d7c672be9..f870b2c714d 100644
--- a/lisp/org/org-src.el
+++ b/lisp/org/org-src.el
@@ -348,7 +348,7 @@ the display of windows containing the Org buffer and the code buffer."
           (condition-case e
               (funcall lang-f)
             (error
-             (error "Language mode `%s' fails with: %S" lang-f (nth 1 e)))))
+             (message "Language mode `%s' fails with: %S" lang-f (nth 1 e)))))
         (dolist (pair transmitted-variables)
           (org-set-local (car pair) (cadr pair)))
         ;; Remove protecting commas from visible part of buffer.
@@ -577,14 +577,6 @@ the language, a switch telling if the content should be in a single line."
         (pos (point))
         re1 re2 single beg end lang lfmt match-re1 ind entry)
     (catch 'exit
-      (when (org-at-table.el-p)
-        (re-search-backward "^[\t]*[^ \t|\\+]" nil t)
-        (setq beg (1+ (point-at-eol)))
-        (goto-char beg)
-        (or (re-search-forward "^[\t]*[^ \t|\\+]" nil t)
-            (progn (goto-char (point-max)) (newline)))
-        (setq end (1- (point-at-bol)))
-        (throw 'exit (list beg end 'table.el nil nil 0)))
       (while (setq entry (pop re-list))
         (setq re1 (car entry) re2 (nth 1 entry) lang (nth 2 entry)
               single (nth 3 entry))
@@ -615,7 +607,15 @@ the language, a switch telling if the content should be in a single line."
                         (throw 'exit
                                (list (match-end 0) end
                                      (org-edit-src-get-lang lang)
-                                     single lfmt ind))))))))))))
+                                     single lfmt ind)))))))))
+      (when (org-at-table.el-p)
+        (re-search-backward "^[\t]*[^ \t|\\+]" nil t)
+        (setq beg (1+ (point-at-eol)))
+        (goto-char beg)
+        (or (re-search-forward "^[\t]*[^ \t|\\+]" nil t)
+            (progn (goto-char (point-max)) (newline)))
+        (setq end (1- (point-at-bol)))
+        (throw 'exit (list beg end 'table.el nil nil 0))))))
 
 (defun org-edit-src-get-lang (lang)
   "Extract the src language."
@@ -737,8 +737,8 @@ with \",*\", \",#+\", \",,*\" and \",,#+\"."
       (unless (or single preserve-indentation (= total-nindent 0))
         (setq indent (make-string total-nindent ?\ ))
         (goto-char (point-min))
-        (while (re-search-forward "^" nil t)
-          (replace-match indent)))
+        (while (re-search-forward "\\(^\\).+" nil t)
+          (replace-match indent nil nil nil 1)))
       (if (org-bound-and-true-p org-edit-src-picture)
           (setq total-nindent (+ total-nindent 2)))
       (setq code (buffer-string))
@@ -753,14 +753,14 @@ with \",*\", \",#+\", \",,*\" and \",,#+\"."
       (kill-buffer buffer))
     (goto-char beg)
     (when allow-write-back-p
-      (let ((buffer-undo-list t))
-        (delete-region beg (max beg end))
-        (unless (string-match "\\`[ \t]*\\'" code)
-          (insert code))
-        ;; Make sure the overlay stays in place
+      (undo-boundary)
+      (delete-region beg (max beg end))
+      (unless (string-match "\\`[ \t]*\\'" code)
+        (insert code))
+        ;; Make sure the overlay stays in place
         (when (eq context 'save) (move-overlay ovl beg (point)))
-        (goto-char beg)
-        (if single (just-one-space))))
+      (goto-char beg)
+      (if single (just-one-space)))
     (if (memq t (mapcar (lambda (overlay)
                           (eq (overlay-get overlay 'invisible)
                               'org-hide-block))