X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig.org;h=8da7c4118063308f9abfdbde4afbd782c8b8c16d;hb=e73601ca440d09097b9e5b20906a4fe96af2f16e;hp=72c368fbd3f255e87e7991cbcb29f09ad1cfc5e4;hpb=a5dceee45565268053e96ec4e6ebbae10da49e36;p=dotfiles.git diff --git a/emacs.d/config.org b/emacs.d/config.org index 72c368f..8da7c41 100644 --- a/emacs.d/config.org +++ b/emacs.d/config.org @@ -60,6 +60,8 @@ Set system PATH and emacs exec path (when (display-graphic-p) (fringe-mode '(0 . 0))) + ;; (setq-default indicate-empty-lines t) + ;; (setq-default indicate-abuffer-boundaries 'right) #+END_SRC *** Custom file @@ -180,7 +182,7 @@ Check out [[http://tapoueh.org/emacs/el-get.html][el-get]]. (if window-system (defvar sd/fixed-font-family (cond ((x-list-fonts "Hasklig") "Hasklig") - ((x-list-fonts "Source Code Pro") "Source Code Pro:weight") ;; weigth=light + ((x-list-fonts "Source Code Pro") "Source Code Pro:weight=light") ;; weigth=light ((x-list-fonts "Anonymous Pro") "Anonymous Pro") ((x-list-fonts "M+ 1mn") "M+ 1mn")) "The fixed width font based on what is installed, `nil' if not defined.")) @@ -1168,35 +1170,53 @@ extend org-mode's easy templates, refer to [[http://coldnew.github.io/coldnew-em *** variable-pitch-mode and fixed-pitch-mode [[https://yoo2080.wordpress.com/2013/05/30/monospace-font-in-tables-and-source-code-blocks-in-org-mode-proportional-font-in-other-parts/][monospace font in tables and source code blocks in org-mode, proportional font in other parts]] #+BEGIN_SRC emacs-lisp :tangle yes :results silent - (unless (find-font (font-spec :name "Ubuntu Mono")) - (warn "Font not found Ubuntu Mono")) - (unless (find-font (font-spec :name "Source Code Pro")) - (warn "Font not found Source Code Pro")) - (unless (find-font (font-spec :name "Source Sans Pro")) - (warn "Font not found Source Sans Pro")) + (when (display-graphic-p) + (unless (find-font (font-spec :name "Ubuntu Mono")) + (warn "Font not found Ubuntu Mono")) + (unless (find-font (font-spec :name "Source Code Pro")) + (warn "Font not found Source Code Pro")) + (unless (find-font (font-spec :name "Source Sans Pro")) + (warn "Font not found Source Sans Pro"))) (set-face-attribute 'variable-pitch nil :font "Source Sans Pro" :height 160) (set-face-attribute 'fixed-pitch nil :font "Source Code Pro" :height (face-attribute 'default :height)) - ;; (add-hook 'text-mode-hook 'variable-pitch-mode) ;; Install Ubuntu Mono fonts and apply it in org-table to align Chinese fonts - (with-eval-after-load "org" - (mapc (lambda (face) - (set-face-attribute face nil :inherit 'fixed-pitch)) - (list 'org-code 'org-block 'org-block-background 'org-block-begin-line 'org-block-end-line)) - (set-face-attribute 'org-table nil :family "Ubuntu Mono" :height 140) - (set-face-attribute 'org-formula nil :family "Ubuntu Mono" :height 140) - ;; org-special-keyword inherited from font-lock-keywork originally; as org is changed to variable-pitch, it cause - ;; the font in special-keywords are not monospace - (set-face-attribute 'org-special-keyword nil :inherit '(font-lock-keyword-face fixed-pitch)) - ;; same as above - (set-face-attribute 'org-verbatim nil :inherit '(shadow fixed-pitch)) + ;; (with-eval-after-load "org" + ;; (mapc (lambda (face) + ;; (set-face-attribute face nil :inherit 'fixed-pitch)) + ;; (list + ;; 'org-code + ;; 'org-block + ;; 'org-block-background + ;; 'org-block-begin-line + ;; 'org-block-end-line)) + ;; (set-face-attribute 'org-table nil :family "Ubuntu Mono" :height 140) + ;; (set-face-attribute 'org-formula nil :family "Ubuntu Mono" :height 140) + ;; ;; org-special-keyword inherited from font-lock-keywork originally; as org is changed to variable-pitch, it cause + ;; ;; the font in special-keywords are not monospace + ;; (set-face-attribute 'org-special-keyword nil :inherit '(font-lock-keyword-face fixed-pitch)) + ;; ;; same as above + ;; (set-face-attribute 'org-verbatim nil :inherit '(shadow fixed-pitch)) + ;; (set-face-attribute 'org-block-begin-line nil :inherit 'shadow :slant 'italic :foreground nil) + ;; (set-face-attribute 'org-block-end-line nil :inherit 'shadow :slant 'italic :foreground nil) - ;; fix indent broken by variable-pitch-mode - ;; http://emacs.stackexchange.com/questions/26864/variable-pitch-face-breaking-indentation-in-org-mode - (require 'org-indent) - (set-face-attribute 'org-indent nil :inherit '(org-hide fixed-pitch))) + ;; ;; fix indent broken by variable-pitch-mode + ;; ;; http://emacs.stackexchange.com/questions/26864/variable-pitch-face-breaking-indentation-in-org-mode + ;; (require 'org-indent) + ;; (set-face-attribute 'org-indent nil :inherit '(org-hide fixed-pitch))) + + (with-eval-after-load "org" + (let ((default-font-size (if (display-graphic-p) + (- (face-attribute 'default :height) 20) + (face-attribute 'default :height)))) + (set-face-attribute 'org-code nil :height default-font-size) + (set-face-attribute 'org-block nil :height default-font-size) + (set-face-attribute 'org-table nil :family "Ubutu Mono" :height default-font-size) + (set-face-attribute 'org-formula nil :family "Ubutu Mono" :height default-font-size) + (set-face-attribute 'org-block-begin-line nil :background nil :foreground nil :inherit 'shadow :slant 'italic :height default-font-size) + (set-face-attribute 'org-block-end-line nil :background nil :foreground nil :inherit 'shadow :slant 'italic :height default-font-size))) #+END_SRC Also correct the face of =org-meta-line= in =org-table= @@ -2631,12 +2651,12 @@ Emacs lisp auto-insert, based on the default module in =autoinsert.el=, but repl ("\\.markdown\\'" . markdown-mode)) :init (setq markdown-command "multimarkdown")) - (add-hook 'gfm-mode-hook (lambda () - (set-face-attribute 'markdown-inline-code-face nil :inherit 'fixed-pitch) - (set-face-attribute 'markdown-pre-face nil :inherit 'fixed-pitch))) - (with-eval-after-load "gfm-mode" - (set-face-attribute 'markdown-inline-code-face nil :inherit 'fixed-pitch) - (set-face-attribute 'markdown-pre-face nil :inherit 'fixed-pitch)) + ;; (add-hook 'gfm-mode-hook (lambda () + ;; (set-face-attribute 'markdown-inline-code-face nil :inherit 'fixed-pitch) + ;; (set-face-attribute 'markdown-pre-face nil :inherit 'fixed-pitch))) + ;; (with-eval-after-load "gfm-mode" + ;; (set-face-attribute 'markdown-inline-code-face nil :inherit 'fixed-pitch) + ;; (set-face-attribute 'markdown-pre-face nil :inherit 'fixed-pitch)) #+END_SRC #+BEGIN_SRC emacs-lisp :tangle yes :results silent @@ -3649,6 +3669,7 @@ blog with modify list draw one line top of the windows * test +This is a test. #+BEGIN_SRC emacs-lisp :tangle yes :results silent ;; test local mode line ;; (add-to-list 'load-path "~/.emacs.d/elisp")