equal
  deleted
  inserted
  replaced
  
    
    
    52 (when is-mac  | 
    52 (when is-mac  | 
    53   (setq-default  | 
    53   (setq-default  | 
    54    ring-bell-function 'ignore  | 
    54    ring-bell-function 'ignore  | 
    55    mac-command-modifier 'meta  | 
    55    mac-command-modifier 'meta  | 
    56    ns-pop-up-frames nil  | 
    56    ns-pop-up-frames nil  | 
         | 
    57    dired-use-ls-dired nil                               ; macOS ls doesn't support --dired  | 
    57    ispell-program-name "/usr/local/bin/aspell"))  | 
    58    ispell-program-name "/usr/local/bin/aspell"))  | 
    58   | 
    59   | 
    59   | 
    60   | 
    60 ;;; Xorg  | 
    61 ;;; Xorg  | 
    61 (when window-system  | 
    62 (when window-system  | 
   126             (unless (eq ibuffer-sorting-mode 'project-file-relative)  | 
   127             (unless (eq ibuffer-sorting-mode 'project-file-relative)  | 
   127               (ibuffer-do-sort-by-project-file-relative))))  | 
   128               (ibuffer-do-sort-by-project-file-relative))))  | 
   128 (setq ibuffer-show-empty-filter-groups nil)  | 
   129 (setq ibuffer-show-empty-filter-groups nil)  | 
   129   | 
   130   | 
   130   | 
   131   | 
         | 
   132 ;;; emacs server (for emacsclient)  | 
         | 
   133 (require 'server)  | 
         | 
   134 (unless (server-running-p)  | 
         | 
   135   (server-start))  | 
         | 
   136   | 
   131 ;;; shell  | 
   137 ;;; shell  | 
   132 (global-set-key (kbd "C-c s") 'eshell)  ; start shell  | 
   138 (global-set-key (kbd "C-c s") 'eshell)  ; start shell  | 
   133 (exec-path-from-shell-copy-env "PYTHONPATH")  | 
   139 (exec-path-from-shell-copy-env "PYTHONPATH")  | 
   134 (exec-path-from-shell-initialize)  | 
   140 (exec-path-from-shell-initialize)  | 
   135 (eshell)  | 
   141 (eshell)  | 
   191   | 
   197   | 
   192 ;;; show-paren-mode - needs to be loaded after theme  | 
   198 ;;; show-paren-mode - needs to be loaded after theme  | 
   193 (setq-default  | 
   199 (setq-default  | 
   194  show-paren-style 'expression  | 
   200  show-paren-style 'expression  | 
   195  show-paren-delay 0)  | 
   201  show-paren-delay 0)  | 
   196 (set-face-attribute  | 
         | 
   197  'show-paren-match nil  | 
         | 
   198  :background (face-background 'highlight)  | 
         | 
   199  :foreground (face-foreground 'highlight))  | 
         | 
   200 (show-paren-mode t)  | 
   202 (show-paren-mode t)  | 
   201   | 
   203   | 
   202   | 
   204   | 
   203 ;;; yasnippets  | 
   205 ;;; yasnippets  | 
   204 (with-eval-after-load 'yasnippet  | 
   206 (with-eval-after-load 'yasnippet  |