Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mac: Set $LANG based on the system locale #7704

Merged
merged 1 commit into from
Dec 10, 2017
Merged

mac: Set $LANG based on the system locale #7704

merged 1 commit into from
Dec 10, 2017

Conversation

jamessan
Copy link
Member

@jamessan jamessan commented Dec 8, 2017

Unix's typical locale-related environment variables aren't always set
appropriately on a Mac. Instead of relying on them, query the locale
information using Mac specific APIs and then set $LANG appropriately for
the rest of nvim.

Closes #5873

@jamessan jamessan mentioned this pull request Dec 8, 2017
Closed
justinmk
justinmk reviewed Dec 8, 2017
View reviewed changes
CMakeLists.txt Outdated
@@ -25,6 +25,7 @@ endif()
include(CheckCCompilerFlag)

if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
set(MACOS TRUE)
Copy link
Member

@justinmk justinmk Dec 8, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Up to now we check __APPLE__ in the C source (and APPLE in some CMakeLists.txt files). Is there a reason to prefer CMake's CMAKE_SYSTEM_NAME check? If so, should we migrate the (not many) checks to use the new MACOS symbol?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason to prefer CMake's CMAKE_SYSTEM_NAME check?

Not that I know of. I can switch to __APPLE__.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason to prefer CMake's CMAKE_SYSTEM_NAME check?

CMAKE_SYSTEM_NAME is the system you're building for. If I understand correctly, UNIX/APPLE/WIN32 is for the system cmake is running on, which can vary for things like cross-compiling.

Also, UNIX is true for Apple and Cygwin.

@jamessan jamessan force-pushed the mac-lang-fix branch 3 times, most recently from d95bbee to fc36688 Compare December 9, 2017 20:03
justinmk
justinmk reviewed Dec 9, 2017
View reviewed changes
src/nvim/os/lang.h Outdated
#define NVIM_OS_LANG_H

#include <stdint.h>
#include <stdbool.h>
Copy link
Member

@justinmk justinmk Dec 9, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are these includes in the header file? Removing them may fix the conflict with CoreFoundation's Boolean typedef. If they are needed in src/nvim/os/lang.c then they should only be included there, rather than the header.

@jamessan jamessan force-pushed the mac-lang-fix branch 3 times, most recently from 5d01913 to 7de34b9 Compare December 10, 2017 00:45
mhinz
mhinz reviewed Dec 10, 2017
View reviewed changes
src/nvim/CMakeLists.txt Outdated
@@ -13,6 +13,9 @@ endif()
if(WIN32)
# tell MinGW compiler to enable wmain
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -municode")
elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Foundation")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -framework Foundation")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, my bad. It has to be CoreFoundation, not Foundation. Both exist, but the former is the low-level C API and the latter is a huge ObjC framework.

@jamessan jamessan force-pushed the mac-lang-fix branch 2 times, most recently from f9bd6a7 to 1cffd5e Compare December 10, 2017 05:10
@jamessan
mac: Set $LANG based on the system locale
1f2b358 
Unix's typical locale-related environment variables aren't always set
appropriately on a Mac.  Instead of relying on them, query the locale
information using Mac specific APIs and then set $LANG appropriately for
the rest of nvim.

