X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=emacs.el;h=63b51c3eae4b6d820d4657a9dca3ba9eb2d927b7;hb=10b4d5177ae8d16fd25bad4a4a960b8563f5bea6;hp=c708d870094373b282ac95504222eacf69730c0e;hpb=de8dfabe25f8469dff7e8901919a5ae970592725;p=elisp.git diff --git a/emacs.el b/emacs.el index c708d87..63b51c3 100644 --- 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)) @@ -129,8 +130,12 @@ load-warning buffer in case of failure." ;; make emacs use the clipboard so that copy/paste works for other ;; x-programs. I have no clue how all that clipboard thing works. + ;; (setq x-select-enable-clipboard t) ;; (setq interprogram-paste-function 'x-cut-buffer-or-selection-value) +;; (setq x-select-enable-primary t) +;; (setq x-select-enable-clipboard t) +;; (global-set-key "\C-y" 'clipboard-yank) (setq @@ -290,6 +295,8 @@ load-warning buffer in case of failure." ;; What modes for what file extentions (add-to-list 'auto-mode-alist '("\\.h\\'" . c++-mode)) +(require 'org-table) + (add-to-list 'auto-mode-alist '("\\.txt\\'" . (lambda() (text-mode) (orgtbl-mode) @@ -341,7 +348,7 @@ load-warning buffer in case of failure." )) ;; "tool" bar? Are you kidding? -(when (boundp 'tool-bar-mode) (tool-bar-mode -1)) +(when (fboundp 'tool-bar-mode) (tool-bar-mode -1)) ;; ;; If my own letter icon is here, use it and change its color ;; (when (file-exists-p "~/local/share/emacs/letter.xbm") @@ -392,8 +399,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") @@ -427,7 +434,8 @@ load-warning buffer in case of failure." (ff/configure-faces '( - (escape-glyph :foreground "#c0c0c0" :weight 'bold) + ;; (escape-glyph :foreground "#c0c0c0" :weight 'bold) + (escape-glyph :foreground "green3" :weight 'bold) (default :background "gray90" :foreground "black") (cperl-array-face :background "gray90" :foreground "blue" :weight 'bold) (cperl-hash-face :background "gray90" :foreground "purple" :weight 'bold) @@ -449,9 +457,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 +471,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 +494,19 @@ 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 "#604000" + :background "white" + :italic t) + (set-face-attribute 'sh-heredoc-face nil + :foreground "#604000" + :background "white" + :italic t) + )) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Move the window on the buffer without moving the cursor ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -669,8 +690,8 @@ occurrences " (load "ps-print") (setq ps-print-color-p nil - ;; ps-paper-type 'letter - ps-paper-type 'a4 + ps-paper-type 'letter + ;; ps-paper-type 'a4 ;; ps-top-margin (* 1.75 56.692) ;; ps-left-margin 56.692 ;; ps-bottom-margin 56.692 @@ -815,8 +836,10 @@ printer." (ff/battery-percent "energy")))) ((string= battery-status "Discharging") - (format "B%d%%" (max (ff/battery-percent "charge") - (ff/battery-percent "energy")))) + (let* ((c (max (ff/battery-percent "charge") + (ff/battery-percent "energy"))) + (s (format "B%d%%" c))) + (if (>= c 20) s (propertize s 'face 'font-lock-warning-face)))) (t battery-status) @@ -1117,6 +1140,8 @@ goback argument, go back where we were." ;; Failsafe version if we can't load bbdb (defun ff/explicit-name (email) email) +(load "vc-git") + (when (ff/load-or-alert "bbdb") (setq @@ -1180,6 +1205,8 @@ 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" ;; :underline t ;; :background "white" @@ -1188,7 +1215,6 @@ ff/known-address-face is used." ;; :slant 'italic ))) - ) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -1207,7 +1233,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) @@ -1408,21 +1434,20 @@ universal argument starts xfig even if the .fig does not exist" (insert "%% -*- mode: latex; mode: reftex; mode: flyspell; coding: utf-8; tex-command: \"pdflatex.sh\" -*- \\documentclass[12pt]{article} -\\usepackage[a4paper,top=2.5cm,bottom=2cm,left=1.5cm,right=1.5cm]{geometry} +\\usepackage[a4paper,top=2.5cm,bottom=2cm,left=2.5cm,right=2.5cm]{geometry} \\usepackage[utf8]{inputenc} \\usepackage{amsmath} \\usepackage{amssymb} -\\usepackage{hyperref} +\\usepackage[pdftex]{graphicx} +\\usepackage{microtype} +\\usepackage[colorlinks=true,linkcolor=blue,urlcolor=blue,citecolor=blue]{hyperref} -%% \\usepackage[pdftex]{graphicx} -%% \\usepackage{eurosym} +\\setlength{\\parindent}{0cm} +\\setlength{\\parskip}{12pt} +\\renewcommand{\\baselinestretch}{1.3} -\\hypersetup{ - colorlinks=true, - linkcolor=blue, - urlcolor=blue, - citecolor=blue -} +\\def\\argmax{\\operatornamewithlimits{argmax}} +\\def\\argmin{\\operatornamewithlimits{argmin}} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Sans serif fonts @@ -1432,12 +1457,16 @@ universal argument starts xfig even if the .fig does not exist" %% \\renewcommand{\\ttdefault}{pcr} %% \\renewcommand*\\familydefault{\\sfdefault} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% \\def\\argmax{\\operatornamewithlimits{argmax}} -%% \\def\\argmin{\\operatornamewithlimits{argmin}} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% \\setlength{\\parindent}{0cm} -%% \\setlength{\\parskip}{12pt} -%% \\renewcommand{\\baselinestretch}{1.3} +%% The \\todo command +\\newcounter{nbdrafts} +\\setcounter{nbdrafts}{0} +\\makeatletter +\\newcommand{\\checknbdrafts}{ +\\ifnum \\thenbdrafts > 0 +\\@latex@warning@no@line{*WARNING* The document contains \\thenbdrafts \\space draft note(s)} +\\fi} +\\newcommand{\\todo}[1]{\\addtocounter{nbdrafts}{1}{\\color{red} #1}} +\\makeatother %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \\begin{document} @@ -1810,7 +1839,7 @@ a file in /tmp" (when (string-match "\\.sh$" filename) (sh-mode) - (insert "#!/bin/bash\n\nset -e\n\n") + (insert "#!/bin/bash\n\nset -e\nset -o pipefail\n\n") (save-excursion (ff/add-copyrights)) ) @@ -2093,6 +2122,9 @@ This may be a useful alternative binding for \\[delete-other-windows] (setq longlines-show-hard-newlines t longlines-auto-wrap t ;; longlines-show-effect #("|\n" 0 2 (face escape-glyph)) + ;; longlines-show-effect #("∴\n" 0 2 (face escape-glyph)) + longlines-show-effect #("•\n" 0 2 (face escape-glyph)) + ;; longlines-show-effect #("↵\n" 0 2 (face escape-glyph)) ) ;; (defun ff/auto-longlines () @@ -2235,30 +2267,26 @@ next one. With universal argument, kill all killable buffers." (load "recentf") -(setq recentf-exclude - (append recentf-exclude - '("enotes$" "secure-notes$" "media-playlists$" - "bbdb$" - "svn-commit.tmp$" ".git/COMMIT_EDITMSG$" - "\.bbl$" "\.aux$" "\.toc$")) +;; If we just check for file-symlink-p, everytime we start emacs it +;; will check all the remote files listed in recentf-list, so we check +;; that they are not remote first +(defun ff/file-not-remote-but-symlink (filename) + (and (not (file-remote-p filename)) (file-symlink-p filename))) + +(setq recentf-exclude (append recentf-exclude + '( + ff/file-not-remote-but-symlink + "enotes$" "secure-notes$" "media-playlists$" + "bbdb$" + "svn-commit.tmp$" ".git/COMMIT_EDITMSG$" + "\.bbl$" "\.aux$" "\.toc$" + )) recentf-max-saved-items 1000 recentf-save-file "~/private/emacs/recentf" ) (when (boundp 'recentf-keep) (add-to-list 'recentf-keep 'file-remote-p)) -;; Removes the link if we add the file itself (I am fed up with -;; duplicates because of vc-follow-symlinks) - -(defadvice recentf-add-file (before ff/remove-links (filename) activate) - ;; If we are adding a filename corresponding to the last link we - ;; have added, remove the latter - (when (and recentf-list - (file-symlink-p (car recentf-list)) - (string= filename (file-chase-links filename))) - (setq recentf-list (cdr recentf-list)) - )) - (recentf-mode 1) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -2294,6 +2322,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" @@ -2302,6 +2331,21 @@ next one. With universal argument, kill all killable buffers." ) ) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; A fast indexed / search in mbox +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +;; This is one of my own things, check my web page to get it + +(when (ff/load-or-alert "~/sources/gpl/mymail/mymail-vm.el") + + (define-key vm-summary-mode-map "\\" 'mymail/vm-visit-folder) + (define-key global-map [S-f7] 'mymail/vm-visit-folder) + (setq mymail/default-search-request "today" + mymail/default-additional-search-requests "!s ^\\[SPAM\\],!s \\] STATUS,") + (add-to-list 'recentf-exclude "/tmp/mymail-vm-.*\.mbox") +) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; A dynamic search ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -2444,6 +2488,8 @@ 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) + (define-key esc-map "`" ff/map) (defun ff/git-status (&optional dir) (interactive) @@ -2475,6 +2521,7 @@ with a time tag, and save this file" (define-key ff/map [(control o)] 'selector/quick-pick-recent) (define-key ff/map "s" 'selector/quick-move-in-buffer) (define-key ff/map "S" 'selector/search-sentence) +(define-key ff/map "t" (lambda () (interactive) (find-file "~/private/TODO.txt"))) (define-key ff/map "h" 'ff/tidy-html) (define-key ff/map "c" 'ff/count-char) (define-key ff/map [(control p)] 'ff/print-to-file)