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

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

This commit is contained in:
Bastien Guerry 2014-09-10 11:45:20 +02:00
parent 7520cf33d9 ec8f245d27
commit a11e884723
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/ob-eval.el
View File

@ -60,9 +60,10 @@ STDERR with `org-babel-eval-error-notify'."
(save-excursion
(when (get-buffer org-babel-error-buffer-name)
(with-current-buffer org-babel-error-buffer-name
(compilation-mode)
;;compilation-mode enforces read-only
(read-only-mode 0))))
(unless (derived-mode-p 'compilation-mode)
(compilation-mode))
;; Compilation-mode enforces read-only, but Babel expects the buffer modifiable.
(setq buffer-read-only nil))))
nil)
(buffer-string)))))

16
mk/org-fixup.el
View File

@ -58,8 +58,8 @@ the Git work tree)."
\f\n;; Local Variables:\n;; version-control: never
;; no-byte-compile: t
;; coding: utf-8\n;; End:\n;;; org-version.el ends here\n")
(toggle-read-only 0)
(write-file "org-version.el")))
(let ((inhibit-read-only t))
(write-file "org-version.el"))))
(defun org-make-org-loaddefs ()
"Make the file org-loaddefs.el in the current directory.
@ -77,8 +77,8 @@ work correctly if this file is not up-to-date."
(insert "\f\n;; Local Variables:\n;; version-control: never\n")
(insert ";; no-byte-compile: t\n;; no-update-autoloads: t\n")
(insert ";; coding: utf-8\n;; End:\n;;; org-loaddefs.el ends here\n")
(toggle-read-only 0)
(save-buffer)))
(let ((inhibit-read-only t))
(save-buffer))))
(defun org-make-autoloads (&optional compile force)
"Make the files org-loaddefs.el and org-version.el in the install directory.
@ -140,8 +140,8 @@ oldorg: # do what the old Makefile did by default.
(insert "\
# See default.mk for further configuration options.
")
(toggle-read-only 0)
(write-file local))
(let ((inhibit-read-only t))
(write-file local)))
nil)))
(defun org-make-letterformat (a4name lettername)
@ -152,8 +152,8 @@ oldorg: # do what the old Makefile did by default.
(goto-char (point-min))
(while (search-forward "\\pdflayout=(0l)" nil t)
(replace-match "\\pdflayout=(1l)" nil t))
(toggle-read-only 0)
(write-file lettername))
(let ((inhibit-read-only t))
(write-file lettername)))
nil))
;; redefine version functions