Update.

[elisp.git] / emacs.el

diff --git a/emacs.el b/emacs.el
index a8303c9..d594243 100644 (file)
--- 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
 
@@ -73,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
@@ -209,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
@@ -423,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")
      ))
@@ -2273,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))
@@ -2309,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"
@@ -2318,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
         )
   )
 
@@ -2500,7 +2508,9 @@ with a time tag, and save this file"
 (define-key global-map [(control \`)] ff/map)
 
 (unless window-system
-  (define-key global-map [(control @)] ff/map))
+  ;; (define-key global-map [(control @)] ff/map)
+  (define-key global-map [(meta O) \`] ff/map)
+)
 
 (define-key esc-map "`" ff/map)
 
@@ -2727,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