Auto commit by The Sugar System.

[sugar.git] / dot-files / _emacs_el

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index 51180d719596504afe2e12743366806868b9e82d..80357297a3a7d2cf16c6c69dc28c55a41c103129 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -57,7 +57,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,12 +70,18 @@
     (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)
-             (set-fontset-font nil 'japanese-jisx0208 "さざなみゴシック")
-             (set-fontset-font nil 'japanese-jisx0212 "さざなみゴシック")
-             (set-fontset-font nil 'katakana-jisx0201 "さざなみゴシック"))))))
+             ;; Emacs 24.4.1 somehow gets very slow when the following
+             ;; lines are uncommented.
+             ;;(set-fontset-font nil 'japanese-jisx0208 "さざなみゴシック")
+             ;;(set-fontset-font nil 'japanese-jisx0212 "さざなみゴシック")
+             ;;(set-fontset-font nil 'katakana-jisx0201 "さざなみゴシック")
+             )))))
 
 ;; Hooks for newline-and-indent ------------------------------------------------
 ;(mapcar (lambda (hook)
@@ -170,8 +175,14 @@ Will prompt you shell name when you type `C-u' before this command." t)
     (paren-activate))
 
 ;; elscreen
-(load "elscreen" "ElScreen" t)
-(elscreen-start)
+(condition-case e
+    (load "elscreen" "ElScreen" t)
+  (file-error
+   (if (equal (cadr e) "Cannot open load file")
+       (message "Warning: feature %s is absent" feature) ; warn and ignore
+     (apply 'signal (car e) (cdr e))))) ; rethrow
+(if (featurep 'elscreen)
+    (elscreen-start))
 (require-if-present 'elscreen-w3m)
 
 ;; undo-tree
@@ -282,6 +293,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)
@@ -414,11 +430,20 @@ Will prompt you shell name when you type `C-u' before this command." t)
 (setq tsv-separator-list '("\t"))
 ;(add-to-list 'auto-mode-alist '("\\.[Tt][Ss][Vv]\\'" . tsv-mode))
 
+;; markdown-mode
+;; http://jblevins.org/projects/markdown-mode/
+(autoload 'markdown-mode "markdown-mode.el" "Major mode for editing Markdown files" t)
+(add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode))
+
 ;; yaml-mode
 (autoload 'yaml-mode "yaml-mode"
   "Major mode for editing YAML files." t)
 (add-to-list 'auto-mode-alist '("\\.ya?ml$"  . yaml-mode))
 
+;; less-css-mode
+(autoload 'less-css-mode "less-css-mode" "Major mode for editing LESS files" t)
+(add-to-list 'auto-mode-alist '("\\.less\\'" . less-css-mode))
+
 ;; Troublesome Tasks
 (if (equal (system-name) "seras")
     (progn
@@ -498,6 +523,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 +570,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
  '(js2-mirror-mode nil)
  '(js2-use-font-lock-faces t)
  '(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")
@@ -643,6 +670,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)
@@ -669,8 +697,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.