X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_emacs_el;h=8dda359397e305c70e8d66094c804363970b0c9c;hb=e14c3015f1326a8fb44f6b44bc033b76d3c5b716;hp=167d44372d746e952412defc0aa12343ed0c970b;hpb=a807b4609220d6a60673008b962d2456d4ccebb7;p=sugar.git diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el index 167d443..8dda359 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") @@ -57,7 +93,6 @@ )))))) ;; Settings for Browser -------------------------------------------------------- -(setq browse-url-browser-function 'w3m-browse-url) (global-set-key "\C-xm" 'browse-url-at-point) ;; Setting for the Mode Line --------------------------------------------------- @@ -71,6 +106,9 @@ (cond ((equal host "seras") (set-frame-font "Dejavu Sans Mono 11" t)) + ((equal host "yukari.cielonegro.org") + (set-frame-font "Dejavu Sans Mono 11" t)) + ((equal host "aria.cielonegro.org") (progn (set-frame-font "Dejavu Sans Mono 13" t) @@ -123,6 +161,13 @@ (load-file path) (message "Warning: file %s is absent" path))) +;; 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)) + ;; session (require-if-present 'session) @@ -198,6 +243,12 @@ Will prompt you shell name when you type `C-u' before this command." t) (append '(("\\.rst$" . rst-mode) ("\\.rest$" . rst-mode)) auto-mode-alist)) +;; graphviz-dot-mode +(autoload 'graphviz-dot-mode "graphviz-dot-mode" + "Major mode for the dot language." t) +(add-to-list 'auto-mode-alist '("\\.dot\\'" . graphviz-dot-mode)) +(add-to-list 'auto-mode-alist '("\\.gv\\'" . graphviz-dot-mode)) + ;; textile-mode (autoload 'textile-mode "textile-mode" "Major mode for editing Textile documents." t) @@ -291,6 +342,11 @@ Will prompt you shell name when you type `C-u' before this command." t) (add-to-list 'auto-mode-alist '("\\.js$" . js2-mode)) (add-to-list 'auto-mode-alist '("\\.json$" . javascript-mode)) +;; typescript +(autoload 'typescript-mode "typescript-mode" + "Major mode for editing typescript." t) +(add-to-list 'auto-mode-alist '("\\.ts$" . typescript-mode)) + ;; vimrc (autoload 'vimrc-mode "vimrc-mode" "Major mode for editing `.vimrc', `xxx.vim' and `.exrc' files." t) @@ -516,6 +572,7 @@ Will prompt you shell name when you type `C-u' before this command." t) '(ac-ignore-case nil) '(appt-display-format (quote window)) '(appt-message-warning-time 20) + '(browse-url-browser-function (quote browse-url-firefox)) '(canlock-password "a14fa4d2601465d55585c291fa8b3943e189e716") '(cleite:auto-refresh-interval nil) '(cleite:measure-srpc-call-time t) @@ -544,6 +601,8 @@ Will prompt you shell name when you type `C-u' before this command." t) '(ecb-windows-width 0.2) '(elscreen-display-tab t) '(global-whitespace-mode t) + '(graphviz-dot-auto-indent-on-newline nil) + '(graphviz-dot-auto-indent-on-semi nil) '(haskell-program-name "ghci") '(ido-enable-flex-matching t) '(ido-everywhere t) @@ -552,6 +611,7 @@ Will prompt you shell name when you type `C-u' before this command." t) ("\\`CVS/" "\\`#" "\\`.#" "\\`\\.\\./" "\\`\\./" "\\.ttc"))) '(ido-work-directory-list-ignore-regexps (quote ("^\\(/mnt/ibm/\\|/Volumes/IBM80GB/\\)"))) '(indent-tabs-mode nil) + '(ispell-dictionary "english") '(jabber-nickname "PHO") '(jabber-resource "emacs") '(jabber-server "jabber.jp") @@ -561,7 +621,9 @@ 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 (quote (("Wikipedia" "http://en.wikipedia.org/w/" "username" "password" "Main Page") @@ -661,6 +723,7 @@ Will prompt you shell name when you type `C-u' before this command." t) ("schemas.xml" "~/share/nxml/schemas.xml" "/usr/pkg/share/emacs/site-lisp/nxml-mode/schema/schemas.xml"))) '(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) @@ -687,8 +750,7 @@ 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") - '(x-select-enable-clipboard t)) + '(woman-cache-filename "~/.wmncach.el")) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful.