Updated.

diff --git a/emacs.el b/emacs.el
index 64500c7..c708d87 100644 (file)
--- a/emacs.el
+++ b/emacs.el
@@ -64,7 +64,7 @@
 ;; use colorization for all modes
 (global-font-lock-mode t)
 
-(setq font-lock-maximum-decoration 2
+(setq font-lock-maximum-decoration 3
       ;;'((latex-mode . 2) (t . 2))
       )
 
@@ -75,6 +75,10 @@
 (setq savehist-file "~/private/emacs/savehist")
 (when (functionp 'savehist-mode) (savehist-mode 1))
 
+;; And allow minibuffer recursion
+(setq enable-recursive-minibuffers t)
+(minibuffer-depth-indicate-mode 1)
+
 ;; I do not like tooltips
 (when (functionp 'tooltip-mode) (tooltip-mode nil))
 
@@ -225,8 +229,9 @@ load-warning buffer in case of failure."
  backup-by-copying-when-linked t
  )
 
-(setq
- user-emacs-directory "~/misc/emacs.d/")
+(setq tramp-backup-directory-alist backup-directory-alist)
+
+(setq user-emacs-directory "~/misc/emacs.d/")
 
 (setq
  abbrev-file-name (concat user-emacs-directory "abbrev_defs")
@@ -367,9 +372,9 @@ load-warning buffer in case of failure."
      (info-title-2 :foreground "green")
      (cperl-array-face :background "gray90" :foreground "blue" :weight 'bold)
      (cperl-hash-face :background "gray90" :foreground "purple" :weight 'bold)
-     (diff-added-face :foreground "blue" :weight 'bold)
-     (diff-changed-face :foreground "green" :weight 'bold)
-     (diff-removed-face :foreground "red" :weight 'bold)
+     (diff-added :background "gray90" :foreground "green4" :weight 'bold)
+     (diff-removed :background "gray90" :foreground "red2" :weight 'bold)
+     (diff-changed :background "gray90" :foreground "blue" :weight 'bold)
      (diff-file-header-face :background "white" :foreground "black"
                             :weight 'bold)
      (diff-header-face :background "white" :foreground "black")
@@ -427,9 +432,10 @@ load-warning buffer in case of failure."
      (cperl-array-face :background "gray90" :foreground "blue" :weight 'bold)
      (cperl-hash-face :background "gray90" :foreground "purple" :weight 'bold)
      (message-cited-text :foreground "red4")
+     (diff-mode :background "gray90" :weight 'bold)
      (diff-added :background "gray90" :foreground "green4" :weight 'bold)
      (diff-removed :background "gray90" :foreground "red2" :weight 'bold)
-     (diff-changed :background "gray90" :foreground "blue")
+     (diff-changed :background "gray90" :foreground "blue" :weight 'bold)
      (diff-file-header :background "white" :foreground "black"
                        :weight 'bold)
      (diff-header :background "white" :foreground "black")
@@ -778,7 +784,7 @@ printer."
       (/ (* 100 (string-to-number (ff/file-first-line (format "%s/%s_now" ff/battery-dir prefix))))
          (string-to-number (ff/file-first-line (format "%s/%s_full"  ff/battery-dir prefix))))
     (error -1))
-    )
+  )
 
 (defun ff/laptop-info-string () (interactive)
   (condition-case nil
@@ -910,7 +916,7 @@ printer."
                              load
 
                              ,(if (ff/laptop-info-string)
-                                  '(concat " /" (ff/laptop-info-string) "/"))
+                                  '(concat " " (ff/laptop-info-string)))
 
                              )
 
@@ -1136,7 +1142,7 @@ goback argument, go back where we were."
     "The face to display known mail identities.")
 
   (defface ff/unknown-address-face
-    '((t (:foreground "red4")))
+    '((t (:foreground "gray50")))
     "The face to display unknown mail identities.")
 
   (defun ff/explicit-name (email)
@@ -1694,16 +1700,16 @@ and refilling all the paragraphs."
    ;; Strange that I have to specify that
    ;; (setq paragraph-separate "[%     \f]*$")
    ;; (setq paragraph-separate
-         ;; (concat "[%]*\\|[\f%]\\|[ \t]*\\($\\|"
-                 ;; "\\\\[][]\\|"
-                 ;; "\\\\" (regexp-opt (append
-                                     ;; (mapcar 'car latex-section-alist)
-                                     ;; '("begin" "label" "end" )) t)
-                 ;; "\\>\\|\\\\\\(" (regexp-opt '("item" "bibitem" "newline"
-                                               ;; "noindent" "newpage" "footnote"
-                                               ;; "marginpar" "parbox" "caption"))
-                 ;; "\\|\\$\\$\\|[a-z]*\\(space\\|skip\\|page[a-z]*\\)"
-                 ;; "\\>\\)[ \t]*\\($\\|%\\)\\)"))
+   ;; (concat "[%]*\\|[\f%]\\|[ \t]*\\($\\|"
+   ;; "\\\\[][]\\|"
+   ;; "\\\\" (regexp-opt (append
+   ;; (mapcar 'car latex-section-alist)
+   ;; '("begin" "label" "end" )) t)
+   ;; "\\>\\|\\\\\\(" (regexp-opt '("item" "bibitem" "newline"
+   ;; "noindent" "newpage" "footnote"
+   ;; "marginpar" "parbox" "caption"))
+   ;; "\\|\\$\\$\\|[a-z]*\\(space\\|skip\\|page[a-z]*\\)"
+   ;; "\\>\\)[ \t]*\\($\\|%\\)\\)"))
    ;; (flyspell-mode 1)
    ;; (reftex-mode 1)
    ))
@@ -1853,6 +1859,17 @@ a file in /tmp"
     (add-to-list 'find-file-not-found-functions 'ff/start-file)
   (add-to-list 'find-file-not-found-hooks 'ff/start-file))
 
+(when (>= emacs-major-version 24)
+  (define-obsolete-function-alias 'make-local-hook 'ignore "21.1")
+  (setq send-mail-function 'sendmail-send-it) ;; emacs 24.x stuff
+
+  (custom-set-faces
+   '(diff-added ((default (:background "gray90" :foreground "green4" :weight bold))))
+   '(diff-removed ((default (:background "gray90" :foreground "red2" :weight bold))))
+   '(diff-changed ((default (:background "gray90" :foreground "blue" :weight bold))))
+   )
+  )
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-key global-map [f8] 'ff-find-other-file)
@@ -2390,8 +2407,10 @@ proposes to visit them."
   )
 
 (defun ff/flyspell-mode (arg) (interactive "p")
-  (flyspell-mode)
-  (when flyspell-mode (flyspell-buffer)))
+  (if flyspell-mode (flyspell-mode -1)
+    (flyspell-mode 1)
+    (flyspell-buffer))
+)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; The fridge!
@@ -2493,27 +2512,27 @@ with a time tag, and save this file"
   ;; ugly.
 
   ;; (defun ff/yank-with-xclip (&optional arg)
-    ;; "Paste the content of the X clipboard with the xclip
-;; command. Without ARG converts some of the '\\uxxxx' characters."
-    ;; (interactive "P")
-    ;; (with-temp-buffer
-      ;; (shell-command "xclip -o" t)
-      ;; (unless arg
-        ;; (mapc (lambda (x) (replace-string (concat "\\u" (car x)) (cdr x) nil (point-min) (point-max)))
-              ;; '(("fffd" . "??")
-                ;; ("2013" . "-")
-                ;; ("2014" . "--")
-                ;; ("2018" . "`")
-                ;; ("2019" . "'")
-                ;; ("201c" . "``")
-                ;; ("201d" . "''")
-                ;; ("2022" . "*")
-                ;; ("2026" . "...")
-                ;; ("20ac" . "EUR")
-                ;; )))
-      ;; (kill-ring-save (point-min) (point-max)))
-
-    ;; (yank))
+  ;; "Paste the content of the X clipboard with the xclip
+  ;; command. Without ARG converts some of the '\\uxxxx' characters."
+  ;; (interactive "P")
+  ;; (with-temp-buffer
+  ;; (shell-command "xclip -o" t)
+  ;; (unless arg
+  ;; (mapc (lambda (x) (replace-string (concat "\\u" (car x)) (cdr x) nil (point-min) (point-max)))
+  ;; '(("fffd" . "??")
+  ;; ("2013" . "-")
+  ;; ("2014" . "--")
+  ;; ("2018" . "`")
+  ;; ("2019" . "'")
+  ;; ("201c" . "``")
+  ;; ("201d" . "''")
+  ;; ("2022" . "*")
+  ;; ("2026" . "...")
+  ;; ("20ac" . "EUR")
+  ;; )))
+  ;; (kill-ring-save (point-min) (point-max)))
+
+  ;; (yank))
 
   ;; (define-key global-map [(meta y)] 'ff/yank-with-xclip)