Update.

[elisp.git] / emacs.el

diff --git a/emacs.el b/emacs.el
index c708d87..3e49e71 100644 (file)
--- a/emacs.el
+++ b/emacs.el
@@ -49,6 +49,7 @@
 
 ;; Nor fringes
 (when (functionp 'fringe-mode) (fringe-mode '(0 . 0)))
+;; (when (functionp 'fringe-mode) (fringe-mode '(0 . 1)))
 
 ;; And I do not like scrollbar neither
 (when (functionp 'scroll-bar-mode) (scroll-bar-mode -1))
@@ -392,8 +393,8 @@ load-warning buffer in case of failure."
      (flyspell-incorrect-face :foreground "red2")
      (flyspell-duplicate-face :foreground "OrangeRed2")
      (hl-line :background "white")
-     (sh-heredoc :foreground "blue")
-     (sh-heredoc-face :foreground "blue")
+     (sh-heredoc :foreground "black" :background "#fff0f0")
+     (sh-heredoc-face :foreground "black" :background "#fff0f0")
      (font-lock-keyword-face :foreground "blue")
      (highlight :background "darkseagreen3")
      (isearch :background "orange" :foreground "black")
@@ -449,9 +450,9 @@ load-warning buffer in case of failure."
      (flyspell-incorrect-face :foreground "red2")
      (flyspell-duplicate-face :foreground "OrangeRed2")
      (hl-line :background "white")
+     (sh-heredoc :foreground "black" :background "#fff0f0")
+     (sh-heredoc-face :foreground "black" :background "#fff0f0")
      (header-line :background "gray65")
-     (sh-heredoc :foreground "darkorange3")
-     (sh-heredoc-face :foreground "darkorange3")
      (highlight :background "turquoise")
      (message-cited-text-face :foreground "firebrick")
      (isearch :background "yellow" :foreground "black")
@@ -463,11 +464,11 @@ load-warning buffer in case of failure."
      (trailing-whitespace :background "gray65")
      (cursor :inverse-video t)
      (enotes/list-title-face :foreground "blue" :weight 'bold)
-     (mode-line :background "#9090f0" :foreground "black" :box nil
+     (mode-line :background "#b0b0ff" :foreground "black" :box nil
                 :inverse-video nil)
      (header-line :background "cornflowerblue" :foreground "black" :box nil
                   :inverse-video nil)
-     (mode-line-inactive :background "#606080" :foreground "black" :box nil
+     (mode-line-inactive :background "#b0b0b0" :foreground "black" :box nil
                          :inverse-video nil)
      ;; (fringe :background "black" :foreground "gray90")
      (fringe :background "gray65")
@@ -486,6 +487,17 @@ load-warning buffer in case of failure."
                 :inverse-video nil))
    ))
 
+;; Why should I have to do this?
+(add-hook 'sh-mode-hook
+          (lambda ()
+            (set-face-attribute 'sh-heredoc nil
+                                :foreground "black"
+                                :background "#fff0f0")
+            (set-face-attribute 'sh-heredoc-face nil
+                                :foreground "black"
+                                :background "#fff0f0")
+            ))
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Move the window on the buffer without moving the cursor
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -1207,7 +1219,7 @@ ff/known-address-face is used."
   "The face to display the dates in the modeline.")
 
 (defun ff/secure-note-add () (interactive)
-  (find-file "~/private/secure-notes.gpg")
+  (find-file ff/secure-note-file)
 
   ;; Adds a new entry (i.e. date and a bunch of empty lines)
 
@@ -2294,6 +2306,7 @@ next one. With universal argument, kill all killable buffers."
         media/mplayer/args '(
                              "-framedrop"
                              "-zoom"
+                             "-cache" "512"
                              "-subfont-osd-scale" "3"
                              ;; "-stop-xscreensaver"
                              ;; "-osdlevel" "3"