Add OCaml support; C++ format update
This commit is contained in:
parent
0afd2858f2
commit
5d2d7bc030
|
@ -19,11 +19,12 @@ AlwaysBreakTemplateDeclarations: 'true'
|
||||||
BreakBeforeBinaryOperators: All
|
BreakBeforeBinaryOperators: All
|
||||||
BreakBeforeBraces: Allman
|
BreakBeforeBraces: Allman
|
||||||
BreakBeforeTernaryOperators: 'true'
|
BreakBeforeTernaryOperators: 'true'
|
||||||
|
BreakConstructorInitializers: BeforeComma
|
||||||
BreakConstructorInitializersBeforeComma: 'true'
|
BreakConstructorInitializersBeforeComma: 'true'
|
||||||
BreakStringLiterals: 'true'
|
BreakStringLiterals: 'true'
|
||||||
ColumnLimit: '80'
|
ColumnLimit: '80'
|
||||||
ConstructorInitializerAllOnOneLineOrOnePerLine: 'true'
|
ConstructorInitializerAllOnOneLineOrOnePerLine: 'true'
|
||||||
ConstructorInitializerIndentWidth: '0'
|
ConstructorInitializerIndentWidth: '2'
|
||||||
ContinuationIndentWidth: '2'
|
ContinuationIndentWidth: '2'
|
||||||
Cpp11BracedListStyle: 'false'
|
Cpp11BracedListStyle: 'false'
|
||||||
DerivePointerAlignment: 'false'
|
DerivePointerAlignment: 'false'
|
||||||
|
@ -48,6 +49,7 @@ SortIncludes: 'false'
|
||||||
SpaceAfterCStyleCast: 'true'
|
SpaceAfterCStyleCast: 'true'
|
||||||
SpaceAfterLogicalNot: 'false'
|
SpaceAfterLogicalNot: 'false'
|
||||||
SpaceBeforeAssignmentOperators: 'true'
|
SpaceBeforeAssignmentOperators: 'true'
|
||||||
|
SpaceBeforeCtorInitializerColon: 'false'
|
||||||
SpaceBeforeParens: ControlStatements
|
SpaceBeforeParens: ControlStatements
|
||||||
SpaceInEmptyParentheses: 'false'
|
SpaceInEmptyParentheses: 'false'
|
||||||
SpacesBeforeTrailingComments: '2'
|
SpacesBeforeTrailingComments: '2'
|
||||||
|
|
|
@ -71,7 +71,7 @@ This function should only modify configuration layer settings."
|
||||||
yaml
|
yaml
|
||||||
shell-scripts
|
shell-scripts
|
||||||
(python :variables
|
(python :variables
|
||||||
python-shell-interpreter "/home/hsv/common/scr/python.sh"
|
python-shell-interpreter "~/common/scr/python.sh"
|
||||||
python-shell-interpreter-args "-m IPython --simple-prompt -i")
|
python-shell-interpreter-args "-m IPython --simple-prompt -i")
|
||||||
(ocaml :variables
|
(ocaml :variables
|
||||||
ocaml-format-on-save t)
|
ocaml-format-on-save t)
|
||||||
|
@ -115,6 +115,8 @@ This function should only modify configuration layer settings."
|
||||||
highlight-doxygen
|
highlight-doxygen
|
||||||
smart-tabs-mode
|
smart-tabs-mode
|
||||||
tablist
|
tablist
|
||||||
|
exec-path-from-shell
|
||||||
|
merlin
|
||||||
)
|
)
|
||||||
|
|
||||||
;; A list of packages that cannot be updated.
|
;; A list of packages that cannot be updated.
|
||||||
|
@ -584,6 +586,7 @@ This function is called at the very end of Spacemacs startup, after layer
|
||||||
configuration.
|
configuration.
|
||||||
Put your configuration code here, except for variables that should be set
|
Put your configuration code here, except for variables that should be set
|
||||||
before packages are loaded."
|
before packages are loaded."
|
||||||
|
(exec-path-from-shell-initialize)
|
||||||
|
|
||||||
;; Key Bindings
|
;; Key Bindings
|
||||||
(global-set-key (kbd "<kp-subtract>") 'centaur-tabs-backward)
|
(global-set-key (kbd "<kp-subtract>") 'centaur-tabs-backward)
|
||||||
|
@ -671,6 +674,13 @@ before packages are loaded."
|
||||||
(set-face-attribute 'highlight-doxygen-comment nil
|
(set-face-attribute 'highlight-doxygen-comment nil
|
||||||
:background nil
|
:background nil
|
||||||
:slant 'italic)
|
:slant 'italic)
|
||||||
|
|
||||||
|
(setq opam-share (substring (shell-command-to-string
|
||||||
|
"opam config var share 2> /dev/null") 0 -1))
|
||||||
|
(add-to-list 'load-path (concat opam-share "/emacs/site-lisp"))
|
||||||
|
(with-eval-after-load 'merlin
|
||||||
|
(setq merlin-command 'opam))
|
||||||
|
(require 'merlin)
|
||||||
)
|
)
|
||||||
|
|
||||||
;; Do not write anything past this comment. This is where Emacs will
|
;; Do not write anything past this comment. This is where Emacs will
|
||||||
|
@ -678,7 +688,7 @@ before packages are loaded."
|
||||||
(defun dotspacemacs/emacs-custom-settings ()
|
(defun dotspacemacs/emacs-custom-settings ()
|
||||||
"Emacs custom settings.
|
"Emacs custom settings.
|
||||||
This is an auto-generated function, do not modify its content directly, use
|
This is an auto-generated function, do not modify its content directly, use
|
||||||
Emacs customize menu instead.
|
Emacs customize menu instead
|
||||||
This function is called at the very end of Spacemacs initialization."
|
This function is called at the very end of Spacemacs initialization."
|
||||||
(custom-set-variables
|
(custom-set-variables
|
||||||
;; custom-set-variables was added by Custom.
|
;; custom-set-variables was added by Custom.
|
||||||
|
|
Loading…
Reference in New Issue