Skip to content

Commit

Permalink
Remove spurious tabs in config files and ensure they don't reappear
Browse files Browse the repository at this point in the history
Closes #465
  • Loading branch information
purcell committed Jul 9, 2017
1 parent 81a65c1 commit 8e6b85c
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 8 deletions.
5 changes: 5 additions & 0 deletions .dir-locals.el
@@ -0,0 +1,5 @@
;;; Directory Local Variables
;;; For more information see (info "(emacs) Directory Variables")

((emacs-lisp-mode
(indent-tabs-mode . nil)))
12 changes: 6 additions & 6 deletions lisp/init-editing-utils.el
Expand Up @@ -260,10 +260,10 @@ on the new line if the line would have been blank.
With arg N, insert N newlines."
(interactive "*p")
(let* ((do-fill-prefix (and fill-prefix (bolp)))
(do-left-margin (and (bolp) (> (current-left-margin) 0)))
(loc (point-marker))
;; Don't expand an abbrev before point.
(abbrev-mode nil))
(do-left-margin (and (bolp) (> (current-left-margin) 0)))
(loc (point-marker))
;; Don't expand an abbrev before point.
(abbrev-mode nil))
(delete-horizontal-space t)
(newline n)
(indent-according-to-mode)
Expand All @@ -272,8 +272,8 @@ With arg N, insert N newlines."
(goto-char loc)
(while (> n 0)
(cond ((bolp)
(if do-left-margin (indent-to (current-left-margin)))
(if do-fill-prefix (insert-and-inherit fill-prefix))))
(if do-left-margin (indent-to (current-left-margin)))
(if do-fill-prefix (insert-and-inherit fill-prefix))))
(forward-line 1)
(setq n (1- n)))
(goto-char loc)
Expand Down
2 changes: 1 addition & 1 deletion lisp/init-python-mode.el
@@ -1,6 +1,6 @@
(setq auto-mode-alist
(append '(("SConstruct\\'" . python-mode)
("SConscript\\'" . python-mode))
("SConscript\\'" . python-mode))
auto-mode-alist))

(require-package 'pip-requirements)
Expand Down
2 changes: 1 addition & 1 deletion lisp/init-sessions.el
Expand Up @@ -20,7 +20,7 @@
(sanityinc/time-subtract-millis (current-time)
start-time)
(when filename
(abbreviate-file-name filename))))))
(abbreviate-file-name filename))))))

;;----------------------------------------------------------------------------
;; Restore histories and registers after saving
Expand Down

0 comments on commit 8e6b85c

Please sign in to comment.