X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_emacs_el;h=27bd7e5f1850ec3cef3859f1b8d695d210d3cff0;hb=1941de6bf51f21c1e076aad3efd61f82129d6ae0;hp=283eec8b0c0e04d4ed1be08f43bb034f1c169bdc;hpb=18851e942923eb8c9f98691b880a1e712b6b289a;p=sugar.git

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index 283eec8..27bd7e5 100644
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -42,6 +42,42 @@
 ;; windmove
 (windmove-default-keybindings)
 
+;; file renaming
+;; Originally from stevey, adapted to support moving to a new directory.
+(defun rename-file-and-buffer (new-name)
+  "Renames both current buffer and file it's visiting to NEW-NAME."
+  (interactive
+   (progn
+     (if (not (buffer-file-name))
+         (error "Buffer '%s' is not visiting a file!" (buffer-name)))
+     ;; Disable ido auto merge since it too frequently jumps back to the original
+     ;; file name if you pause while typing. Reenable with C-z C-z in the prompt.
+     (let ((ido-auto-merge-work-directories-length -1))
+       (list (read-file-name (format "Rename %s to: " (file-name-nondirectory
+                                                       (buffer-file-name))))))))
+  (if (equal new-name "")
+      (error "Aborted rename"))
+  (setq new-name (if (file-directory-p new-name)
+                     (expand-file-name (file-name-nondirectory
+                                        (buffer-file-name))
+                                       new-name)
+                   (expand-file-name new-name)))
+  ;; Only rename if the file was saved before. Update the
+  ;; buffer name and visited file in all cases.
+  (if (file-exists-p (buffer-file-name))
+      (rename-file (buffer-file-name) new-name 1))
+  (let ((was-modified (buffer-modified-p)))
+    ;; This also renames the buffer, and works with uniquify
+    (set-visited-file-name new-name)
+    (if was-modified
+        (save-buffer)
+      ;; Clear buffer-modified flag caused by set-visited-file-name
+      (set-buffer-modified-p nil)))
+
+  (setq default-directory (file-name-directory new-name))
+
+  (message "Renamed to %s." new-name))
+
 ;; Host specific configuration ------------------------------------------------
 (let ((host (system-name)))
   (cond ((equal host "aria.cielonegro.org")
@@ -83,26 +119,6 @@
              ;;(set-fontset-font nil 'katakana-jisx0201 "さざなみゴシック")
              )))))
 