Closes neovim#5873
@jamessan jamessan merged commit 6f41ce0 into neovim:master Dec 10, 2017
@jamessan jamessan deleted the mac-lang-fix branch December 10, 2017 15:47
justinmk added a commit that referenced this pull request Jun 11, 2018
@justinmk
NVIM v0.3.0
44c6deb 
FEATURES:
3cc7ebf #7234 built-in VimL expression parser
6a7c904 #4419 implement <Cmd> key to invoke command in any mode
b836328 #7679 'startup: treat stdin as text instead of commands'
58b210e :digraphs : highlight with hl-SpecialKey #2690
7a13611 #8276 'startup: Let `-s -` read from stdin'
1e71978 events: VimSuspend, VimResume #8280
1e7d5e8 #6272 'stdpath()'
f96d99a #8247 server: introduce --listen
e8c39f7 #8226 insert-mode: interpret unmapped META as ESC
98e7112 msg: do not scroll entire screen (#8088)
f72630b #8055 let negative 'writedelay' show all redraws
5d2dd2e win: has("wsl") on Windows Subsystem for Linux #7330
a4f6cec cmdline: CmdlineEnter and CmdlineLeave autocommands (#7422)
207b7ca #6844 channels: support buffered output and bytes sockets/stdio

API:
f85cbea #7917 API: buffer updates
418abfc #6743 API: list information about all channels/jobs.
36b2e3f #8375 API: nvim_get_commands
273d2cd #8329 API: Make nvim_set_option() update `:verbose set …`
8d40b36 #8371 API: more reliable/descriptive VimL errors
ebb1acb #8353 API: nvim_call_dict_function
9f994bb #8004 API: nvim_list_uis
3405704 #7520 API/UI: forward option updates to UIs
911b1e4 #7821 API: improve nvim_command_output

WINDOWS OS:
9cefd83 #8084, #8516 build/win: support MSVC
ee4e1fd win: Fix reading content from stdin (#8267)

TUI:
ffb8904 #8309 TUI: add support for mouse release events in urxvt
8d5a46e #8081 TUI: implement "standout" attribute
6071637 TUI: support TERM=konsole-256color
67848c0 #7653 TUI: report TUI info with -V3 ('verbose' >= 3)
3d0ee17 TUI/rxvt: enable focus-reporting
d109f56 #7640 TUI: 'term' option: reflect effective terminal behavior

FIXES:
ed6a113 #8273 'job-control: avoid kill-timer race'
4e02f1a #8107 'jobs: separate process-group'
451c48a terminal: flush vterm output buffer on pty output #8486
5d6732f :checkhealth fixes #8335
53f11dc #8218 'Fix errors reported by PVS'
d05712f inccommand: pause :terminal redraws (#8307)
51af911 inccommand: do not execute trailing commands #8256
84359a4 terminal: resize to the max dimensions (#8249)
d49c1dd #8228 Make vim_fgets() return the same values as in Vim
60e96a4 screen: winhl=Normal:Background should not override syntax (#8093)
0c59ac1 #5908 'shada: Also save numbered marks'
ba87a2c cscope: ignore EINTR while reading the prompt (#8079)
b1412dc #7971 ':terminal Enter/Leave should not increment jumplist'
3a5721e TUI: libtermkey: force CSI driver for mouse input #7948
6ff13d7 #7720 TUI: faster startup
1c6e956 #7862 TUI: fix resize-related segfaults
a58c909 #7676 TUI: always hide cursor when flushing, never flush buffers during unibilium output
303e1df #7624 TUI: disable BCE almost always
249bdb0 #7761 mark: Make sure that jumplist item will not have zero lnum
6f41ce0 #7704 macOS: Set $LANG based on the system locale
a043899 #7633 'Retry fgets on EINTR'

CHANGES:
ad60927 #8304 default to 'nofsync'
f3f1970 #8035 defaults: 'fillchars'
a6052c7 #7984 defaults: sidescroll=1
b69fa86 #7888 defaults: enable cscopeverbose
7c4bb23 defaults: do :filetype stuff unless explicitly "off"
2aa308c #5658 'Apply :lmap in macros'
8ce6393 terminal: Leave 'relativenumber' alone (#8360)
e46534b #4486 refactor: Remove maxmem, maxmemtot options
131aad9 win: defaults: 'shellcmdflag', 'shellxquote' #7343
c57d315 #8031 jobwait(): return -2 on interrupt also with timeout
6452831 clipboard: macOS: fallback to tmux if pbcopy is broken #7940
300d365 #7919 Make 'langnoremap' apply directly after a map
ada1956 #7880 'lua/executor: Remove lightuserdata'

INTERNAL:
de0a954 #7806 internal statistics for list impl
dee78a4 #7708 rewrite internal list impl
battlmonstr added a commit to battlmonstr/neovim that referenced this pull request Aug 1, 2018
@battlmonstr
Fix crash in lang_init() on macOS if lang_region = NULL
e92f1bb 
This is a regression after PR neovim#7704:
mac: Set $LANG based on the system locale

CFStringGetCStringPtr sometimes returns "lang_region" = NULL,
in this case CFStringGetCString is used instead,
which places output to "buf", but "buf" was not used
by the code.
@battlmonstr battlmonstr mentioned this pull request Aug 1, 2018
Merged
@clason clason mentioned this pull request Apr 28, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@justinmk justinmk justinmk approved these changes

@mhinz mhinz mhinz left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jamessan @mhinz @justinmk