{"action":"created","issue":{"url":"https://api.github.com/repos/neovim/neovim/issues/2299","labels_url":"https://api.github.com/repos/neovim/neovim/issues/2299/labels{/name}","comments_url":"https://api.github.com/repos/neovim/neovim/issues/2299/comments","events_url":"https://api.github.com/repos/neovim/neovim/issues/2299/events","html_url":"https://github.com/neovim/neovim/pull/2299","id":65212587,"number":2299,"title":"[RDY] vim-patch:7.4.336","user":{"login":"glts","id":1483271,"avatar_url":"https://avatars.githubusercontent.com/u/1483271?v=3","gravatar_id":"","url":"https://api.github.com/users/glts","html_url":"https://github.com/glts","followers_url":"https://api.github.com/users/glts/followers","following_url":"https://api.github.com/users/glts/following{/other_user}","gists_url":"https://api.github.com/users/glts/gists{/gist_id}","starred_url":"https://api.github.com/users/glts/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/glts/subscriptions","organizations_url":"https://api.github.com/users/glts/orgs","repos_url":"https://api.github.com/users/glts/repos","events_url":"https://api.github.com/users/glts/events{/privacy}","received_events_url":"https://api.github.com/users/glts/received_events","type":"User","site_admin":false},"labels":[],"state":"closed","locked":false,"assignee":null,"milestone":null,"comments":9,"created_at":"2015-03-30T13:29:32Z","updated_at":"2015-04-02T05:45:18Z","closed_at":"2015-04-02T05:22:30Z","pull_request":{"url":"https://api.github.com/repos/neovim/neovim/pulls/2299","html_url":"https://github.com/neovim/neovim/pull/2299","diff_url":"https://github.com/neovim/neovim/pull/2299.diff","patch_url":"https://github.com/neovim/neovim/pull/2299.patch"},"body":"```\r\nProblem:    Setting 'history' to a big value causes out-of-memory errors.\r\nSolution:   Limit the value to 10000. (Hirohito Higashi)\r\n```\r\n\r\nThe first hunk in `option.c` was already ported in 099fdb49a700f851f0165089fc2ca06807591f6a. As for the other hunk, the help docs already state that the maximum for `'history'` is 10000, and that statement becomes true now.\r\n\r\nOriginal patch:\r\n\r\n```diff\r\ndiff --git a/runtime/doc/options.txt b/runtime/doc/options.txt\r\n--- a/runtime/doc/options.txt\r\n+++ b/runtime/doc/options.txt\r\n@@ -3920,12 +3920,13 @@ A jump table for the options with a shor\r\n \tNOTE: This option is reset when 'compatible' is set.\r\n \r\n \t\t\t\t\t\t*'history'* *'hi'*\r\n-'history' 'hi'\t\tnumber\t(Vim default: 20, Vi default: 0)\r\n+'history' 'hi'\t\tnumber\t(Vim default: 50, Vi default: 0)\r\n \t\t\tglobal\r\n \t\t\t{not in Vi}\r\n \tA history of \":\" commands, and a history of previous search patterns\r\n-\tare remembered.  This option decides how many entries may be stored in\r\n+\tis remembered.  This option decides how many entries may be stored in\r\n \teach of these histories (see |cmdline-editing|).\r\n+\tThe maximum value is 10000.\r\n \tNOTE: This option is set to the Vi default value when 'compatible' is\r\n \tset and to the Vim default value when 'compatible' is reset.\r\n \r\ndiff --git a/src/nvim/option.c b/src/nvim/option.c\r\n--- a/src/nvim/option.c\r\n+++ b/src/nvim/option.c\r\n@@ -1392,7 +1392,7 @@ static struct vimoption\r\n \t\t\t    SCRIPTID_INIT},\r\n     {\"history\",\t    \"hi\",   P_NUM|P_VIM,\r\n \t\t\t    (char_u *)&p_hi, PV_NONE,\r\n-\t\t\t    {(char_u *)0L, (char_u *)20L} SCRIPTID_INIT},\r\n+\t\t\t    {(char_u *)0L, (char_u *)50L} SCRIPTID_INIT},\r\n     {\"hkmap\",\t    \"hk\",   P_BOOL|P_VI_DEF|P_VIM,\r\n #ifdef FEAT_RIGHTLEFT\r\n \t\t\t    (char_u *)&p_hkmap, PV_NONE,\r\n@@ -8595,6 +8595,11 @@ set_num_option(opt_idx, varp, value, err\r\n \terrmsg = e_positive;\r\n \tp_hi = 0;\r\n     }\r\n+    else if (p_hi > 10000)\r\n+    {\r\n+\terrmsg = e_invarg;\r\n+\tp_hi = 10000;\r\n+    }\r\n     if (p_re < 0 || p_re > 2)\r\n     {\r\n \terrmsg = e_invarg;\r\ndiff --git a/src/nvim/version.c b/src/nvim/version.c\r\n--- a/src/nvim/version.c\r\n+++ b/src/nvim/version.c\r\n@@ -735,6 +735,8 @@ static char *(features[]) =\r\n static int included_patches[] =\r\n {   /* Add new patch number below this line */\r\n /**/\r\n+    336,\r\n+/**/\r\n     335,\r\n /**/\r\n     334,\r\n```\r\n"},"comment":{"url":"https://api.github.com/repos/neovim/neovim/issues/comments/88747323","html_url":"https://github.com/neovim/neovim/pull/2299#issuecomment-88747323","issue_url":"https://api.github.com/repos/neovim/neovim/issues/2299","id":88747323,"user":{"login":"justinmk","id":1359421,"avatar_url":"https://avatars.githubusercontent.com/u/1359421?v=3","gravatar_id":"","url":"https://api.github.com/users/justinmk","html_url":"https://github.com/justinmk","followers_url":"https://api.github.com/users/justinmk/followers","following_url":"https://api.github.com/users/justinmk/following{/other_user}","gists_url":"https://api.github.com/users/justinmk/gists{/gist_id}","starred_url":"https://api.github.com/users/justinmk/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/justinmk/subscriptions","organizations_url":"https://api.github.com/users/justinmk/orgs","repos_url":"https://api.github.com/users/justinmk/repos","events_url":"https://api.github.com/users/justinmk/events{/privacy}","received_events_url":"https://api.github.com/users/justinmk/received_events","type":"User","site_admin":false},"created_at":"2015-04-02T05:45:18Z","updated_at":"2015-04-02T05:45:18Z","body":"@Pyrohh Yes, here's what I use ATM: https://github.com/justinmk/config/blob/master/.bashrc#L222-L243 It expects all PRs to be available after a fetch, in the `pull/upstream/*` namespace.\r\n\r\nThere is no established process, though awhile ago there was some speech in favor of the workflow I'm using, though I am not sure if anyone cares. But, GitHub PRs really do trash the graph, even if you're not a perfectionist--it makes zero sense for every little patch to be recorded as a merge..."}}