X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=elisp.git;a=blobdiff_plain;f=emacs.el;h=69e002f38b3145cf229ebf10ead5fc514dff375e;hp=28e5daaeef3793ac2fa131984ca76a513609b7d5;hb=270866b336934dda55b88baf1f6a75c7a860c305;hpb=40f0fc08f83c1749305a2790123ffb8bbc488460 diff --git a/emacs.el b/emacs.el index 28e5daa..69e002f 100644 --- a/emacs.el +++ b/emacs.el @@ -31,6 +31,11 @@ ;; Xft.antialias: true ;; Xft.rgba: rgb +;; This is where I put most of my emacs-related files +(setq ff/emacs-dir "~/private/emacs") +(unless (file-exists-p ff/emacs-dir) + (mkdir ff/emacs-dir t)) + ;; Give the focus to the emacs window if we are under a windowing ;; system @@ -74,7 +79,7 @@ (iswitchb-mode 1) ;; 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 +214,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 @@ -384,8 +390,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") + (font-lock-comment-delimiter-face :foreground "blue") + (font-lock-comment-face :foreground "blue") (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) @@ -423,11 +429,16 @@ 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") + + (file-name-shadow :foreground "black") + (shadow :foreground "black") + (warning :foreground "black" :background "red") )) ) @@ -802,7 +813,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)) ) @@ -1641,6 +1652,11 @@ int main(int argc, char **argv) { + @@ -1964,18 +1980,18 @@ 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) - ;; )) +(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) +(add-hook 'flyspell-mode-hook 'ff/start-flyspell) (defun ff/pick-dictionnary () (interactive) (when (and (boundp 'flyspell-mode) flyspell-mode) @@ -2268,7 +2284,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)) @@ -2304,7 +2320,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" @@ -2313,7 +2329,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 ) ) @@ -2495,7 +2511,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) @@ -2722,9 +2740,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