summaryrefslogtreecommitdiff
path: root/.config/emacs
diff options
context:
space:
mode:
Diffstat (limited to '.config/emacs')
-rw-r--r--.config/emacs/custom.el4
-rw-r--r--.config/emacs/emacsutils.el13
-rw-r--r--.config/emacs/init.el20
3 files changed, 3 insertions, 34 deletions
diff --git a/.config/emacs/custom.el b/.config/emacs/custom.el
index af2aef8..26eb2ae 100644
--- a/.config/emacs/custom.el
+++ b/.config/emacs/custom.el
@@ -4,7 +4,9 @@
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(custom-enabled-themes (quote (tango-dark)))
- '(custom-safe-themes (quote ("9f443833deb3412a34d2d2c912247349d4bd1b09e0f5eaba11a3ea7872892000" "bb08c73af94ee74453c90422485b29e5643b73b05e8de029a6909af6a3fb3f58" "82d2cac368ccdec2fcc7573f24c3f79654b78bf133096f9b40c20d97ec1d8016" "1b8d67b43ff1723960eb5e0cba512a2c7a2ad544ddb2533a90101fd1852b426e" "628278136f88aa1a151bb2d6c8a86bf2b7631fbea5f0f76cba2a0079cd910f7d" "06f0b439b62164c6f8f84fdda32b62fb50b6d00e8b01c2208e55543a6337433a" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "71b172ea4aad108801421cc5251edb6c792f3adbaecfa1c52e94e3d99634dee7" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" default)))
+ '(custom-safe-themes
+ (quote
+ ("9f443833deb3412a34d2d2c912247349d4bd1b09e0f5eaba11a3ea7872892000" "bb08c73af94ee74453c90422485b29e5643b73b05e8de029a6909af6a3fb3f58" "82d2cac368ccdec2fcc7573f24c3f79654b78bf133096f9b40c20d97ec1d8016" "1b8d67b43ff1723960eb5e0cba512a2c7a2ad544ddb2533a90101fd1852b426e" "628278136f88aa1a151bb2d6c8a86bf2b7631fbea5f0f76cba2a0079cd910f7d" "06f0b439b62164c6f8f84fdda32b62fb50b6d00e8b01c2208e55543a6337433a" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "71b172ea4aad108801421cc5251edb6c792f3adbaecfa1c52e94e3d99634dee7" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" default)))
'(erc-nick "lukeshu")
'(explicit-shell-file-name "/bin/bash")
'(scroll-bar-mode nil)
diff --git a/.config/emacs/emacsutils.el b/.config/emacs/emacsutils.el
deleted file mode 100644
index 966d16e..0000000
--- a/.config/emacs/emacsutils.el
+++ /dev/null
@@ -1,13 +0,0 @@
-(defun mailto-compose-mail (mailto-url)
- (if (and (stringp mailto-url)
- (string-match "\\`mailto:" mailto-url))
- (progn
- (require 'rfc2368)
- (let* ((headers (mapcar (lambda (h) (cons (intern (car h)) (cdr h)))
- (rfc2368-parse-mailto-url mailto-url)))
- (good-headers (remove-if (lambda (h) (member (car h) '(Body))) headers))
- (body (cdr (assoc 'Body headers))))
- (wl-draft good-headers nil nil body)))))
-
-(defun emacs-terminal-emulator (program)
- (ansi-term program)) \ No newline at end of file
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index a36cf37..f766ac5 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -34,7 +34,6 @@
point-entered minibuffer-avoid-prompt
face minibuffer-prompt
))
-(add-to-list 'load-path user-emacs-directory)
(load custom-file 'noerror)
@@ -129,15 +128,6 @@
(let ((indent-tabs-mode nil)) ad-do-it))
(require 'go-mode-load nil t)
-(require 'uniquify)
-(load "emacsutils")
-
-(setq-default truncate-lines t)
-(setq
- inhibit-startup-screen t
- org-log-done 'time
- gamegrid-user-score-file-directory "/var/games/emacs/"
- )
@@ -201,16 +191,6 @@
browse-url-browser-function 'browse-url-generic
)
-;; Make <f11> work like in every other program
-(defun toggle-fullscreen (&optional f)
- (interactive)
- (let ((current-value (frame-parameter nil 'fullscreen)))
- (set-frame-parameter nil 'fullscreen
- (if (equal 'fullboth current-value)
- (if (boundp 'old-fullscreen) old-fullscreen nil)
- (progn (setq old-fullscreen current-value)
- 'fullboth)))))
-(global-set-key [f11] 'toggle-fullscreen)
;; Automatically load smerge mode for merge files
(defun try-smerge-mode ()