kotovalexarian-likes-github
/
haml--haml
mirror of https://github.com/haml/haml.git
1
0
Fork 0
Code Releases Activity

Don't clobber normal sexp functions with Haml sexp functions.

This commit is contained in:
Nathan Weizenbaum 2008-11-18 14:39:08 -08:00
parent 71cfd2ae4d
commit 36d69ad88e
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
extra/haml-mode.el
View File

@ -106,11 +106,11 @@ text nested beneath them.")
(let ((map (make-sparse-keymap))) (let ((map (make-sparse-keymap)))
(define-key map [backspace] 'haml-electric-backspace) (define-key map [backspace] 'haml-electric-backspace)
(define-key map "\C-?" 'haml-electric-backspace) (define-key map "\C-?" 'haml-electric-backspace)
(define-key map "\C-\M-f" 'haml-forward-sexp) (define-key map "\C-c\C-f" 'haml-forward-sexp)
(define-key map "\C-\M-b" 'haml-backward-sexp) (define-key map "\C-c\C-b" 'haml-backward-sexp)
(define-key map "\C-\M-u" 'haml-up-list) (define-key map "\C-c\C-u" 'haml-up-list)
(define-key map "\C-\M-d" 'haml-down-list) (define-key map "\C-c\C-d" 'haml-down-list)
(define-key map "\C-C\C-k" 'haml-kill-line-and-indent) (define-key map "\C-c\C-k" 'haml-kill-line-and-indent)
map)) map))
;;;###autoload ;;;###autoload
@ -121,7 +121,6 @@ text nested beneath them.")
(set-syntax-table haml-mode-syntax-table) (set-syntax-table haml-mode-syntax-table)
(set (make-local-variable 'indent-line-function) 'haml-indent-line) (set (make-local-variable 'indent-line-function) 'haml-indent-line)
(set (make-local-variable 'indent-region-function) 'haml-indent-region) (set (make-local-variable 'indent-region-function) 'haml-indent-region)
(set (make-local-variable 'forward-sexp-function) 'haml-forward-sexp)
(setq indent-tabs-mode nil) (setq indent-tabs-mode nil)
(setq font-lock-defaults '((haml-font-lock-keywords) nil t))) (setq font-lock-defaults '((haml-font-lock-keywords) nil t)))
@ -209,7 +208,8 @@ With ARG, do this that many times."
"Marks the next Haml sexp, but puts the mark at the end of the "Marks the next Haml sexp, but puts the mark at the end of the
last line of the sexp rather than the first non-whitespace last line of the sexp rather than the first non-whitespace
character of the next line." character of the next line."
(mark-sexp) (let ((forward-sexp-function 'haml-forward-sexp))
(mark-sexp))
(set-mark (set-mark
(save-excursion (save-excursion
(goto-char (mark)) (goto-char (mark))
@ -310,6 +310,7 @@ the current line."
(bolp) (bolp)
(looking-at "^[ \t]+$")) (looking-at "^[ \t]+$"))
(backward-delete-char arg) (backward-delete-char arg)
(save-excursion
(let ((ci (current-column))) (let ((ci (current-column)))
(beginning-of-line) (beginning-of-line)
(if haml-backspace-backdents-nesting (if haml-backspace-backdents-nesting
@ -317,7 +318,7 @@ the current line."
(set-mark (save-excursion (end-of-line) (point)))) (set-mark (save-excursion (end-of-line) (point))))
(haml-reindent-region-by (* (- arg) haml-indent-offset)) (haml-reindent-region-by (* (- arg) haml-indent-offset))
(back-to-indentation) (back-to-indentation)
(pop-mark)))) (pop-mark)))))
(defun haml-kill-line-and-indent () (defun haml-kill-line-and-indent ()
"Kill the current line, and re-indent all lines nested beneath it." "Kill the current line, and re-indent all lines nested beneath it."