X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=emacs.el;h=99c5e54ee65b8e569b8b0738040b4c17c830873e;hb=2439cdd60f235b3ccde4ddc47c740e3c9ee43b99;hp=bd8ada27f3f5fa00b4b8eb7962f5176682a1ca3a;hpb=ccf4141d0aa6fc7f73567e99d07d8e389ec638cf;p=elisp.git diff --git a/emacs.el b/emacs.el index bd8ada2..99c5e54 100644 --- a/emacs.el +++ b/emacs.el @@ -31,9 +31,11 @@ ;; Xft.antialias: true ;; Xft.rgba: rgb -(set-default-font "Inconsolata 15") +;; (set-default-font "Inconsolata 15") -;; (set-default-font "Bitstream vera sans mono-12") +;; (package-initialize) + +(set-default-font "Bitstream vera sans mono-12") ;; (set-default-font "Liberation Mono-13") ;; (set-default-font "DejaVu sans mono 15") ;; (set-default-font "Droid sans mono 13") @@ -340,6 +342,7 @@ load-warning buffer in case of failure." (flyspell-mode)))) (add-hook 'c++-mode-hook 'flyspell-prog-mode) +;; (add-hook 'lua-mode-hook 'flyspell-prog-mode) (add-hook 'log-edit-mode-hook 'flyspell-mode) ;; I am a power-user @@ -452,6 +455,7 @@ load-warning buffer in case of failure." (fringe :background "gray80") (ff/date-info-face :foreground "white") (ff/battery-info-face :foreground "black") + (ff/battery-info-alarm-face :foreground "red") ;; (ff/mail-alarm-face :foreground "white" :background "red2") ;; (alarm-vc-face :foreground "black" :background "yellow" :weight 'normal) (gui-button-face :background "green" :foreground "black") @@ -505,6 +509,7 @@ load-warning buffer in case of failure." (region :background "white" :foreground "black") (ff/date-info-face :foreground "white" :weight 'bold) (ff/battery-info-face :foreground "black") + (ff/battery-info-alarm-face :foreground "red") ;; (ff/mail-alarm-face :foreground "red" :weight 'bold) (selector/selection :background "yellow") (gui-button-face :background "green" :foreground "white") @@ -878,8 +883,23 @@ printer." ;; (`charging (format "c%d%%" (ff/battery-percent))) ;; (`discharging (format "d%d%%" (ff/battery-percent))) ;; (`unknown "f") - (`charging (format "↑%d%%" (ff/battery-percent))) - (`discharging (format "↓%d%%" (ff/battery-percent))) + + (`charging + (let ((p (ff/battery-percent))) + (if (> p 10) + (propertize (format "↑%d%%" p) 'face 'ff/battery-info-face) + (propertize (format "↑%d%%" p) 'face 'ff/battery-info-alarm-face)) + ) + ) + + (`discharging + (let ((p (ff/battery-percent))) + (if (> p 10) + (propertize (format "↓%d%%" p) 'face 'ff/battery-info-face) + (propertize (format "↓%d%%" p) 'face 'ff/battery-info-alarm-face)) + ) + ) + ;; (`unknown "✱") (`unknown "F") (_ "?")) @@ -944,13 +964,15 @@ printer." " " - ,@(when (ff/battery-info-string) + ,@(when (ff/temp-info-string) '((ff/temp-info-string))) ,@(when (ff/battery-info-string) - '((propertize - (ff/battery-info-string) - 'face 'ff/battery-info-face))) + '((ff/battery-info-string))) + + ;; '((propertize + ;; (ff/battery-info-string) + ;; 'face 'ff/battery-info-face))) " " @@ -1670,6 +1692,26 @@ int main(int argc, char **argv) { ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(defun ff/start-lua () + "Adds all the stuff to start a new lua file" + (interactive) + (goto-char (point-min)) + (insert "#!/usr/bin/env luajit + +require 'torch' +require 'nn' +require 'nnx' +require 'optim' +require 'image' +require 'pl' +require 'paths' +require 'ffmpeg' + +") + (lua-mode) + ) + + (defun ff/start-html () "Adds all that stuff to start a new HTML file." (interactive) @@ -1863,6 +1905,11 @@ a file in /tmp" (ff/add-copyrights)) ) + (when (string-match "\\.lua$" filename) + (lua-mode) + (ff/start-lua) + ) + (when (string-match "\\.html$" filename) (html-mode) (ff/start-html) @@ -1976,7 +2023,7 @@ a file in /tmp" compile-history '("make clean" "make DEBUG=yes -j -k" "make -j -k") ) -(defun ff/universal-compile () (interactive) +(defun ff/universal-compile (universal) (interactive "P") (funcall (or (cdr (assoc major-mode '( (latex-mode . tex-file) @@ -2079,7 +2126,7 @@ This may be a useful alternative binding for \\[delete-other-windows] (while (re-search-forward "[0-9\.]+" nil t) (let ((value (string-to-number (buffer-substring (match-beginning 0) (match-end 0))))) (delete-region (match-beginning 0) (match-end 0)) - (insert (format "%0.3f" value))))))) + (insert (format "%0.1e" value))))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Keymaping @@ -2278,7 +2325,7 @@ next one. With universal argument, kill all killable buffers." "svn-commit.tmp$" ".git/COMMIT_EDITMSG$" "\.bbl$" "\.aux$" "\.toc$" )) - recentf-max-saved-items 1000 + recentf-max-saved-items 10000 recentf-save-file (concat ff/emacs-dir "/recentf") ) @@ -2316,6 +2363,7 @@ next one. With universal argument, kill all killable buffers." media/duration-to-history 30 media/history-size 1000 media/playlist-file (concat ff/emacs-dir "/media-playlists") + media/continue-mode-hint (if window-system "⤸" "*") media/mplayer/args '( "-framedrop" "-zoom" @@ -2326,6 +2374,7 @@ next one. With universal argument, kill all killable buffers." ) media/mplayer/timing-request-period 1.0 ) + ) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -2492,6 +2541,12 @@ with a time tag, and save this file" (define-key esc-map "`" ff/map) +(defun ff/kill-downto-signature () (interactive) + (let ((s (point))) + (when (re-search-forward "^-- $") + (kill-region s (match-beginning 0)) + (goto-char s)))) + (defun ff/git-status (&optional dir) (interactive) (if (buffer-file-name) (git-status (file-name-directory (buffer-file-name))) @@ -2542,6 +2597,7 @@ with a time tag, and save this file" (bookmark-save))) (define-key ff/map "f" 'ff/move-region-to-fridge) (define-key ff/map [(control f)] 'ff/flyspell-mode) +(define-key ff/map [(control k)] 'ff/kill-downto-signature) (define-key ff/map [?\C-0] 'ff/delete-annoying-windows) (define-key ff/map "1" 'delete-other-windows)