Browse Source

Stop using defvar-set for some cases

pull/15/head
10sr 9 years ago
parent
commit
f886f1a039
1 changed files with 11 additions and 11 deletions
  1. +11
    -11
      emacs.el

+ 11
- 11
emacs.el View File

@@ -56,7 +56,7 @@ VALUE when defining SYMBOL."
"Require FEATURE if available. "Require FEATURE if available.


At compile time the feature will be loaded immediately." At compile time the feature will be loaded immediately."
`(eval-and-compile
`(eval-when-compile
(require ,feature nil t))) (require ,feature nil t)))


(defmacro autoload-eval-lazily (feature &optional functions &rest body) (defmacro autoload-eval-lazily (feature &optional functions &rest body)
@@ -424,7 +424,7 @@ IF OK-IF-ALREADY-EXISTS is true force download."
;; if TERM is not screen use default value ;; if TERM is not screen use default value
(if (getenv "TMUX") (if (getenv "TMUX")
;; if use tmux locally just basename of current dir ;; if use tmux locally just basename of current dir
(defvar-set terminal-title-format
(setq terminal-title-format
'((file-name-nondirectory (directory-file-name '((file-name-nondirectory (directory-file-name
default-directory)))) default-directory))))
(if (and (let ((tty-type (frame-parameter nil (if (and (let ((tty-type (frame-parameter nil
@@ -434,11 +434,11 @@ IF OK-IF-ALREADY-EXISTS is true force download."
"-")) "-"))
"screen"))) "screen")))
(not (getenv "SSH_CONNECTION"))) (not (getenv "SSH_CONNECTION")))
(defvar-set terminal-title-format
(setq terminal-title-format
'((file-name-nondirectory (directory-file-name '((file-name-nondirectory (directory-file-name
default-directory)))) default-directory))))
;; seems that TMUX is used locally and ssh to remote host ;; seems that TMUX is used locally and ssh to remote host
(defvar-set terminal-title-format
(setq terminal-title-format
`("em:" `("em:"
,user-login-name ,user-login-name
"@" "@"
@@ -716,9 +716,9 @@ IF OK-IF-ALREADY-EXISTS is true force download."
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; file handling ;; file handling


(when (require 'editorconfig nil t)
(defvar-set editorconfig-get-properties-function
'editorconfig-core-get-properties-hash)
(when (safe-require-or-eval 'editorconfig)
(setq editorconfig-get-properties-function
'editorconfig-core-get-properties-hash)
(editorconfig-mode 1)) (editorconfig-mode 1))


(setq revert-without-query '(".+")) (setq revert-without-query '(".+"))
@@ -850,7 +850,7 @@ IF OK-IF-ALREADY-EXISTS is true force download."
(when (safe-require-or-eval 'scim-bridge) (when (safe-require-or-eval 'scim-bridge)
;; Turn on scim-mode automatically after loading .emacs ;; Turn on scim-mode automatically after loading .emacs
(call-after-init 'scim-mode-on) (call-after-init 'scim-mode-on)
(defvar-set scim-cursor-color "red")
(setq scim-cursor-color "red")
(scim-define-preedit-key ?\^h t) (scim-define-preedit-key ?\^h t)
(scim-define-common-key ?\* nil) (scim-define-common-key ?\* nil)
(scim-define-common-key ?\^/ nil))) (scim-define-common-key ?\^/ nil)))
@@ -863,7 +863,7 @@ IF OK-IF-ALREADY-EXISTS is true force download."
(kbd "<muhenkan>") (lambda () (interactive) (anthy-mode-off))) (kbd "<muhenkan>") (lambda () (interactive) (anthy-mode-off)))
(global-set-key (kbd "<henkan>") (lambda () (interactive) (anthy-mode-on))) (global-set-key (kbd "<henkan>") (lambda () (interactive) (anthy-mode-on)))
(when (>= emacs-major-version 23) (when (>= emacs-major-version 23)
(defvar-set anthy-accept-timeout 1))))
(setq anthy-accept-timeout 1))))


;; quail ;; quail
;; aproposs input-method for some information ;; aproposs input-method for some information
@@ -871,8 +871,8 @@ IF OK-IF-ALREADY-EXISTS is true force download."
(defun my-load-mozc-el () (defun my-load-mozc-el ()
"Use mozc.el as japanese im." "Use mozc.el as japanese im."
(when (safe-require-or-eval 'mozc) (when (safe-require-or-eval 'mozc)
(defvar-set defauit-input-method "japanese-mozc")
(defvar-set mozc-leim-title "[MZ]")
(setq defauit-input-method "japanese-mozc")
(setq mozc-leim-title "[MZ]")
)) ))


;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;


Loading…
Cancel
Save