X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=elisp.git;a=blobdiff_plain;f=emacs.el;h=d594243accc1f7e8c16720ea8746ec2738d2b8ad;hp=a3e138646460eb8c1647c40fc4fac5aef551fff5;hb=81269eb9ce700853f25e70bb5be83a0247eb9983;hpb=a4beb5269fa0161160fb23997d9d7c9153184c1a

diff --git a/emacs.el b/emacs.el
index a3e1386..d594243 100644
--- a/emacs.el
+++ b/emacs.el
@@ -31,6 +31,9 @@
 ;; Xft.antialias: true
 ;; Xft.rgba: rgb
 
+;; This is where I put most of my emacs-related files
+(setq ff/emacs-dir "~/private/emacs")
+
 ;; Give the focus to the emacs window if we are under a windowing
 ;; system
 
@@ -50,6 +53,7 @@
 ;; Nor fringes
 ;; (when (functionp 'fringe-mode) (fringe-mode '(0 . 0)))
 ;; (when (functionp 'fringe-mode) (fringe-mode '(0 . 1)))
+(when (functionp 'fringe-mode) (fringe-mode 10))
 
 ;; And I do not like scrollbar neither
 (when (functionp 'scroll-bar-mode) (scroll-bar-mode -1))
@@ -72,8 +76,11 @@
 ;; Activate the dynamic completion of buffer names
 (iswitchb-mode 1)
 
+(unless (file-exists-p ff/emacs-dir)
+  (mkdir ff/emacs-dir))
+
 ;; Save the minibuffer history
-(setq savehist-file "~/private/emacs/savehist")
+(setq savehist-file (concat ff/emacs-dir "/savehist"))
 (when (functionp 'savehist-mode) (savehist-mode 1))
 
 ;; And allow minibuffer recursion
@@ -208,7 +215,8 @@ load-warning buffer in case of failure."
  ;; And I like ascii files
  epa-armor t
 
- tramp-default-method "ssh"
+ ;; tramp-default-method "ssh"
+ tramp-default-method "scp"
 
  ;; I have no problem with files having their own local variables
  enable-local-eval t
@@ -383,6 +391,8 @@ load-warning buffer in case of failure."
   (ff/configure-faces
    '((italic :underline nil)
      (info-title-2 :foreground "green")
+     (font-lock-comment-delimiter-face :foreground "black")
+     (font-lock-comment-face :foreground "black")
      (cperl-array-face :background "gray90" :foreground "blue" :weight 'bold)
      (cperl-hash-face :background "gray90" :foreground "purple" :weight 'bold)
      (diff-added :background "gray90" :foreground "green4" :weight 'bold)
@@ -399,11 +409,10 @@ load-warning buffer in case of failure."
      (font-lock-string-face :foreground "green")
      (font-lock-variable-name-face :foreground "blue")
      (font-lock-constant-face :foreground "blue")
-     (font-lock-function-name-face :foreground "blue")
      (font-lock-preprocessor-face :foreground "green")
      (font-lock-function-name-face :foreground "cyan")
-     (flyspell-incorrect-face :foreground "red2")
-     (flyspell-duplicate-face :foreground "OrangeRed2")
+     (flyspell-incorrect :foreground "red2")
+     (flyspell-duplicate :foreground "OrangeRed2")
      (hl-line :background "white")
      (sh-heredoc :foreground "black" :background "#fff0f0")
      (sh-heredoc-face :foreground "black" :background "#fff0f0")
@@ -421,9 +430,10 @@ load-warning buffer in case of failure."
                   :inverse-video nil)
      (mode-line-inactive :background "gray60" :foreground "black" :box nil
                          :inverse-video nil)
-     (region :background "springgreen2")
+     (region :background "white" :foreground "black")
      (ff/date-info-face :foreground "white" :weight 'bold)
      (ff/mail-alarm-face :foreground "red" :weight 'bold)
+     (selector/selection :background "yellow")
      (gui-button-face :background "green" :foreground "white")
      (enotes/information-face :foreground "cyan")
      ))
@@ -458,11 +468,12 @@ load-warning buffer in case of failure."
      (font-lock-builtin-face :foreground "deeppink3")
      (font-lock-string-face :foreground "dark olive green")
      (font-lock-variable-name-face :foreground "sienna")
-     (font-lock-function-name-face :foreground "blue4" :weight 'bold)
+     ;; (font-lock-function-name-face :foreground "blue" :weight 'bold)
+     (font-lock-function-name-face :foreground "blue")
      ;; (font-lock-comment-delimiter-face :foreground "dark violet")
      ;; (font-lock-comment-face :foreground "dark violet")
-     (flyspell-incorrect-face :foreground "red2")
-     (flyspell-duplicate-face :foreground "OrangeRed2")
+     (flyspell-incorrect :background "#ff0000" :foreground "black")
+     (flyspell-duplicate :background "#ff9000" :foreground "black")
      (hl-line :background "white")
      (sh-heredoc :foreground "black" :background "#fff0f0")
      (sh-heredoc-face :foreground "black" :background "#fff0f0")
@@ -489,6 +500,7 @@ load-warning buffer in case of failure."
      (ff/date-info-face :foreground "white" :weight 'bold)
      (ff/mail-alarm-face :foreground "white" :background "red2")
      ;; (alarm-vc-face :foreground "black" :background "yellow" :weight 'normal)
+     (gui-button-face :background "green" :foreground "black")
     ))
   )
 
@@ -798,7 +810,7 @@ printer."
          (if (> temp 50)
              (concat
               (let ((s (format "%dC " temp)))
-                (if (> temp 65) (propertize s 'face
+                (if (> temp 70) (propertize s 'face
                                             'font-lock-warning-face)
                   s))
               )
@@ -1186,9 +1198,9 @@ ff/known-address-face is used."
     )
 
   (ff/configure-faces '((ff/robot-address-face :foreground "green4")
-                        (ff/personal-address-face :foreground "dark magenta"
-                                                  :weight 'bold)
-                        (ff/important-address-face :foreground "blue2"
+                        (ff/personal-address-face :foreground "blue2" :weight 'bold)
+                        (ff/important-address-face :foreground "red3"
+                                                   ;; :foreground "blue2"
                                                    ;; :underline t
                                                    ;; :background "white"
                                                    ;; :foreground "green4"
@@ -1637,6 +1649,11 @@ int main(int argc, char **argv) {
 <head>
 <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />
 <title></title>
+<style>
+p {
+ color:#009900;
+}
+</style>
 </head>
 
 <body>
@@ -1960,6 +1977,19 @@ a file in /tmp"
 ;; (when (ff/load-or-alert "flyspell-timer" t)
 ;;   (add-hook 'flyspell-mode-hook 'flyspell-timer-ensure-idle-timer))
 
+(defun ff/start-flyspell () (interactive)
+  (ff/configure-faces
+   '(
+     ;; (flyspell-incorrect :background "#ff0000" :foreground "black")
+     ;; (flyspell-duplicate :background "#ff9000" :foreground "black")
+     (flyspell-incorrect :foreground "#ff0000" :weight 'bold)
+     (flyspell-duplicate :foreground "#ff9000" :weight 'bold)
+     ))
+  ;; (flyspell-buffer)
+  )
+
+(add-hook 'flyspell-mode-hook 'ff/start-flyspell)
+
 (defun ff/pick-dictionnary () (interactive)
   (when (and (boundp 'flyspell-mode) flyspell-mode)
     (if (and current-input-method (string-match "latin" current-input-method))
@@ -2251,7 +2281,7 @@ next one. With universal argument, kill all killable buffers."
                                 "\.bbl$" "\.aux$" "\.toc$"
                                 ))
       recentf-max-saved-items 1000
-      recentf-save-file "~/private/emacs/recentf"
+      recentf-save-file (concat ff/emacs-dir "/recentf")
       )
 
 (when (boundp 'recentf-keep) (add-to-list 'recentf-keep 'file-remote-p))
@@ -2287,7 +2317,7 @@ next one. With universal argument, kill all killable buffers."
         media/add-current-song-to-interrupted-when-killing t
         media/duration-to-history 30
         media/history-size 1000
-        media/playlist-file "~/private/emacs/media-playlists"
+        media/playlist-file (concat ff/emacs-dir "/media-playlists")
         media/mplayer/args '(
                              "-framedrop"
                              "-zoom"
@@ -2296,7 +2326,7 @@ next one. With universal argument, kill all killable buffers."
                              ;; "-stop-xscreensaver"
                              ;; "-osdlevel" "3"
                              )
-        media/mplayer/timing-request-period 5.0
+        media/mplayer/timing-request-period 1.0
         )
   )
 
@@ -2476,7 +2506,11 @@ with a time tag, and save this file"
 
 (setq ff/map (make-sparse-keymap))
 (define-key global-map [(control \`)] ff/map)
-;;(define-key global-map [(control @)] ff/map)
+
+(unless window-system
+  ;; (define-key global-map [(control @)] ff/map)
+  (define-key global-map [(meta O) \`] ff/map)
+)
 
 (define-key esc-map "`" ff/map)
 
@@ -2703,9 +2737,9 @@ With argument ARG, do this that many times."
 
 ;; Where to save the bookmarks and where is bbdb
 
-(setq bookmark-default-file "~/private/emacs/bmk"
+(setq bookmark-default-file (concat ff/emacs-dir "/bmk")
       bbdb-file "~/private/bbdb"
-      custom-file "~/private/emacs/custom")
+      custom-file (concat ff/emacs-dir "/custom"))
 
 ;; enotes.el is one of my own scripts, check my web page