colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/yelp' into yelp

Browse Source 
* origin/yelp:
  Fixed dumb python-mode hijaking ruby thing.
This commit is contained in:
Ivan Malison 2013-03-25 10:29:10 -07:00
commit 59d928e50b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elpa/python-mode-6.0.10/python-mode.el
View File

@ -1127,8 +1127,8 @@ Toggle buffer local status via `M-x highlight-indentation' during session. "
(defvar highlight-indent-offset 4) (defvar highlight-indent-offset 4)
(setq-default highlight-indent-offset 4) (setq-default highlight-indent-offset 4)
(defvar ruby-indent-level nil) (defvar ruby-indent-level 2)
(defvar nxml-child-indent nil) (defvar nxml-child-indent 2)
(defun highlight-indentation-on () (defun highlight-indentation-on ()
"Make sure `highlight-indentation' is on. " "Make sure `highlight-indentation' is on. "