equal
deleted
inserted
replaced
218 (menu-bar-mode -1) |
218 (menu-bar-mode -1) |
219 (when window-system |
219 (when window-system |
220 (mouse-avoidance-mode 'animate) |
220 (mouse-avoidance-mode 'animate) |
221 (scroll-bar-mode 1) |
221 (scroll-bar-mode 1) |
222 (tool-bar-mode -1) |
222 (tool-bar-mode -1) |
|
223 (setq-default line-spacing nil) |
223 (defun my-popup-menu () |
224 (defun my-popup-menu () |
224 (interactive) |
225 (interactive) |
225 (mouse-popup-menubar |
226 (mouse-popup-menubar |
226 (list (list (/ (display-pixel-width) 2) 10) (get-buffer-window (buffer-name))) |
227 (list (list (/ (display-pixel-width) 2) 10) (get-buffer-window (buffer-name))) |
227 nil) |
228 nil) |
1865 (setq diff-switches "-u") |
1866 (setq diff-switches "-u") |
1866 |
1867 |
1867 (setq ediff-diff-options "") |
1868 (setq ediff-diff-options "") |
1868 (setq ediff-custom-diff-options "-u") |
1869 (setq ediff-custom-diff-options "-u") |
1869 (setq ediff-window-setup-function 'ediff-setup-windows-plain) |
1870 (setq ediff-window-setup-function 'ediff-setup-windows-plain) |
|
1871 (setq ediff-split-window-function 'split-window-vertically) |
1870 |
1872 |
1871 (when window-system |
1873 (when window-system |
1872 (eval-after-load 'diff-mode |
1874 (eval-after-load 'diff-mode |
1873 '(progn |
1875 '(progn |
1874 (set-face-foreground 'diff-added-face "DarkGreen") |
1876 (set-face-foreground 'diff-added-face "DarkGreen") |