Merge remote-tracking branch 'upstream/master' into add-prelude-python-docs

This commit is contained in:
Gabriel J. Pérez Irizarry 2013-10-10 09:50:31 -04:00
commit 5f9abf6eb4

View file

@ -59,8 +59,6 @@
'(progn '(progn
(defun prelude-ruby-mode-defaults () (defun prelude-ruby-mode-defaults ()
(inf-ruby-minor-mode +1) (inf-ruby-minor-mode +1)
;; turn off the annoying input echo in irb
(setq comint-process-echoes t)
(ruby-tools-mode +1) (ruby-tools-mode +1)
;; CamelCase aware editing operations ;; CamelCase aware editing operations
(subword-mode +1)) (subword-mode +1))