projects
/
dotfiles.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove unused code
[dotfiles.git]
/
emacs.d
/
config.org
diff --git
a/emacs.d/config.org
b/emacs.d/config.org
index
c945565
..
a4a1ace
100644
(file)
--- a/
emacs.d/config.org
+++ b/
emacs.d/config.org
@@
-223,7
+223,7
@@
Fix the font alignment issue when both Chinese and English hybird in org-mode ta
(if (font-exist-p english)
(set-frame-font (format "%s:pixelsize=%d" english (car size-pair)) t))
(if (font-exist-p chinese)
(if (font-exist-p english)
(set-frame-font (format "%s:pixelsize=%d" english (car size-pair)) t))
(if (font-exist-p chinese)
- (dolist (charset '(han) ;; '(kana han symbol cjk-misc bopomofo)
+ (dolist (charset '(han
cjk-misc
) ;; '(kana han symbol cjk-misc bopomofo)
)
(set-fontset-font (frame-parameter nil 'font) charset
(font-spec :family chinese :size (cdr size-pair))))))
)
(set-fontset-font (frame-parameter nil 'font) charset
(font-spec :family chinese :size (cdr size-pair))))))
@@
-252,8
+252,8
@@
Fix the font alignment issue when both Chinese and English hybird in org-mode ta
;; Setup font size based on emacs-font-size-pair
(set-font emacs-english-font emacs-cjk-font '(13 . 16))
;; Setup font size based on emacs-font-size-pair
(set-font emacs-english-font emacs-cjk-font '(13 . 16))
- (global-set-key (kbd "s-=") 'increase-emacs-font-size)
- (global-set-key (kbd "s--") 'decrease-emacs-font-size)
+
;;
(global-set-key (kbd "s-=") 'increase-emacs-font-size)
+
;;
(global-set-key (kbd "s--") 'decrease-emacs-font-size)
#+END_SRC
#+END_SRC
@@
-720,15
+720,7
@@
Always indents header, and hide header leading starts so that no need type =#+ST
(setq org-confirm-babel-evaluate nil)
(setq org-use-speed-commands t)
(setq org-completion-use-ido t)
(setq org-confirm-babel-evaluate nil)
(setq org-use-speed-commands t)
(setq org-completion-use-ido t)
- (setq org-startup-with-inline-images t)
- ;; (setq org-emphasis-regexp-components
- ;; ;; markup 记号前后允许中文
- ;; (list (concat " \t('\"{" "[:nonascii:]")
- ;; (concat "- \t.,:!?;'\")}\\[" "[:nonascii:]")
- ;; " \t\r\n,\"'"
- ;; "."
- ;; 1))
- )
+ (setq org-startup-with-inline-images t))
(org-babel-do-load-languages
'org-babel-load-languages
(org-babel-do-load-languages
'org-babel-load-languages
@@
-2752,8
+2744,8
@@
Use =ESC= to exit minibuffer. Also I map =Super-h= the same as =C-g=
(global-set-key (kbd "s-p") 'persp-prev)
(global-set-key (kbd "s-;") 'persp-switch-last)
(global-set-key (kbd "s-p") 'persp-prev)
(global-set-key (kbd "s-;") 'persp-switch-last)
-
;;
(global-set-key (kbd "s-=") 'text-scale-increase)
-
;;
(global-set-key (kbd "s--") 'text-scale-decrease)
+ (global-set-key (kbd "s-=") 'text-scale-increase)
+ (global-set-key (kbd "s--") 'text-scale-decrease)
;; (global-set-key (kbd "s-u") 'undo-tree-visualize)
;; (global-set-key (kbd "s-u") 'undo-tree-visualize)
@@
-2875,7
+2867,7
@@
Most use =C-o C-o= to switch buffers; =C-o x, v= to split window; =C-o o= to del
;; Windows undo - redo
("u" (progn (winner-undo) (setq this-command 'winner-undo)) "undo")
("r" (progn (winner-redo) (setq this-command 'winner-redo)) "redo")
;; Windows undo - redo
("u" (progn (winner-undo) (setq this-command 'winner-undo)) "undo")
("r" (progn (winner-redo) (setq this-command 'winner-redo)) "redo")
-
+
;; ibuffer, dired, eshell, bookmarks
;; ("C-i" other-window nil :exit t)
("C-b" ido-switch-buffer nil :exit t)
;; ibuffer, dired, eshell, bookmarks
;; ("C-i" other-window nil :exit t)
("C-b" ido-switch-buffer nil :exit t)
@@
-2895,10
+2887,10
@@
Most use =C-o C-o= to switch buffers; =C-o x, v= to split window; =C-o o= to del
;; quit
("q" nil "cancel")
("<ESC>" nil)
;; quit
("q" nil "cancel")
("<ESC>" nil)
- ("C-h"
nil
nil :exit t)
- ("C-j"
nil
nil :exit t)
-
;; ("C-k" nil
:exit t)
- ("C-l"
nil
nil :exit t)
+ ("C-h"
windmove-left
nil :exit t)
+ ("C-j"
windmove-down
nil :exit t)
+
("C-k" windmove-up
:exit t)
+ ("C-l"
windmove-right
nil :exit t)
("C-;" nil nil :exit t)
("n" nil nil :exit t)
("[" nil nil :exit t)
("C-;" nil nil :exit t)
("n" nil nil :exit t)
("[" nil nil :exit t)