X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=elisp.git;a=blobdiff_plain;f=emacs.el;h=03b2bb9da5c2299053eb45807e2e3af02c7ad8da;hp=64500c7c36a419a0ccacdbe9698882cc2dc99884;hb=0785fb27e9d9eeb8d19dd8e1bfad8e520b04bb4c;hpb=db114167e8e2c85fe63ab00fb9472df35666b10b diff --git a/emacs.el b/emacs.el index 64500c7..03b2bb9 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)) @@ -64,7 +65,7 @@ ;; use colorization for all modes (global-font-lock-mode t) -(setq font-lock-maximum-decoration 2 +(setq font-lock-maximum-decoration 3 ;;'((latex-mode . 2) (t . 2)) ) @@ -75,6 +76,10 @@ (setq savehist-file "~/private/emacs/savehist") (when (functionp 'savehist-mode) (savehist-mode 1)) +;; And allow minibuffer recursion +(setq enable-recursive-minibuffers t) +(minibuffer-depth-indicate-mode 1) + ;; I do not like tooltips (when (functionp 'tooltip-mode) (tooltip-mode nil)) @@ -125,8 +130,14 @@ 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 @@ -225,8 +236,9 @@ load-warning buffer in case of failure." backup-by-copying-when-linked t ) -(setq - user-emacs-directory "~/misc/emacs.d/") +(setq tramp-backup-directory-alist backup-directory-alist) + +(setq user-emacs-directory "~/misc/emacs.d/") (setq abbrev-file-name (concat user-emacs-directory "abbrev_defs") @@ -336,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") @@ -367,9 +379,9 @@ load-warning buffer in case of failure." (info-title-2 :foreground "green") (cperl-array-face :background "gray90" :foreground "blue" :weight 'bold) (cperl-hash-face :background "gray90" :foreground "purple" :weight 'bold) - (diff-added-face :foreground "blue" :weight 'bold) - (diff-changed-face :foreground "green" :weight 'bold) - (diff-removed-face :foreground "red" :weight 'bold) + (diff-added :background "gray90" :foreground "green4" :weight 'bold) + (diff-removed :background "gray90" :foreground "red2" :weight 'bold) + (diff-changed :background "gray90" :foreground "blue" :weight 'bold) (diff-file-header-face :background "white" :foreground "black" :weight 'bold) (diff-header-face :background "white" :foreground "black") @@ -387,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") @@ -422,14 +434,16 @@ 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) (message-cited-text :foreground "red4") + (diff-mode :background "gray90" :weight 'bold) (diff-added :background "gray90" :foreground "green4" :weight 'bold) (diff-removed :background "gray90" :foreground "red2" :weight 'bold) - (diff-changed :background "gray90" :foreground "blue") + (diff-changed :background "gray90" :foreground "blue" :weight 'bold) (diff-file-header :background "white" :foreground "black" :weight 'bold) (diff-header :background "white" :foreground "black") @@ -443,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") @@ -457,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") @@ -480,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 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -663,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 @@ -778,7 +805,7 @@ printer." (/ (* 100 (string-to-number (ff/file-first-line (format "%s/%s_now" ff/battery-dir prefix)))) (string-to-number (ff/file-first-line (format "%s/%s_full" ff/battery-dir prefix)))) (error -1)) - ) + ) (defun ff/laptop-info-string () (interactive) (condition-case nil @@ -809,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) @@ -910,7 +939,7 @@ printer." load ,(if (ff/laptop-info-string) - '(concat " /" (ff/laptop-info-string) "/")) + '(concat " " (ff/laptop-info-string))) ) @@ -1111,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 @@ -1136,7 +1167,7 @@ goback argument, go back where we were." "The face to display known mail identities.") (defface ff/unknown-address-face - '((t (:foreground "red4"))) + '((t (:foreground "gray50"))) "The face to display unknown mail identities.") (defun ff/explicit-name (email) @@ -1174,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" @@ -1182,7 +1215,6 @@ ff/known-address-face is used." ;; :slant 'italic ))) - ) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -1201,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) @@ -1406,17 +1438,16 @@ universal argument starts xfig even if the .fig does not exist" \\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 @@ -1426,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} @@ -1694,16 +1729,16 @@ and refilling all the paragraphs." ;; Strange that I have to specify that ;; (setq paragraph-separate "[% \f]*$") ;; (setq paragraph-separate - ;; (concat "[%]*\\|[\f%]\\|[ \t]*\\($\\|" - ;; "\\\\[][]\\|" - ;; "\\\\" (regexp-opt (append - ;; (mapcar 'car latex-section-alist) - ;; '("begin" "label" "end" )) t) - ;; "\\>\\|\\\\\\(" (regexp-opt '("item" "bibitem" "newline" - ;; "noindent" "newpage" "footnote" - ;; "marginpar" "parbox" "caption")) - ;; "\\|\\$\\$\\|[a-z]*\\(space\\|skip\\|page[a-z]*\\)" - ;; "\\>\\)[ \t]*\\($\\|%\\)\\)")) + ;; (concat "[%]*\\|[\f%]\\|[ \t]*\\($\\|" + ;; "\\\\[][]\\|" + ;; "\\\\" (regexp-opt (append + ;; (mapcar 'car latex-section-alist) + ;; '("begin" "label" "end" )) t) + ;; "\\>\\|\\\\\\(" (regexp-opt '("item" "bibitem" "newline" + ;; "noindent" "newpage" "footnote" + ;; "marginpar" "parbox" "caption")) + ;; "\\|\\$\\$\\|[a-z]*\\(space\\|skip\\|page[a-z]*\\)" + ;; "\\>\\)[ \t]*\\($\\|%\\)\\)")) ;; (flyspell-mode 1) ;; (reftex-mode 1) )) @@ -1853,6 +1888,17 @@ a file in /tmp" (add-to-list 'find-file-not-found-functions 'ff/start-file) (add-to-list 'find-file-not-found-hooks 'ff/start-file)) +(when (>= emacs-major-version 24) + (define-obsolete-function-alias 'make-local-hook 'ignore "21.1") + (setq send-mail-function 'sendmail-send-it) ;; emacs 24.x stuff + + (custom-set-faces + '(diff-added ((default (:background "gray90" :foreground "green4" :weight bold)))) + '(diff-removed ((default (:background "gray90" :foreground "red2" :weight bold)))) + '(diff-changed ((default (:background "gray90" :foreground "blue" :weight bold)))) + ) + ) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (define-key global-map [f8] 'ff-find-other-file) @@ -2076,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 () @@ -2277,6 +2326,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" @@ -2390,8 +2440,10 @@ proposes to visit them." ) (defun ff/flyspell-mode (arg) (interactive "p") - (flyspell-mode) - (when flyspell-mode (flyspell-buffer))) + (if flyspell-mode (flyspell-mode -1) + (flyspell-mode 1) + (flyspell-buffer)) +) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; The fridge! @@ -2456,6 +2508,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) @@ -2493,27 +2546,27 @@ with a time tag, and save this file" ;; ugly. ;; (defun ff/yank-with-xclip (&optional arg) - ;; "Paste the content of the X clipboard with the xclip -;; command. Without ARG converts some of the '\\uxxxx' characters." - ;; (interactive "P") - ;; (with-temp-buffer - ;; (shell-command "xclip -o" t) - ;; (unless arg - ;; (mapc (lambda (x) (replace-string (concat "\\u" (car x)) (cdr x) nil (point-min) (point-max))) - ;; '(("fffd" . "??") - ;; ("2013" . "-") - ;; ("2014" . "--") - ;; ("2018" . "`") - ;; ("2019" . "'") - ;; ("201c" . "``") - ;; ("201d" . "''") - ;; ("2022" . "*") - ;; ("2026" . "...") - ;; ("20ac" . "EUR") - ;; ))) - ;; (kill-ring-save (point-min) (point-max))) - - ;; (yank)) + ;; "Paste the content of the X clipboard with the xclip + ;; command. Without ARG converts some of the '\\uxxxx' characters." + ;; (interactive "P") + ;; (with-temp-buffer + ;; (shell-command "xclip -o" t) + ;; (unless arg + ;; (mapc (lambda (x) (replace-string (concat "\\u" (car x)) (cdr x) nil (point-min) (point-max))) + ;; '(("fffd" . "??") + ;; ("2013" . "-") + ;; ("2014" . "--") + ;; ("2018" . "`") + ;; ("2019" . "'") + ;; ("201c" . "``") + ;; ("201d" . "''") + ;; ("2022" . "*") + ;; ("2026" . "...") + ;; ("20ac" . "EUR") + ;; ))) + ;; (kill-ring-save (point-min) (point-max))) + + ;; (yank)) ;; (define-key global-map [(meta y)] 'ff/yank-with-xclip)