Commit bed08283 authored by Juri Linkov's avatar Juri Linkov

Remove diff faces. Prevent errors from reposition-window.

parent 3c7accdc
......@@ -19,7 +19,7 @@
;; )
;; )
(load (setq custom-file "emacs.custom.el"))
(load (setq custom-file (or custom-file "emacs.custom.el")))
(load "emacs");;loaded twice because of custom-file by startup.el
......
......@@ -84,7 +84,7 @@
'(display-time-default-load-average nil)
'(doc-view-continuous t)
'(doc-view-resolution 200)
'(edebug-print-length 200)
'(edebug-print-length 1024)
'(edebug-save-windows nil)
'(ediff-split-window-function 'split-window-horizontally)
'(ediff-window-setup-function 'ediff-setup-windows-plain)
......@@ -271,12 +271,6 @@
'(cvs-marked ((t (:foreground "DarkRed"))))
'(cvs-need-action ((((class color) (background light)) (:foreground "darkgreen"))))
'(diary ((((class color)) (:foreground "blue"))))
'(diff-context ((t nil)))
'(diff-file-header ((((class color) (background light)) (:background "grey70" :underline t :weight normal)) (((class color) (background dark)) (:background "grey45"))))
'(diff-header ((((class color) (background light)) (:background "grey85")) (((class color) (background dark)) (:background "grey35"))))
'(diff-indicator-added ((t (:inherit diff-added :foreground "#22aa22"))))
'(diff-indicator-changed ((t (:inherit diff-changed :foreground "#aaaa22"))))
'(diff-indicator-removed ((t (:inherit diff-removed :foreground "#aa2222"))))
'(dired-directory ((t (:inherit link :underline nil))))
'(eshell-prompt ((t (:foreground "DarkRed" :underline t :weight normal))))
'(font-lock-builtin-face ((((class color) (background light)) (:foreground "Sienna")) (((class color) (background dark)) (:foreground "Sienna"))))
......
;;; .emacs --- Emacs init file
;; Copyright (C) 1989-2018 Juri Linkov <juri@linkov.net>
;; Copyright (C) 1989-2019 Juri Linkov <juri@linkov.net>
;; Author: Juri Linkov <juri@linkov.net>
;; Keywords: dotemacs, init
;; URL: <http://www.linkov.net/emacs>
;; Version: 2019-01-10 for GNU Emacs 27.0.50 (x86_64-pc-linux-gnu)
;; Version: 2019-01-27 for GNU Emacs 27.0.50 (x86_64-pc-linux-gnu)
;; This file is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
......@@ -879,7 +879,6 @@ With C-u, C-0 or M-0, cancel the timer."
(interactive)
(recenter (round (* recenter-position (window-height)))))
(remove-hook 'xref-after-jump-hook 'recenter)
(add-hook 'xref-after-jump-hook 'reposition-window)
(add-hook 'xref-after-return-hook 'reposition-window)
(add-hook 'find-function-after-hook 'reposition-window)
......@@ -995,7 +994,10 @@ With C-u, C-0 or M-0, cancel the timer."
(if (or (eq major-mode 'fundamental-mode)
(> (buffer-size) 1000000))
(recenter-top)
(reposition-window)))
(condition-case nil
;; Prevent errors from reposition-window
(reposition-window)
(error nil))))
`(lambda (cmd)
(when isearch-success
(set-window-start nil ,(window-start))))))
......@@ -1259,7 +1261,7 @@ Ignore diff-mode hunk indicators such as `+' or `-' at bol.")
(replace-regexp-in-string
"[[:space:]]+" "[[:space:]]+"
(replace-regexp-in-string
"^\\(\\\\+\\|-\\)" "\\(^\\)[+-]"
"^\\(\\\\\\+\\|-\\)" "\\(^\\)[+-]"
(regexp-quote string) nil t)))
(add-hook 'diff-mode-hook
......
......@@ -629,6 +629,9 @@ delete flagged files.\n\n"))))))
;;; vc-mergebase
(require 'vc)
(require 'vc-git)
(defun vc-diff-mergebase (_files rev1 rev2)
"Report diffs between the merge base of REV1 and REV2 revisions.
The merge base is a common ancestor between REV1 and REV2 revisions."
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment