ryuslash/legacy-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Moved column-marker settings back to emacs.el

Browse source
This commit is contained in:
Tom Willemsen 2011-07-26 01:09:59 +02:00
parent 3de2fae246
commit 9873823e76
2 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
emacs.d/functions.el
View file

@ -88,11 +88,6 @@ Currently adds | & ! . + = - / % * , < > ? : ->"
"Find out which major-mode is currently used" "Find out which major-mode is currently used"
(with-current-buffer buffer-or-string major-mode)) (with-current-buffer buffer-or-string major-mode))
(defun set-column-marker ()
"Default column markers"
(column-marker-1 73)
(column-marker-2 81))
(defun setup-system-frame-colours (&rest frame) (defun setup-system-frame-colours (&rest frame)
(let ((f (if (car frame) (let ((f (if (car frame)
(car frame) (car frame)
@ -172,7 +167,6 @@ Currently adds | & ! . + = - / % * , < > ? : ->"
0 font-lock-constant-face) 0 font-lock-constant-face)
("\\b\\(\\.[0-9]+\\([eE][-+]?[0-9]+\\)?\\([lL]\\|[fF]\\|[dD]\\)?\\)\\b" ("\\b\\(\\.[0-9]+\\([eE][-+]?[0-9]+\\)?\\([lL]\\|[fF]\\|[dD]\\)?\\)\\b"
0 font-lock-constant-face))) 0 font-lock-constant-face)))
(set-column-marker)
(rainbow-delimiters-mode) (rainbow-delimiters-mode)
(pretty-lambdas) (pretty-lambdas)
(auto-fill-mode 1)) (auto-fill-mode 1))
@ -185,8 +179,7 @@ Currently adds | & ! . + = - / % * , < > ? : ->"
(defun on-html-mode () (defun on-html-mode ()
(local-set-key [f9] 'browse-to-current-file) (local-set-key [f9] 'browse-to-current-file)
(auto-fill-mode) (auto-fill-mode))
(set-column-marker))
(defun on-markdown-mode () (defun on-markdown-mode ()
(whitespace-mode) (whitespace-mode)
@ -197,8 +190,6 @@ Currently adds | & ! . + = - / % * , < > ? : ->"
(auto-fill-mode 1)) (auto-fill-mode 1))
(defun on-php-mode () (defun on-php-mode ()
(column-marker-1 76)
(column-marker-2 81)
(local-set-key [f6] 'comment-line)) (local-set-key [f6] 'comment-line))
(defun on-mail-mode () (defun on-mail-mode ()

28
emacs.el
View file

@ -1,8 +1,27 @@
;; -*- mode: Emacs-Lisp; -*- ;; -*- mode: Emacs-Lisp; -*-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; LOAD-PATHS ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(add-to-list 'load-path "~/.emacs.d/elisp") (add-to-list 'load-path "~/.emacs.d/elisp")
;; Autopair
(require 'autopair)
(autopair-global-mode t) ; automatically add the other delimiter
(setq autopair-skip-criteria 'always)
;; Column marker
(defun set-column-markers (cm1 cm2)
(column-marker-1 cm1)
(column-marker-2 cm2))
(require 'column-marker)
(dolist (hook '(prog-mode-hook html-mode-hook))
(add-hook hook
(lambda ()
(set-column-markers 73 81))))
(add-hook 'php-mode-hook
(lambda ()
(set-column-markers 76 81)))
(add-to-list 'load-path "~/.emacs.d/elisp/markdown-mode") (add-to-list 'load-path "~/.emacs.d/elisp/markdown-mode")
(add-to-list 'load-path "~/.emacs.d/elisp/git-commit-mode") (add-to-list 'load-path "~/.emacs.d/elisp/git-commit-mode")
(add-to-list 'load-path "~/.emacs.d/elisp/lua-mode") (add-to-list 'load-path "~/.emacs.d/elisp/lua-mode")
@ -11,8 +30,6 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; REQUIRES ;; ;; REQUIRES ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(require 'autopair)
(require 'column-marker)
(require 'org-crypt) (require 'org-crypt)
(require 'rainbow-delimiters) (require 'rainbow-delimiters)
(require 'uniquify) (require 'uniquify)
@ -133,7 +150,6 @@
(delete-selection-mode t) ; delete selection upon typing (delete-selection-mode t) ; delete selection upon typing
(show-paren-mode t) ; show the opposite paren (show-paren-mode t) ; show the opposite paren
(ido-mode t) (ido-mode t)
(autopair-global-mode) ; automatically add the other delimiter
(add-to-list 'compilation-finish-functions 'my-comp-finish-function) (add-to-list 'compilation-finish-functions 'my-comp-finish-function)