diff options
| author | Pierre-Marie Pédrot | 2020-04-25 13:09:33 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2020-04-25 13:09:33 +0200 |
| commit | 9775edcfcf2d5c6cda9a2567185df827eef5712e (patch) | |
| tree | 00893c39766596994cd67b2cd40ac3b9a3b8a8f7 | |
| parent | 8c47247779b6db4c529510a7ce771162f54f5fbf (diff) | |
| parent | 6f4a528dace978b1ad4ab9306b04fa110c5a2ac3 (diff) | |
Merge PR #12173: CoqIDE: Revert overzealous application of language-based highlighting from #12169
Reviewed-by: ppedrot
| -rw-r--r-- | doc/changelog/09-coqide/12106-master+coqide-style-apply-all-windows.rst | 2 | ||||
| -rw-r--r-- | ide/coqide.ml | 5 | ||||
| -rw-r--r-- | ide/wg_MessageView.ml | 1 | ||||
| -rw-r--r-- | ide/wg_ProofView.ml | 1 |
4 files changed, 2 insertions, 7 deletions
diff --git a/doc/changelog/09-coqide/12106-master+coqide-style-apply-all-windows.rst b/doc/changelog/09-coqide/12106-master+coqide-style-apply-all-windows.rst index a17e9956b9..6b1148a9a8 100644 --- a/doc/changelog/09-coqide/12106-master+coqide-style-apply-all-windows.rst +++ b/doc/changelog/09-coqide/12106-master+coqide-style-apply-all-windows.rst @@ -1,5 +1,5 @@ - **Fixed:** - Highlighting style and language settings consistently apply to all three buffers of CoqIDE + Highlighting style consistently applied to all three buffers of CoqIDE (`#12106 <https://github.com/coq/coq/pull/12106>`_, by Hugo Herbelin; fixes `#11506 <https://github.com/coq/coq/pull/11506>`_). diff --git a/ide/coqide.ml b/ide/coqide.ml index 54ef8c7a8a..ab2a17798e 100644 --- a/ide/coqide.ml +++ b/ide/coqide.ml @@ -1301,10 +1301,7 @@ let build_ui () = in let refresh_language lang = let lang = lang_manager#language lang in - let iter_session v = - v.script#source_buffer#set_language lang; - v.proof#source_buffer#set_language lang; - v.messages#default_route#source_buffer#set_language lang in + let iter_session v = v.script#source_buffer#set_language lang in List.iter iter_session notebook#pages in let refresh_toolbar b = diff --git a/ide/wg_MessageView.ml b/ide/wg_MessageView.ml index 9d97b01a7a..6e22172d05 100644 --- a/ide/wg_MessageView.ml +++ b/ide/wg_MessageView.ml @@ -46,7 +46,6 @@ let message_view () : message_view = let buffer = GSourceView3.source_buffer ~highlight_matching_brackets:true ~tag_table:Tags.Message.table - ?language:(lang_manager#language source_language#get) ?style_scheme:(style_manager#style_scheme source_style#get) () in let mark = buffer#create_mark ~left_gravity:false buffer#start_iter in diff --git a/ide/wg_ProofView.ml b/ide/wg_ProofView.ml index b8ed3436ce..1de63953af 100644 --- a/ide/wg_ProofView.ml +++ b/ide/wg_ProofView.ml @@ -197,7 +197,6 @@ let proof_view () = let buffer = GSourceView3.source_buffer ~highlight_matching_brackets:true ~tag_table:Tags.Proof.table - ?language:(lang_manager#language source_language#get) ?style_scheme:(style_manager#style_scheme source_style#get) () in let text_buffer = new GText.buffer buffer#as_buffer in |