summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchim Gratz <Stromeko@Stromeko.DE>2014-09-10 10:51:02 +0200
committerAchim Gratz <Stromeko@Stromeko.DE>2014-09-10 10:51:02 +0200
commit2f8067c9152d2c41320760728c89d799bc51c598 (patch)
tree0518ccfba3d2d2276ffda099d305cd5a195a3907
parentb5c9de618e9a89b339505c6b8643b7e7bf46f9d7 (diff)
parentd4a7ba2a966a1a5539318a5512f273cf91a4af4c (diff)
downloadorg-mode-2f8067c9152d2c41320760728c89d799bc51c598.tar.gz
Merge branch 'maint'
-rw-r--r--mk/org-fixup.el16
1 files changed, 8 insertions, 8 deletions
diff --git a/mk/org-fixup.el b/mk/org-fixup.el
index aa7ff09..e57eb65 100644
--- a/mk/org-fixup.el
+++ b/mk/org-fixup.el
@@ -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