diff --git a/collects/framework/private/frame.ss b/collects/framework/private/frame.ss index 575a211f..7f323059 100644 --- a/collects/framework/private/frame.ss +++ b/collects/framework/private/frame.ss @@ -456,7 +456,7 @@ (rename [super-on-close on-close]) [define remove-first (preferences:add-callback - 'framework:line-offsets + 'framework:col-offsets (lambda (p v) (editor-position-changed-offset/numbers v @@ -467,7 +467,7 @@ 'framework:display-line-numbers (lambda (p v) (editor-position-changed-offset/numbers - (preferences:get 'framework:line-offsets) + (preferences:get 'framework:col-offsets) v) #t))] (override on-close) @@ -480,7 +480,7 @@ [define last-end #f] [define last-params #f] [define editor-position-changed-offset/numbers - (lambda (offset? line-numbers?) + (lambda (offset? line-numbers?) (let* ([edit (get-info-editor)] [make-one (lambda (pos) @@ -489,16 +489,11 @@ [char (- pos line-start)]) (if line-numbers? (format "~a:~a" - (if offset? - (add1 line) - line) + (add1 line) (if offset? (add1 char) char)) - (format "~a" - (if offset? - (+ pos 1) - pos)))))]) + (format "~a" pos))))]) (cond [(not (object? position-canvas)) (void)] @@ -565,7 +560,7 @@ [define editor-position-changed (lambda () (editor-position-changed-offset/numbers - (preferences:get 'framework:line-offsets) + (preferences:get 'framework:col-offsets) (preferences:get 'framework:display-line-numbers)))] [define overwrite-status-changed (lambda () diff --git a/collects/framework/private/main.ss b/collects/framework/private/main.ss index f84939f3..dc4440dc 100644 --- a/collects/framework/private/main.ss +++ b/collects/framework/private/main.ss @@ -55,7 +55,7 @@ (preferences:set-default 'framework:auto-set-wrap? #t boolean?) (preferences:set-default 'framework:display-line-numbers #t boolean?) (preferences:set-default 'framework:show-status-line #t boolean?) - (preferences:set-default 'framework:line-offsets #t boolean?) + (preferences:set-default 'framework:col-offsets #f boolean?) (preferences:set-default 'framework:print-output-mode diff --git a/collects/framework/private/preferences.ss b/collects/framework/private/preferences.ss index 8c488f4b..a5e9e4ed 100644 --- a/collects/framework/private/preferences.ss +++ b/collects/framework/private/preferences.ss @@ -427,7 +427,7 @@ (make-check editor-panel 'framework:delete-forward? (string-constant map-delete-to-backspace) not not) (make-check editor-panel 'framework:show-status-line (string-constant show-status-line) values values) - (make-check editor-panel 'framework:line-offsets (string-constant count-from-one) values values) + (make-check editor-panel 'framework:col-offsets (string-constant count-columns-from-one) values values) (make-check editor-panel 'framework:display-line-numbers (string-constant display-line-numbers)