Merge branch 'hotfix/3.5.3'

CHANGELOG.md

@@ -2,6 +2,15 @@
 Change Log
 ==========================
 
+3.5.2 (274)
+--------------------------
+
+### Fixes
+
+- Fix an issue where the “Replace All” command didn't work on CotEditor 3.5.2.
+
+
+
 3.5.2 (273)
 --------------------------
 

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

@@ -21,6 +21,23 @@
 <h1>Release Notes</h1>
 
 
+<article>
+<header>
+	<h1>CotEditor 3.5.3</h1>
+	<p>release: <time>2018-09-08</time></p>
+</header>
+
+
+<section>
+<h2>Fixes</h2>
+
+<ul>
+	<li>Fix an issue where the “Replace All” command didn't work on CotEditor 3.5.2.</li>
+</ul>
+</section>
+</article>
+
+
 <article>
 <header>
 	<h1>CotEditor 3.5.2</h1>

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

@@ -21,6 +21,24 @@
 <h1>リリースノート</h1>
 
 
+<article>
+<header>
+	<h1>CotEditor 3.5.3</h1>
+	<p>リリース: <time>2018-09-08</time></p>
+</header>
+
+
+<section>
+<h2>修正</h2>
+
+<ul>
+	<li>CotEditor 3.5.2で「すべて置換」コマンドが機能していなかった不具合を修正</li>
+</ul>
+</section>
+</article>
+
+
+
 <article>
 <header>
 	<h1>CotEditor 3.5.2</h1>

CotEditor/Info-AppStore.plist

@@ -988,13 +988,13 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.5.2</string>
+	<string>3.5.3</string>
 	<key>CFBundleSignature</key>
 	<string>cEd1</string>
 	<key>CFBundleSpokenName</key>
 	<string>Cot editor</string>
 	<key>CFBundleVersion</key>
-	<string>273</string>
+	<string>274</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>

CotEditor/Info.plist

@@ -988,13 +988,13 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.5.2</string>
+	<string>3.5.3</string>
 	<key>CFBundleSignature</key>
 	<string>cEd1</string>
 	<key>CFBundleSpokenName</key>
 	<string>Cot editor</string>
 	<key>CFBundleVersion</key>
-	<string>273</string>
+	<string>274</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>

CotEditor/Sources/EditorTextView+LineProcessing.swift

@@ -196,6 +196,11 @@ extension EditorTextView {
     /// show pattern sort sheet
     @IBAction func patternSort(_ sender: Any?) {
 
+        guard self.isEditable else {
+            NSSound.beep()
+            return
+        }
+
         let viewController = NSStoryboard(name: NSStoryboard.Name("PatternSortView"), bundle: nil).instantiateInitialController() as! PatternSortViewController
         viewController.representedObject = self
 

CotEditor/Sources/EditorTextView.swift

@@ -194,22 +194,6 @@ final class EditorTextView: NSTextView, Themable {
     }
 
 
-    /// control editability of receiver
-    override var isEditable: Bool {
-
-        get {
-            // avoid editing while sheet is displayed
-            guard self.window?.attachedSheet == nil else { return false }
-
-            return super.isEditable
-        }
-
-        set {
-            super.isEditable = newValue
-        }
-    }
-
-
     /// append inset only to the bottom for overscroll
     override var textContainerOrigin: NSPoint {
 

CotEditor/Sources/MultipleReplacement+TextView.swift

@@ -30,10 +30,7 @@ extension MultipleReplacement {
     /// highlight all matches in the textView
     func highlight(inSelection: Bool, completionHandler: @escaping (_ resultMessage: String) -> Void) {
 
-        guard
-            let textView = TextFinder.shared.client,
-            textView.window?.attachedSheet == nil
-            else {
+        guard let textView = TextFinder.shared.client else {
                 NSSound.beep()
                 return
             }

CotEditor/Sources/PatternSortViewController.swift

@@ -117,7 +117,7 @@ final class PatternSortViewController: NSViewController, SortPatternViewControll
 
     // MARK: Private Methods
 
-    // SortPattern currently edited
+    /// SortPattern currently edited
     private var sortPattern: SortPattern? {
 
         return self.tabViewController?.tabViewItems[self.tabViewController!.selectedTabViewItemIndex]

CotEditor/Sources/TextFinder.swift

@@ -398,7 +398,7 @@ final class TextFinder: NSResponder {
 
         guard
             let textView = self.client,
-            (!forEditing || textView.isEditable)
+            (!forEditing || (textView.isEditable && textView.window?.attachedSheet == nil))
             else {
                 NSSound.beep()
                 return nil