Explorar el Código

Resolved merge conflics

master
Josh Wolfe hace 2 años
padre
commit
48de5336ef
Se han modificado 2 ficheros con 8 adiciones y 2 borrados
  1. 2
    0
      bin/bin/toggle-layout
  2. 6
    2
      emacs/.emacs.d/README.org

+ 2
- 0
bin/bin/toggle-layout Ver fichero

@@ -5,3 +5,5 @@ if [[ `setxkbmap -query | grep layout` == "layout: us" ]]; then
else
setxkbmap us
fi

~/bin/caps

+ 6
- 2
emacs/.emacs.d/README.org Ver fichero

@@ -1410,9 +1410,13 @@ Project management
:after company
:hook python-mode-hook
:config
(setq elpy-rpc-backend "jedi")
(when (executable-find "ipython")
(elpy-use-ipython))
(elpy-enable))
(setq python-shell-interpreter "ipython"
python-shell-interpreter-args "-i --simple-prompt"))

(elpy-enable)
(delete 'elpy-module-highlight-indentation elpy-modules))
#+END_SRC

** Shell Scripts

Cargando…
Cancelar
Guardar