Commit `37a20f818f`

37a20f818f27acd77d128e2287d6291b43bc0de9

parent: bbff3cc2a0

Verified · cmc

cmc <hello@cleberg.net> · 2026-10-08 03:34 UTC

Give accurate iOS messages

Only table recalculation says it needs Emacs on the Mac; other requests
iOS doesn't handle say the command isn't available on iPhone and iPad.
A key sequence bound to a command that doesn't apply or isn't supported
runs it anyway, so it reports why, as on the Mac. An org-protocol capture
naming a missing template reports it. Settings shows the agenda start day
in words.

Layout: unified · split

Sources/OrgstarMobile/AgendaScreen.swift +2 −2

	@@ -250,8 +250,8 @@ struct AgendaScreen: View {
250	}	250	}
251	case .failed(let text):	251	case .failed(let text):
252	message = text	252	message = text
253	case .external:	253	case .external(let request):
254	message = "\(command.title) needs Emacs, which runs on the Mac."	254	message = MobileEditor.unavailable(request, title: command.title)
255	case .commit:	255	case .commit:
256	message = nil	256	message = nil
257	}	257	}

Sources/OrgstarMobile/CaptureScreen.swift +1

	@@ -65,6 +65,7 @@ struct CaptureScreen: View {
65	templates = loaded.templates	65	templates = loaded.templates
66	problem = loaded.problems.first	66	problem = loaded.problems.first
67	key = request.template.flatMap { wanted in templates.first { $0.key == wanted }?.key } ?? templates.first?.key	67	key = request.template.flatMap { wanted in templates.first { $0.key == wanted }?.key } ?? templates.first?.key
		68	if let wanted = request.template, !templates.contains(where: { $0.key == wanted }) { problem = "No capture template \"\(wanted)\"" }
68	}	69	}
69	.onChange(of: key, initial: true) { choose() }	70	.onChange(of: key, initial: true) { choose() }
70	}	71	}

Sources/OrgstarMobile/MobileEditor.swift +11 −6

             onTangle?(scope)
         case .external(.agenda(let start, let count)) where onAgenda != nil:
             onAgenda?(start, count)
-        case .external(.emacsTable(_, _, _, let reason, _)):
+        case .external(let request):
-            onMessage?("This table needs Emacs, which runs on the Mac: \(reason).")
+            onMessage?(Self.unavailable(request, title: command.title))
-        case .external:
-            onMessage?("\(command.title) needs Emacs, which runs on the Mac.")
         }
         return step
     }
+    /// Why a request the app doesn't handle did nothing: only table recalculation needs Emacs.
+    static func unavailable(_ request: ExternalRequest, title: String) -> String {
+        if case .emacsTable(_, _, _, let reason, _) = request { return "This table needs Emacs, which runs on the Mac: \(reason)." }
+        return "\(title) isn't available on iPhone and iPad."
+    }
     // MARK: - Commands by name and key
     /// Runs what `keys` (as `C-c C-t`) is bound to in the Emacs keymap, for the caret's context.
             let runnable = candidates.first { binding in
                 (binding.when.map { KeyContext.holds($0, in: context) } ?? true) && applies(binding.command, in: context)
             }
-            guard let binding = runnable else { return keys.count > 1 }
+            // A sequence runs its command even where it doesn't apply, which says why, as on the Mac.
-            if binding.command.hasPrefix("edit."), !["edit.undo", "edit.redo"].contains(binding.command) { return keys.count > 1 }
+            guard let binding = runnable ?? (keys.count > 1 ? candidates.first : nil) else { return false }
+            if keys.count == 1, binding.command.hasPrefix("edit."), !["edit.undo", "edit.redo"].contains(binding.command) { return false }
             run(binding.command)
             return true
         }

Sources/OrgstarMobile/SettingsScreen.swift +9 −1

             Section("In use") {
                 let _ = model.settingsVersion
                 LabeledContent("TODO keywords", value: todoKeywords)
-                LabeledContent("Agenda", value: "\(OrgPreferences.agendaSpan()) days from \(OrgPreferences.agendaStartOffset())d")
+                LabeledContent("Agenda", value: agenda)
                 LabeledContent("Reminders", value: OrgPreferences.reminders() ? "\(OrgPreferences.reminderLead()) min before" : "Off")
                 LabeledContent("Capture templates", value: CaptureTemplates.load().templates.map(\.key).joined(separator: " "))
             }
         }
     }
+    /// The span and start day, worded as the Mac's Settings word the start.
+    private var agenda: String {
+        func days(_ count: Int) -> String { count == 1 ? "1 day" : "\(count) days" }
+        let offset = OrgPreferences.agendaStartOffset()
+        let start = offset == 0 ? "today" : offset < 0 ? "\(days(-offset)) before today" : "\(days(offset)) after today"
+        return "\(days(OrgPreferences.agendaSpan())), starting \(start)"
+    }
     private var todoKeywords: String {
         OrgPreferences.orgSettings().todoSequences.map { ($0.active.map(\.name) + ["|"] + $0.done.map(\.name)).joined(separator: " ") }
             .joined(separator: "; ")

Commit 37a20f818f

Commit `37a20f818f`