Skip to content

Commit

Permalink
Add config for haskell and update config for org
Browse files Browse the repository at this point in the history
- Add missing 'require' in electric-spacing-emacs-init.el file
  • Loading branch information
xwl committed Oct 25, 2021
1 parent 1be8707 commit 859f4ab
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 2 deletions.
4 changes: 2 additions & 2 deletions electric-spacing-emacs-lisp-mode.el
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@
(delete-horizontal-space)
(electric-spacing-insert-1 ":" 'before))

(provide 'electric-spacing-text-mode)
;;; electric-spacing-text-mode.el ends here
(provide 'electric-spacing-emacs-lisp-mode)
;;; electric-spacing-emacs-lisp-mode.el ends here
44 changes: 44 additions & 0 deletions electric-spacing-haskell-mode.el
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
;;; electric-spacing-text-mode.el--- Text mode tunings

;; Copyright (C) 2021 Free Software Foundation, Inc.

;; Author: William Xu <[email protected]>

;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 3, or (at your option)
;; any later version.

;; This program is distributed in the hope that it will be useful, but
;; WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
;; General Public License for more details.

;; You should have received a copy of the GNU General Public License
;; along with EMMS; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
;; Boston, MA 02110-1301, USA.

;;; Code:

(require 'electric-spacing)

;; (defun electric-spacing-haskell-mode-: ()
;; (electric-spacing-insert ":"))

;; (if (eq 32 (char-after (line-beginning-position)))
;; (electric-spacing-insert ":" 'middle)
;; ;; define function signature
;; (electric-spacing-insert ":")))

(defun electric-spacing-haskell-mode-. ()
(if (save-excursion (goto-char (line-beginning-position))
(looking-at "import"))
(electric-spacing-insert "." 'middle)
(electric-spacing-insert ".")))

(defun electric-spacing-haskell-mode-- ()
(electric-spacing-insert "-"))

(provide 'electric-spacing-haskell-mode)
;;; electric-spacing-haskell-mode.el ends here
3 changes: 3 additions & 0 deletions electric-spacing-init.el
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
(require 'electric-spacing-cc-mode)
(require 'electric-spacing-python-mode)
(require 'electric-spacing-rust-mode)
(require 'electric-spacing-org-mode)
(require 'electric-spacing-haskell-mode)
(require 'electric-spacing-emacs-lisp-mode)
(require 'electric-spacing-text-mode)

(provide 'electric-spacing-init)
Expand Down
10 changes: 10 additions & 0 deletions electric-spacing-org-mode.el
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,15 @@
(defun electric-spacing-org-mode-/ ()
(electric-spacing-org-mode-inline-marker "/"))

(defun electric-spacing-org-mode-+ ()
(interactive)
(if (looking-back "#")
(electric-spacing-insert "+" 'middle)
(electric-spacing-insert "+")))

(with-eval-after-load 'org
(define-key org-mode-map (kbd "+") 'electric-spacing-org-mode-+)
)

(provide 'electric-spacing-org-mode)
;;; electric-spacing-org-mode.el ends here

0 comments on commit 859f4ab

Please sign in to comment.