1 files changed, 19 insertions, 13 deletions
diff --git a/sx-babel.el b/sx-babel.el
index 5544642..24e56c2 100644
--- a/sx-babel.el
+++ b/sx-babel.el
@@ -51,38 +51,44 @@ on a match.")
 (defun sx-babel--make-pre-button (beg end)
   "Turn the region between BEG and END into a button."
   (let ((text (buffer-substring-no-properties beg end))
-        indent)
+        indent mode copy)
     (with-temp-buffer
       (insert text)
       (setq indent (sx-babel--unindent-buffer))
       (goto-char (point-min))
-      (make-text-button
-       (point-min) (point-max)
-       'sx-button-copy (buffer-string)
-       :type 'sx-question-mode-code-block)
-      (sx-babel--determine-and-activate-major-mode)
+      (setq mode (sx-babel--determine-major-mode))
+      (setq copy (string-trim-right (buffer-string)))
+      (when mode
+        (delay-mode-hooks (funcall mode)))
       (font-lock-fontify-region (point-min) (point-max))
       (goto-char (point-min))
       (let ((space (make-string indent ?\s)))
         (while (not (eobp))
-          (insert space)
+          (insert-and-inherit space)
           (forward-line 1)))
       (setq text (buffer-string)))
     (goto-char beg)
     (delete-region beg end)
-    (insert text)))
-
-(defun sx-babel--determine-and-activate-major-mode ()
-  "Activate the major-mode most suitable for the current buffer."
+    (insert-text-button
+     text
+     'sx-button-copy copy
+     ;; We store the mode here so it can be used if the user wants
+     ;; to edit the code block.
+     'sx-mode mode
+     :type 'sx-question-mode-code-block)))
+
+(defun sx-babel--determine-major-mode ()
+  "Return the major-mode most suitable for the current buffer."
   (let ((alist sx-babel-major-mode-alist)
-        cell)
+        cell out)
     (while (setq cell (pop alist))
       (goto-char (point-min))
       (skip-chars-forward "\r\n[:blank:]")
       (let ((kar (car cell)))
         (when (if (stringp kar) (looking-at kar) (funcall kar))
           (setq alist nil)
-          (funcall (cadr cell)))))))
+          (setq out (cadr cell)))))
+    out))
 
 (defun sx-babel--unindent-buffer ()
   "Remove absolute indentation in current buffer.