Merge branch 'release/4.3.6'

# Conflicts:
#	CHANGELOG.md
#	CotEditor.xcodeproj/project.pbxproj
#	CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/releasenotes.html
#	CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/releasenotes.html

CHANGELOG.md

@@ -17,8 +17,8 @@ Change Log
 
 ### Fixes
 
+- Port fixes in CotEditor 4.3.6.
 - Fix an issue that the empty draft documents that were silently discarded remained in the Open Recents menu.
-- Fix a typo in PHP syntax style (Thanks to DAnn2012!).
 
 
 
@@ -89,6 +89,16 @@ Change Log
 
 
 
+4.3.6 (530)
+--------------------------
+
+### Fixes
+
+- Fix an issue on CotEditor 4.3.5 that the option “Give execute permission” in the save dialog was occasionally ignored.
+- Fix a typo in PHP syntax style (Thanks to DAnn2012!).
+
+
+
 4.3.5 (529)
 --------------------------
 

CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/releasenotes.html

@@ -80,6 +80,24 @@
 </article>
 
 
+<article>
+	<header>
+		<h1>CotEditor 4.3.6</h1>
+		<p>release: <time>2022-10-01</time></p>
+	</header>
+
+
+	<section>
+		<h2>Fixes</h2>
+
+		<ul>
+			<li>Fix an issue on CotEditor 4.3.5 that the option “Give execute permission” in the save dialog was occasionally ignored.</li>
+			<li>Fix a typo in PHP syntax style (Thanks to DAnn2012!).</li>
+		</ul>
+	</section>
+</article>
+
+
 <article>
 	<header>
 		<h1>CotEditor 4.3.5</h1>

CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/releasenotes.html

@@ -80,6 +80,24 @@
 </article>
 
 
+<article>
+	<header>
+		<h1>CotEditor 4.3.6</h1>
+		<p>リリース: <time>2022-10-01</time></p>
+	</header>
+
+
+	<section>
+		<h2>修正</h2>
+
+		<ul>
+			<li>保存ダイアログの「実行権を付与」オプションの変更がファイルに反映されないことがあったCotEditor 4.3.5の不具合を修正</li>
+			<li>PHPシンタックススタイルのキーワードのタイポを修正（DAnn2012さんに感謝！）</li>
+		</ul>
+	</section>
+</article>
+
+
 <article>
 	<header>
 		<h1>CotEditor 4.3.5</h1>

CotEditor/Sources/Document.swift

@@ -496,7 +496,7 @@ final class Document: NSDocument, AdditionalDocumentPreparing, EncodingHolder {
         var attributes = try super.fileAttributesToWrite(to: url, ofType: typeName, for: saveOperation, originalContentsURL: absoluteOriginalContentsURL)
         
         // give the execute permission if user requested
-        if self.isExecutable, !saveOperation.isAutosave {
+        if self.isExecutableFromLastRunSavePanel, !saveOperation.isAutosave {
             let permissions: UInt16 = (self.fileAttributes?[.posixPermissions] as? UInt16) ?? 0o644  // ???: Is the default permission really always 644?
             attributes[FileAttributeKey.posixPermissions] = permissions | S_IXUSR
         }