From 208589c30b27d68f38688f387d8c950ff338f40d Mon Sep 17 00:00:00 2001 From: 1024jp <1024jp@wolfrosch.com> Date: Sat, 1 Oct 2022 16:54:35 +0900 Subject: [PATCH 1/4] Update version number to 4.3.6 (530) --- CHANGELOG.md | 5 +++++ CotEditor.xcodeproj/project.pbxproj | 16 ++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec116f595..83b85305f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ Change Log ========================== +4.3.6 (530) +-------------------------- + + + 4.3.5 (529) -------------------------- diff --git a/CotEditor.xcodeproj/project.pbxproj b/CotEditor.xcodeproj/project.pbxproj index 772a70b43..2b7913e49 100644 --- a/CotEditor.xcodeproj/project.pbxproj +++ b/CotEditor.xcodeproj/project.pbxproj @@ -4417,10 +4417,10 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color"; - CURRENT_PROJECT_VERSION = 529; + CURRENT_PROJECT_VERSION = 530; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = CotEditor/Info.plist; - MARKETING_VERSION = 4.3.5; + MARKETING_VERSION = 4.3.6; PRODUCT_BUNDLE_IDENTIFIER = "com.coteditor.$(PRODUCT_NAME)"; PRODUCT_NAME = CotEditor; }; @@ -4432,10 +4432,10 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color"; - CURRENT_PROJECT_VERSION = 529; + CURRENT_PROJECT_VERSION = 530; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = CotEditor/Info.plist; - MARKETING_VERSION = 4.3.5; + MARKETING_VERSION = 4.3.6; PRODUCT_BUNDLE_IDENTIFIER = "com.coteditor.$(PRODUCT_NAME)"; PRODUCT_NAME = CotEditor; }; @@ -4471,10 +4471,10 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color"; - CURRENT_PROJECT_VERSION = 529; + CURRENT_PROJECT_VERSION = 530; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = CotEditor/Info.plist; - MARKETING_VERSION = 4.3.5; + MARKETING_VERSION = 4.3.6; OTHER_SWIFT_FLAGS = "$(inherited) -D SPARKLE"; PRODUCT_BUNDLE_IDENTIFIER = com.coteditor.CotEditor; PRODUCT_NAME = CotEditor; @@ -4487,10 +4487,10 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color"; - CURRENT_PROJECT_VERSION = 529; + CURRENT_PROJECT_VERSION = 530; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = CotEditor/Info.plist; - MARKETING_VERSION = 4.3.5; + MARKETING_VERSION = 4.3.6; OTHER_SWIFT_FLAGS = "$(inherited) -D SPARKLE"; PRODUCT_BUNDLE_IDENTIFIER = com.coteditor.CotEditor; PRODUCT_NAME = CotEditor; From 77ac2bc915c52ff1c17af014aca4f7dbbaa5bed6 Mon Sep 17 00:00:00 2001 From: 1024jp <1024jp@wolfrosch.com> Date: Sat, 1 Oct 2022 16:55:52 +0900 Subject: [PATCH 2/4] Fix saving option --- CHANGELOG.md | 4 ++++ CotEditor/Sources/Document.swift | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 83b85305f..d90c62bab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ 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. + 4.3.5 (529) diff --git a/CotEditor/Sources/Document.swift b/CotEditor/Sources/Document.swift index db0ce0b21..4e486e53b 100644 --- a/CotEditor/Sources/Document.swift +++ b/CotEditor/Sources/Document.swift @@ -493,7 +493,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 } From ec4b2f5fbf86fafa87a7537a9f0b1b02dccf7713 Mon Sep 17 00:00:00 2001 From: DAnn2012 Date: Thu, 29 Sep 2022 09:05:31 +0200 Subject: [PATCH 3/4] Update PHP.yml --- CotEditor/Syntaxes/PHP.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CotEditor/Syntaxes/PHP.yml b/CotEditor/Syntaxes/PHP.yml index 359424ba1..28e9bbb42 100644 --- a/CotEditor/Syntaxes/PHP.yml +++ b/CotEditor/Syntaxes/PHP.yml @@ -1910,7 +1910,7 @@ completions: - keyString: "mysql_fetch_assoc(int result)" - keyString: "mysql_fetch_field(int result, int [field_offset])" - keyString: "mysql_fetch_lengths(int result)" -- keyString: "mysql_fetch_object(int result, int [result_typ])" +- keyString: "mysql_fetch_object(int result, int [result_type])" - keyString: "mysql_fetch_row(int result)" - keyString: "mysql_field_flags(int result, int field_offset)" - keyString: "mysql_field_len(int result, int field_offset)" From 21cb43fe5b1736682d6f9e415988a85360e9698a Mon Sep 17 00:00:00 2001 From: 1024jp <1024jp@wolfrosch.com> Date: Sat, 1 Oct 2022 16:56:33 +0900 Subject: [PATCH 4/4] Update release notes --- CHANGELOG.md | 1 + .../Resources/en.lproj/pgs/releasenotes.html | 18 ++++++++++++++++++ .../Resources/ja.lproj/pgs/releasenotes.html | 18 ++++++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d90c62bab..6370d3964 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ Change Log ### 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!). diff --git a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/releasenotes.html b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/releasenotes.html index 1e96a72fa..9e1cabff0 100644 --- a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/releasenotes.html +++ b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/releasenotes.html @@ -14,6 +14,24 @@

Release notes for CotEditor

+
+
+

CotEditor 4.3.6

+

release:

+
+ + +
+

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!).
    • +
+
+
+ +

CotEditor 4.3.5

diff --git a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/releasenotes.html b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/releasenotes.html index 35bb1eafa..87363d302 100644 --- a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/releasenotes.html +++ b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/releasenotes.html @@ -14,6 +14,24 @@

CotEditorのリリースノート

+
+
+

CotEditor 4.3.6

+

リリース:

+
+ + +
+

修正

+ +
    +
  • 保存ダイアログの「実行権を付与」オプションの変更がファイルに反映されないことがあったCotEditor 4.3.5の不具合を修正
    • +
  • PHPシンタックススタイルのキーワードのタイポを修正（DAnn2012さんに感謝！）
    • +
+
+
+ +

CotEditor 4.3.5