From: Stefan Bund Date: Thu, 17 Jul 2014 15:45:42 +0000 (+0200) Subject: more updates X-Git-Url: http://g0dil.de/git?a=commitdiff_plain;h=d5d08084f09efbe41b0964ddd4a392e320f10cca;p=emacs-init.git more updates --- diff --git a/emacs-custom.el b/emacs-custom.el index f61646e..efd6e27 100644 --- a/emacs-custom.el +++ b/emacs-custom.el @@ -26,13 +26,14 @@ '(develock-max-column-plist (quote (emacs-lisp-mode 99 lisp-interaction-mode w change-log-mode t texinfo-mode t c-mode 99 c++-mode 99 java-mode 99 jde-mode 99 html-mode 99 html-helper-mode 99 cperl-mode 99 perl-mode 99 mail-mode t message-mode t cmail-mail-mode t tcl-mode 99 ruby-mode 99))) '(diff-mode-hook (quote ((lambda nil (diff-auto-refine-mode 1))))) '(diff-switches "-u") + '(edit-server-done-hook nil) '(edit-server-new-frame nil) '(fill-column 98) '(flyspell-delay 30) '(flyspell-delayed-commands nil) '(frame-background-mode (quote light)) '(global-auto-revert-mode nil) - '(global-highlight-changes-mode t) + '(global-highlight-changes-mode nil) '(global-subword-mode t) '(global-visual-line-mode nil) '(global-whitespace-mode t) @@ -50,6 +51,7 @@ '(line-move-visual nil) '(ls-lisp-dirs-first t) '(magit-process-popup-time 1) + '(magit-server-window-for-rebase (quote pop-to-buffer)) '(magit-status-buffer-switch-function (quote switch-to-buffer)) '(nxml-child-indent 4) '(nxml-where-global-mode nil) @@ -81,7 +83,7 @@ ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. - '(default ((t (:inherit nil :stipple nil :background "#ffffff" :foreground "black" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 1 :width normal :foundry "default" :family "default")))) + '(default ((t (:inherit nil :stipple nil :background "#ffffff" :foreground "black" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 97 :width semi-condensed :foundry "misc" :family "6x13")))) '(font-lock-keyword-face ((((class color) (min-colors 8)) (:foreground "Purple")))) '(highlight-changes ((t (:background "alice blue")))) '(highlight-changes-delete ((t (:background "bisque1")))) diff --git a/nxhtml/etc/schema/xhtml-loader.rnc b/nxhtml/etc/schema/xhtml-loader.rnc index d314851..f3b265d 100644 --- a/nxhtml/etc/schema/xhtml-loader.rnc +++ b/nxhtml/etc/schema/xhtml-loader.rnc @@ -1 +1 @@ -include "../../../../../../../usr/share/emacs/23.3/etc/schema/xhtml.rnc" +include "../../../../../../usr/share/emacs/23.3/etc/schema/xhtml.rnc" diff --git a/setup/00init.el b/setup/00init.el index 896b284..9608efe 100644 --- a/setup/00init.el +++ b/setup/00init.el @@ -5,6 +5,7 @@ (when (boundp 'bytecomp-filename) bytecomp-filename) buffer-file-name)))))) (add-to-list 'load-path (concat base "lib")) + (add-to-list 'load-path (concat base "auto-install")) (setq custom-file (concat base "emacs-custom.el"))) (load custom-file) diff --git a/setup/bindings.el b/setup/bindings.el index 660ff0c..f890c47 100644 --- a/setup/bindings.el +++ b/setup/bindings.el @@ -10,16 +10,18 @@ (global-set-key "\C-c's" 'flyspell-mode) (global-set-key "\C-c'a" 'global-auto-revert-mode) -(require 'develock) -(require 'develock-py) +;(require 'develock) +;(require 'develock-py) (defun toggle-whitespace-modes () (interactive) (if whitespace-mode (progn (whitespace-mode 0) - (develock-mode 0)) + ;(develock-mode 0) + ) (whitespace-mode 1) - (develock-mode 1))) + ;(develock-mode 1) + )) (global-set-key "\C-c' " 'toggle-whitespace-modes) diff --git a/setup/ffap.el b/setup/ffap.el index 1cf09d5..af2e8c5 100644 --- a/setup/ffap.el +++ b/setup/ffap.el @@ -1,3 +1,5 @@ +(require 'ffap) + (defun my-find-file-at-point-with-line () "Opens the file at point and goes to line-number." (interactive) @@ -23,4 +25,4 @@ (when line (goto-line line))) (error "File does not exist.")))) -(global-set-key (kbd "C-c C-x C-f") 'my-find-file-at-point-with-line) \ No newline at end of file +(global-set-key (kbd "C-c C-x C-f") 'my-find-file-at-point-with-line)