patches: fix remaining line-length violations and doc string corruption
- Correct three pre-existing DEFVAR_BOOL doc strings (ns-use-native- fullscreen, ns-use-mwheel-acceleration, ns-use-mwheel-momentum) that were accidentally modified by an earlier rebase; restore original text - Break @property line in nsterm.h to 79 chars - Replace em-dash with --- and break 80-char comment line in patch 0004
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 63788743619d25f4f41cb90b2eea5b48e0fcbc15 Mon Sep 17 00:00:00 2001
|
||||
From 18e509b9307d232559549da448be008bed11d03c Mon Sep 17 00:00:00 2001
|
||||
From: Martin Sukany <martin@sukany.cz>
|
||||
Date: Sat, 28 Feb 2026 12:58:11 +0100
|
||||
Subject: [PATCH 1/8] ns: add accessibility base classes and text extraction
|
||||
@@ -28,15 +28,15 @@ rect via glyph matrix.
|
||||
ns-accessibility-enabled with corrected doc: initial value is nil,
|
||||
set non-nil automatically when an AT is detected at startup.
|
||||
---
|
||||
src/nsterm.h | 130 +++++++++++++++
|
||||
src/nsterm.m | 462 ++++++++++++++++++++++++++++++++++++++++++++++++++-
|
||||
2 files changed, 589 insertions(+), 3 deletions(-)
|
||||
src/nsterm.h | 131 +++++++++++++++
|
||||
src/nsterm.m | 456 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 587 insertions(+)
|
||||
|
||||
diff --git a/src/nsterm.h b/src/nsterm.h
|
||||
index ea6e7ba..7adbb92 100644
|
||||
index ea6e7ba..5746e9e 100644
|
||||
--- a/src/nsterm.h
|
||||
+++ b/src/nsterm.h
|
||||
@@ -453,6 +453,123 @@ enum ns_return_frame_mode
|
||||
@@ -453,6 +453,124 @@ enum ns_return_frame_mode
|
||||
@end
|
||||
|
||||
|
||||
@@ -144,7 +144,8 @@ index ea6e7ba..7adbb92 100644
|
||||
+@property (nonatomic, assign) EmacsAXSpanType spanType;
|
||||
+@property (nonatomic, copy) NSString *spanLabel;
|
||||
+@property (nonatomic, copy) NSString *spanValue;
|
||||
+@property (nonatomic, unsafe_unretained) EmacsAccessibilityBuffer *parentBuffer;
|
||||
+@property (nonatomic, unsafe_unretained)
|
||||
+ EmacsAccessibilityBuffer *parentBuffer;
|
||||
+
|
||||
+- (NSAccessibilityRole) accessibilityRole;
|
||||
+- (NSString *) accessibilityLabel;
|
||||
@@ -160,7 +161,7 @@ index ea6e7ba..7adbb92 100644
|
||||
/* ==========================================================================
|
||||
|
||||
The main Emacs view
|
||||
@@ -471,6 +588,12 @@ enum ns_return_frame_mode
|
||||
@@ -471,6 +589,12 @@ enum ns_return_frame_mode
|
||||
#ifdef NS_IMPL_COCOA
|
||||
char *old_title;
|
||||
BOOL maximizing_resize;
|
||||
@@ -173,7 +174,7 @@ index ea6e7ba..7adbb92 100644
|
||||
#endif
|
||||
BOOL font_panel_active;
|
||||
NSFont *font_panel_result;
|
||||
@@ -534,6 +657,13 @@ enum ns_return_frame_mode
|
||||
@@ -534,6 +658,13 @@ enum ns_return_frame_mode
|
||||
- (void)windowWillExitFullScreen;
|
||||
- (void)windowDidExitFullScreen;
|
||||
- (void)windowDidBecomeKey;
|
||||
@@ -188,7 +189,7 @@ index ea6e7ba..7adbb92 100644
|
||||
|
||||
|
||||
diff --git a/src/nsterm.m b/src/nsterm.m
|
||||
index fc75910..e9ebac0 100644
|
||||
index fc75910..852e7f9 100644
|
||||
--- a/src/nsterm.m
|
||||
+++ b/src/nsterm.m
|
||||
@@ -46,6 +46,7 @@ Updated by Christian Limpach (chris@nice.ch)
|
||||
@@ -659,16 +660,7 @@ index fc75910..e9ebac0 100644
|
||||
Fput (Qalt, Qmodifier_value, make_fixnum (alt_modifier));
|
||||
Fput (Qhyper, Qmodifier_value, make_fixnum (hyper_modifier));
|
||||
Fput (Qmeta, Qmodifier_value, make_fixnum (meta_modifier));
|
||||
@@ -11797,7 +12244,7 @@ Convert an X font name (XLFD) to an NS font name.
|
||||
doc: /* Non-nil means to use native fullscreen on Mac OS X 10.7 and later.
|
||||
Nil means use fullscreen the old (< 10.7) way. The old way works better with
|
||||
multiple monitors, but lacks tool bar. This variable is ignored on
|
||||
-Mac OS X < 10.7. Default is t. */);
|
||||
+Mac OS X < 10.7. Default is nil. Set to t to enable VoiceOver support. */);
|
||||
ns_use_native_fullscreen = YES;
|
||||
ns_last_use_native_fullscreen = ns_use_native_fullscreen;
|
||||
|
||||
@@ -11813,10 +12260,19 @@ Nil means use fullscreen the old (< 10.7) way. The old way works better with
|
||||
@@ -11813,6 +12260,15 @@ Nil means use fullscreen the old (< 10.7) way. The old way works better with
|
||||
This variable is ignored on Mac OS X < 10.7 and GNUstep. */);
|
||||
ns_use_srgb_colorspace = YES;
|
||||
|
||||
@@ -684,20 +676,6 @@ index fc75910..e9ebac0 100644
|
||||
DEFVAR_BOOL ("ns-use-mwheel-acceleration",
|
||||
ns_use_mwheel_acceleration,
|
||||
doc: /* Non-nil means use macOS's standard mouse wheel acceleration.
|
||||
-This variable is ignored on macOS < 10.7 and GNUstep. Default is t. */);
|
||||
+This variable is ignored on macOS < 10.7 and GNUstep. Default is nil. Set to t to enable VoiceOver support. */);
|
||||
ns_use_mwheel_acceleration = YES;
|
||||
|
||||
DEFVAR_LISP ("ns-mwheel-line-height", ns_mwheel_line_height,
|
||||
@@ -11827,7 +12283,7 @@ Nil means use fullscreen the old (< 10.7) way. The old way works better with
|
||||
|
||||
DEFVAR_BOOL ("ns-use-mwheel-momentum", ns_use_mwheel_momentum,
|
||||
doc: /* Non-nil means mouse wheel scrolling uses momentum.
|
||||
-This variable is ignored on macOS < 10.7 and GNUstep. Default is t. */);
|
||||
+This variable is ignored on macOS < 10.7 and GNUstep. Default is nil. Set to t to enable VoiceOver support. */);
|
||||
ns_use_mwheel_momentum = YES;
|
||||
|
||||
/* TODO: Move to common code. */
|
||||
--
|
||||
2.43.0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user