-;; Hooks for newline-and-indent ------------------------------------------------
-;(mapcar (lambda (hook)
-;     (add-hook hook
-;           (lambda ()
-;             (local-set-key "\C-m" 'newline-and-indent)
-;             (local-set-key "\C-j" 'newline)
-;             )))
-;   '(perl-mode-hook
-;     cperl-mode-hook
-;     java-mode-hook
-;     javascript-mode-hook
-;     c-mode-hook
-;     c++-mode-hook
-;     objc-mode-hook
-;     emacs-lisp-mode-hook
-;     lisp-mode-hook
-;     yatex-mode-hook
-;     css-mode-hook
-;     scheme-mode-hook))
-
 ;; Setting for Packages --------------------------------------------------------
 (defun require-if-present (feature)
   (condition-case e
@@ -125,20 +141,41 @@
       (load-file path)
     (message "Warning: file %s is absent" path)))
 
-;; session
-(require-if-present 'session)
+;; cmake
+(autoload 'cmake-mode "cmake-mode" nil t)
+(add-to-list 'auto-mode-alist '("CMakeLists\\.txt\\'" . cmake-mode))
+(add-to-list 'auto-mode-alist '("\\.cmake\\'" . cmake-mode))
+
+;; ditz
+(require-if-present 'ditz)
 
 ;; flyspell
 (require-if-present 'flyspell)
 
-;; ditz
-(require-if-present 'ditz)
+;; jaspace
+(require-if-present 'jaspace)
+
+;; glsl
+(autoload 'glsl-mode "glsl-mode" nil t)
+(add-to-list 'auto-mode-alist '("\\.glsl\\'" . glsl-mode))
+(add-to-list 'auto-mode-alist '("\\.vert\\'" . glsl-mode))
+(add-to-list 'auto-mode-alist '("\\.frag\\'" . glsl-mode))
+(add-to-list 'auto-mode-alist '("\\.geom\\'" . glsl-mode))
+
+;; rust
+(autoload 'rust-mode "rust-mode" nil t)
+(add-to-list 'auto-mode-alist '("\\.rs\\'" . rust-mode))
+
+;; session
+(require-if-present 'session)
+(if (featurep 'session)
+    (session-initialize))
 
 ;; mediawiki
 (require-if-present 'mediawiki)
 
-;; jaspace
-(require-if-present 'jaspace)
+;; midnight
+(require-if-present 'midnight)
 
 ;; color-theme
 (require-if-present 'color-theme)
@@ -295,8 +332,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
 (autoload 'cleite "cleite" "Cleite RSS Aggregator -- Emacs Interface" t)
 
 ;; javascript
-(autoload 'js2-mode "js2" nil t)
-(add-to-list 'auto-mode-alist '("\\.js$" . js2-mode))
+(add-to-list 'auto-mode-alist '("\\.js$" . javascript-mode))
 (add-to-list 'auto-mode-alist '("\\.json$" . javascript-mode))
 
 ;; typescript
@@ -391,21 +427,23 @@ Will prompt you shell name when you type `C-u' before this command." t)
 (setq erlang-electric-commands nil)
 
 ;; SKK
-(require 'skk-autoloads)
-(require 'skk-study)
-(global-set-key "\C-x\C-j" 'skk-mode)
-(global-set-key "\C-xj" 'skk-auto-fill-mode)
-(global-set-key "\C-xt" 'skk-tutorial)
-(setq skk-use-jisx0201-input-method t)
-(setq skk-rom-kana-rule-list
-      '(("@" nil "@")
-        ("wi" nil ("ヰ" . "ゐ"))
-        ("we" nil ("ヱ" . "ゑ"))
-        ;;("hh" "h" ("ン" . "ん"))
-        ;;("mm" "m" ("ン" . "ん"))
-        ("zx" nil ("ゝ" . "ヽ"))
-        ("zc" nil ("ゞ" . "ヾ"))))
-(set-input-method 'japanese-skk) ; INPUT METHOD
+(require-if-present 'skk-autoloads)
+(if (featurep 'skk-autoloads)
+	(progn
+	  (require-if-present 'skk-study)
+	  (global-set-key "\C-x\C-j" 'skk-mode)
+	  (global-set-key "\C-xj" 'skk-auto-fill-mode)
+	  (global-set-key "\C-xt" 'skk-tutorial)
+	  (setq skk-use-jisx0201-input-method t)
+	  (setq skk-rom-kana-rule-list
+			'(("@" nil "@")
+			  ("wi" nil ("ヰ" . "ゐ"))
+			  ("we" nil ("ヱ" . "ゑ"))
+			  ;;("hh" "h" ("ン" . "ん"))
+			  ;;("mm" "m" ("ン" . "ん"))
+			  ("zx" nil ("ゝ" . "ヽ"))
+			  ("zc" nil ("ゞ" . "ヾ"))))
+	  (set-input-method 'japanese-skk))) ; INPUT METHOD
 
 ;; navi2ch
 (autoload 'navi2ch "navi2ch" "Navigator for 2ch for Emacs" t)
@@ -531,6 +569,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
  '(appt-message-warning-time 20)
  '(browse-url-browser-function (quote browse-url-firefox))
  '(canlock-password "a14fa4d2601465d55585c291fa8b3943e189e716")
+ '(clean-buffer-list-delay-general 7)
  '(cleite:auto-refresh-interval nil)
  '(cleite:measure-srpc-call-time t)
  '(compilation-scroll-output (quote first-error))
@@ -556,6 +595,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
  '(ecb-tip-of-the-day nil)
  '(ecb-tree-buffer-style (quote ascii-guides))
  '(ecb-windows-width 0.2)
+ '(electric-indent-mode nil)
  '(elscreen-display-tab t)
  '(global-whitespace-mode t)
  '(graphviz-dot-auto-indent-on-newline nil)
@@ -578,6 +618,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
  '(js2-indent-on-enter-key nil)
  '(js2-mirror-mode nil)
  '(js2-use-font-lock-faces t)
+ '(lua-indent-level 4)
  '(makefile-mode-hook (quote ((lambda nil (set-variable (quote tab-width) 8)))))
  '(markdown-live-preview-delete-export (quote delete-on-export))
  '(mediawiki-site-alist
@@ -640,6 +681,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
      (30 subj)
      "|"
      (0 body))))
+ '(midnight-mode t)
  '(mouse-wheel-progessive-speed nil)
  '(mouse-wheel-scroll-amount (quote (1 ((shift) . 5) ((control)))))
  '(mpc-browser-tags
@@ -657,6 +699,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
  '(newsticker-url-list-defaults
    (quote
     (("slashdot" "http://slashdot.org/index.rss" nil 3600))))
+ '(ns-command-modifier (quote meta))
  '(nxml-auto-insert-xml-declaration-flag t)
  '(nxml-slash-auto-complete-flag t)
  '(org-replace-disputed-keys t)
@@ -680,11 +723,10 @@ Will prompt you shell name when you type `C-u' before this command." t)
  '(rst-level-face-base-light 50)
  '(safe-local-variable-values (quote ((todo-categories "Todo" "Todo" "Todo" "Todo"))))
  '(select-enable-clipboard t)
- '(session-use-package t nil (session))
  '(tramp-auto-save-directory "/tmp/tramp-auto-save")
- '(tramp-completion-reread-directory-timeout 2)
- '(tramp-default-host "localhost")
- '(tramp-default-method "sshx")
+ '(tramp-completion-reread-directory-timeout 2 nil (tramp))
+ '(tramp-default-host "localhost" nil (tramp))
+ '(tramp-default-method "sshx" nil (tramp))
  '(uniquify-buffer-name-style (quote forward) nil (uniquify))
  '(uniquify-trailing-separator-p t)
  '(vc-cvs-diff-switches (quote ("-u")))
@@ -706,7 +748,8 @@ Will prompt you shell name when you type `C-u' before this command." t)
  '(whitespace-style
    (quote
     (face tabs trailing space-before-tab newline indentation empty space-after-tab)))
- '(woman-cache-filename "~/.wmncach.el"))
+ '(woman-cache-filename "~/.wmncach.el")
+ '(yaml-block-literal-electric-alist (quote ((62 . "-")))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.