# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1445968240 -7200
# Node ID 361aa3be7455e1136ef274638d24005f540d75a7
# Parent  b3c9f1e790eb487c9e77c0b3e0aa3aa15fc7b690# Parent  03ff957a26141a6d80c0784bca3fdf63c0e8a6bf
merged

diff -r 03ff957a2614 -r 361aa3be7455 .emacs-my
--- a/.emacs-my	Wed Oct 07 13:34:30 2015 +0300
+++ b/.emacs-my	Tue Oct 27 19:50:40 2015 +0200
@@ -678,7 +678,7 @@
 ;; (setq find-ls-option '("-ls" . ""))
 ;; So I use next expression, which work with GNU find, I replace %s with '0'
 ;; to avoid unnecessary sys calls and this make output aligned by column:
-(setq find-ls-option '("-printf ' -rw-rw-rw- 0 %AY-%Am-%Ad %AH:%AM %p\n'" . ""))
+(setq find-ls-option '("-printf ' -rw-rw-rw- %9s %AY-%Am-%Ad %AH:%AM %p\n'" . ""))
 
 ;; Do not set t because some grep do not has --color options.
 (setq grep-highlight-matches nil)
@@ -1638,7 +1638,7 @@
    `(
      ( ,(concat "\\<\\(" (regexp-opt '("TODO" "FIX" "FIXME" "HACK" "XXX")) ":?\\)\\>") 1 'font-lock-warning-face t)
      ;; 64 times, for highlight C-u C-u C-u <key>
-     ("\\([^[:space:]]\\)\\1\\{63\\}" 0 'my-contrasty-face t)
+     ;; ("\\([^[:space:]]\\)\\1\\{63\\}" 0 'my-contrasty-face t)
      ))
   )
 
@@ -1824,8 +1824,10 @@
 (setq mm-discouraged-alternatives '("text/html" "text/richtext"))
 (setq mm-text-html-renderer 'w3m)
 
-(eval-when-compile
-  (require 'w3m-util nil :no-error))
+(cl-eval-when 'compile
+  (condition-case err
+      (require 'w3m-util)
+    (error (byte-compile-warn "FAIL: %S" err))))
 
 (defun my-w3m-view-url ()
   (interactive)
diff -r 03ff957a2614 -r 361aa3be7455 Makefile
--- a/Makefile	Wed Oct 07 13:34:30 2015 +0300
+++ b/Makefile	Tue Oct 27 19:50:40 2015 +0200
@@ -136,15 +136,18 @@
 	for file in .emacs-pre .emacs-post; do \
 		[ -f $(emacsdir)/$$file ] || cp $$file $(emacsdir)/$$file; \
 	done
-	cp .emacs $(emacsdir)/init.el
-	cp .emacs-defs .emacs-my $(emacsdir)
-	mkdir -p $(emacsdir)/server $(HOME)/.gnus/scores
-	cp all.SCORE $(HOME)/.gnus/scores
-	cp -f $(EL_FILES) $(mylispdir); \
-	./.emacs-autogen.sh $(emacsdir)/.emacs-autogen; \
-	$(EMACS) -Q --batch --eval='(let ((generated-autoload-file "$(mylispdir)/loaddefs.el")) (update-directory-autoloads "$(mylispdir)"))'
+	\
+cp .emacs $(emacsdir)/init.el; \
+cp .emacs-defs .emacs-my $(emacsdir)
 	\
-$(EMACS) -Q --batch --eval='(load "$(curdir)/.emacs-defs")' --eval='(my-load.add-my-loadpaths)' --eval='(load "$(emacsdir)/.emacs-pre")' \
+mkdir -p $(emacsdir)/server $(HOME)/.gnus/scores; \
+cp all.SCORE $(HOME)/.gnus/scores
+	\
+cp -f $(EL_FILES) $(mylispdir); \
+./.emacs-autogen.sh $(emacsdir)/.emacs-autogen; \
+$(EMACS) --batch -Q --eval='(let ((generated-autoload-file "$(mylispdir)/loaddefs.el")) (update-directory-autoloads "$(mylispdir)"))'
+	\
+$(EMACS) --batch --load "$(curdir)/.emacs-defs" -f 'my-load.add-my-loadpaths' --load "$(emacsdir)/.emacs-pre" \
   --eval='(byte-compile-file "$(emacsdir)/.emacs-my")' --eval='(byte-force-recompile "$(mylispdir)")'
 	cp -r srecode/ $(HOME)/.emacs.d/
 
diff -r 03ff957a2614 -r 361aa3be7455 all.SCORE
--- a/all.SCORE	Wed Oct 07 13:34:30 2015 +0300
+++ b/all.SCORE	Tue Oct 27 19:50:40 2015 +0200
@@ -5,7 +5,9 @@
   ("gavenkoa" 200 nil s)
   ("Юрий Гавенко" 200 nil s)
   ("singalen" 100 nil s)
-  ("Victor Sergienko" 200 nil s))
+  ("Victor Sergienko" 200 nil s)
+  ;; Spammers, haters.
+  ("sthu.deus@openmailbox.org" -1000 nil s))
  ("message-id"
   ("@gavenkoa.example.com" 200 nil s))
  ("references"