summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorS├ębastien Delafond <sdelafond@gmail.com>2014-10-13 11:01:35 +0200
committerS├ębastien Delafond <sdelafond@gmail.com>2014-10-13 11:01:35 +0200
commit4dc4918d0d667f18f3d5e3dd71e6f117ddb8af8a (patch)
tree6a236a48e820fe956c9737b967f9517e09a9137e /mk
parentf57fab831252ebe5037ceabe9843623c4bd14f15 (diff)
Imported Upstream version 8.2.10
Diffstat (limited to 'mk')
-rw-r--r--mk/org-fixup.el16
-rw-r--r--mk/version.mk4
2 files changed, 10 insertions, 10 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
diff --git a/mk/version.mk b/mk/version.mk
index bb6d0fe..d33d8e4 100644
--- a/mk/version.mk
+++ b/mk/version.mk
@@ -1,2 +1,2 @@
-ORGVERSION ?= 8.2.7c
-GITVERSION ?= 8.2.7c-dist
+ORGVERSION ?= 8.2.10
+GITVERSION ?= 8.2.10-dist