X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=elisp.git;a=blobdiff_plain;f=emacs.el;h=d9d2ec5b7014346e289488d7769c4d161edcb6ce;hp=99c5e54ee65b8e569b8b0738040b4c17c830873e;hb=b01b564e2f6c23ab0b5440c7473c724901c600f5;hpb=2439cdd60f235b3ccde4ddc47c740e3c9ee43b99 diff --git a/emacs.el b/emacs.el index 99c5e54..d9d2ec5 100644 --- a/emacs.el +++ b/emacs.el @@ -345,6 +345,9 @@ load-warning buffer in case of failure." ;; (add-hook 'lua-mode-hook 'flyspell-prog-mode) (add-hook 'log-edit-mode-hook 'flyspell-mode) +(add-hook 'markdown-mode-hook 'flyspell-mode) +(add-hook 'markdown-mode-hook 'auto-fill-mode) + ;; I am a power-user (put 'narrow-to-region 'disabled nil) @@ -598,6 +601,8 @@ load-warning buffer in case of failure." (define-key global-map [(control c) (control q)] 'ff/delete-trailing-whitespaces-and-indent) +(define-key global-map [(control x) (control o)] 'other-window) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Playing sounds ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -639,6 +644,14 @@ load-warning buffer in case of failure." (define-key global-map [(shift down)] 'ff/comment-and-go-down) (define-key global-map [(shift up)] 'ff/uncomment-and-go-up) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(defun ff/show-compilation-buffer-split-window () + "Split the window vertically and show the compilation buffer in the newly created right one" + (interactive) + (show-buffer (split-window-right) "*compilation*") +) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Counting various entities in text ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -910,45 +923,53 @@ printer." (defun ff/system-info () (interactive) - (let ((buf (get-buffer-create "*system info*")) - (map (make-sparse-keymap))) - - (define-key map "q" 'kill-this-buffer) - (display-buffer buf) - (set-buffer buf) - (setq show-trailing-whitespace nil) - (erase-buffer) - - (let ((highlight nil)) - - (mapc (lambda (x) - (insert - (if (setq highlight (not highlight)) - (propertize - (with-temp-buffer (apply 'call-process x) - (buffer-string)) - 'face '(:background "#d0d0ff")) - (with-temp-buffer (apply 'call-process x) - (buffer-string)) - )) - ) + (let* ((buf (get-buffer-create "*system info*")) + (win (get-buffer-window buf)) + (map (make-sparse-keymap))) + + (if win + (progn + (delete-window win) + (kill-buffer buf)) + + (define-key map "q" 'kill-this-buffer) + (display-buffer buf) + (set-buffer buf) + (setq show-trailing-whitespace nil) + (erase-buffer) + + (let ((highlight nil)) + + (mapc (lambda (x) + (insert + (if (setq highlight (not highlight)) + (propertize + (with-temp-buffer (apply 'call-process x) + (buffer-string)) + 'face '(:background "#d0d0ff")) + (with-temp-buffer (apply 'call-process x) + (buffer-string)) + )) + ) - '( - ("hostname" nil t nil "-f") - ("acpi" nil t) - ("df" nil t nil "-h") - ;; ("mount" nil t) - ("ifconfig" nil t) - ("ssh-add" nil t nil "-l") - ))) + '( + ("hostname" nil t nil "-f") + ("acpi" nil t) + ("df" nil t nil "-h") + ;; ("mount" nil t) + ("ifconfig" nil t) + ("ssh-add" nil t nil "-l") + ))) - (goto-char (point-min)) - (while (re-search-forward "^$" nil t) (backward-delete-char 1)) + (goto-char (point-min)) + (while (re-search-forward "^$" nil t) (backward-delete-char 1)) - (fit-window-to-buffer (get-buffer-window buf)) - (use-local-map map) - (set-buffer-modified-p nil) - )) + (fit-window-to-buffer (get-buffer-window buf)) + (use-local-map map) + (set-buffer-modified-p nil) + ) + ) + ) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Display time @@ -970,9 +991,9 @@ printer." ,@(when (ff/battery-info-string) '((ff/battery-info-string))) - ;; '((propertize - ;; (ff/battery-info-string) - ;; 'face 'ff/battery-info-face))) + ;; '((propertize + ;; (ff/battery-info-string) + ;; 'face 'ff/battery-info-face))) " " @@ -1183,45 +1204,71 @@ goback argument, go back where we were." (define-key global-map [(meta G)] (lambda () (interactive) (ff/goto-function-definition t))) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +;; (setq python-indent-offset 4) + +;; (define-key python-mode-map [(shift right)] 'python-indent-shift-right) +;; (define-key python-mode-map [(shift left)] 'python-indent-shift-left) +;; (define-key python-mode-map [(shift right)] 'indent-rigidly-right-to-tab-stop) +;; (define-key python-mode-map [(shift left)] 'indent-rigidly-left-to-tab-stop) + +(load "vc-git") + +(defun ff/git-pull-push () (interactive) + (message "git pull / push ...") + (async-shell-command "git pull && git push" nil) + ) + +(defun ff/git-pull () (interactive) + (message "git pull ...") + (shell-command "git pull" nil) + ) + +(define-key global-map [(control x) (v) (p)] 'ff/git-pull-push) +(define-key global-map [(control x) (v) (P)] 'ff/git-pull) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; The big stuff (bbdb, mailcrypt, etc.) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Failsafe version if we can't load bbdb -(defun ff/explicit-name (email) email) +(setq bbdb-file "~/private/bbdb") -(load "vc-git") +(when (file-exists-p bbdb-file) -(when (ff/load-or-alert "bbdb") - - (setq - ;; Stop asking (if not t or nil, will not ask) - bbdb-offer-save 'never - ;; I hate when bbdb decides to mess up my windows - bbdb-use-pop-up nil - ;; I have no problem with bbdb asking me if the sender email - ;; does not match exactly the address we have in the database - bbdb-quiet-about-name-mismatches 0 - ;; I have european friends, too - bbdb-north-american-phone-numbers-p nil - ;; To cycle through all possible addresses - bbdb-complete-name-allow-cycling t - ;; Cycle with full names only, not through all net-addresses alone too - bbdb-dwim-net-address-allow-redundancy t - ;; Do not add new addresses automatically - bbdb-always-add-addresses nil - ) + ;; Failsafe version if we can't load bbdb + (defun ff/explicit-name (email) email) - (defface ff/known-address-face - '((t (:foreground "blue2"))) - "The face to display known mail identities.") + (when (ff/load-or-alert "bbdb") - (defface ff/unknown-address-face - '((t (:foreground "gray50"))) - "The face to display unknown mail identities.") + (setq + ;; Stop asking (if not t or nil, will not ask) + bbdb-offer-save 'never + ;; I hate when bbdb decides to mess up my windows + bbdb-use-pop-up nil + ;; I have no problem with bbdb asking me if the sender email + ;; does not match exactly the address we have in the database + bbdb-quiet-about-name-mismatches 0 + ;; I have european friends, too + bbdb-north-american-phone-numbers-p nil + ;; To cycle through all possible addresses + bbdb-complete-name-allow-cycling t + ;; Cycle with full names only, not through all net-addresses alone too + bbdb-dwim-net-address-allow-redundancy t + ;; Do not add new addresses automatically + bbdb-always-add-addresses nil + ) - (defun ff/explicit-name (email) - "Returns a string identity for the first address in EMAIL. The + (defface ff/known-address-face + '((t (:foreground "blue2"))) + "The face to display known mail identities.") + + (defface ff/unknown-address-face + '((t (:foreground "gray50"))) + "The face to display unknown mail identities.") + + (defun ff/explicit-name (email) + "Returns a string identity for the first address in EMAIL. The identity is taken from bbdb if possible or from the address itself with mail-extract-address-components. The suffix \"& al.\" is added if there are more than one address. @@ -1231,35 +1278,36 @@ ff/unknown-address-face. If a record is found and contains a note 'face, the associated face is used, otherwise ff/known-address-face is used." - (and email - (let* ((data (mail-extract-address-components email)) - (name (car data)) - (net (cadr data)) - (record (bbdb-search-simple nil net))) + (and email + (let* ((data (mail-extract-address-components email)) + (name (car data)) + (net (cadr data)) + (record (bbdb-search-simple nil net))) + + (concat + + (condition-case nil + (propertize (bbdb-record-name record) + 'face + (or (cdr (assoc 'face + (bbdb-record-raw-notes record))) + 'ff/known-address-face)) + (error + (propertize (or (and data (concat "<" net ">")) + "*undefined*") + 'face 'ff/unknown-address-face) + )) + (if (string-match "," (mail-strip-quoted-names email)) " & al.") + ))) + ) - (concat + (ff/configure-faces '((ff/robot-address-face :foreground "green4") + (ff/personal-address-face :foreground "dark magenta" :weight 'bold) + (ff/important-address-face :foreground "red3" + :weight 'bold + ))) - (condition-case nil - (propertize (bbdb-record-name record) - 'face - (or (cdr (assoc 'face - (bbdb-record-raw-notes record))) - 'ff/known-address-face)) - (error - (propertize (or (and data (concat "<" net ">")) - "*undefined*") - 'face 'ff/unknown-address-face) - )) - (if (string-match "," (mail-strip-quoted-names email)) " & al.") - ))) ) - - (ff/configure-faces '((ff/robot-address-face :foreground "green4") - (ff/personal-address-face :foreground "dark magenta" :weight 'bold) - (ff/important-address-face :foreground "red3" - :weight 'bold - ))) - ) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -1409,6 +1457,41 @@ universal argument starts xfig even if the .fig does not exist" (load "tex-mode") (defun tex-font-lock-suscript (pos) ()) +;; Automagically add the frame numbers in comments in a beamer file + +(defun ff/number-beamer-frames () + "Add the frame numbers as comments after each \begin{frame}" + (interactive) + + (save-excursion + (let ((total 0) + (n 1)) + + ;; First, clean-up existing numbering + (goto-char (point-min)) + (while (re-search-forward "^ *\\\\begin{frame}.*\\( %% frame [0-9]* / [0-9]*\\)$" nil t) + (kill-region (match-beginning 1) (match-end 1)) + ) + + ;; Then count the total number of frames + (goto-char (point-min)) + (while (re-search-forward "^ *\\\\begin{frame}" nil t) + (setq total (+ total 1)) + ) + + ;; Then, add the updated numbers + (goto-char (point-min)) + (while (re-search-forward "^ *\\\\begin{frame}" nil t) + (move-end-of-line 1) + (insert " %% frame " (prin1-to-string n) " / " (prin1-to-string total)) + (setq n (+ n 1)) + ) + ) + ) + + (message "Added frame numbers in comments.") + ) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Prevents many errors from beeping and makes the others play a nifty ;; sound @@ -1494,6 +1577,8 @@ universal argument starts xfig even if the .fig does not exist" \\setlength{\\parindent}{0cm} \\setlength{\\parskip}{12pt} \\renewcommand{\\baselinestretch}{1.3} +%\\setlength{\\tabcolsep}{0pt} +%\\renewcommand{\\arraystretch}{1.0} \\def\\argmax{\\operatornamewithlimits{argmax}} \\def\\argmin{\\operatornamewithlimits{argmin}} @@ -1700,17 +1785,35 @@ int main(int argc, char **argv) { require 'torch' require 'nn' -require 'nnx' -require 'optim' require 'image' -require 'pl' -require 'paths' -require 'ffmpeg' +require 'optim' ") (lua-mode) ) +(defun ff/start-python () + "Adds all the stuff to start a new python file" + (interactive) + (goto-char (point-min)) + (insert "#!/usr/bin/env python-for-pytorch + +import math + +import torch, torchvision + +from torch import Tensor +from torch import Tensor as T + +from torch import nn +from torch.nn import functional as F +from torch.nn.parameter import Parameter +from torch.nn import Module + +") + (python-mode) + ) + (defun ff/start-html () "Adds all that stuff to start a new HTML file." @@ -1753,9 +1856,7 @@ the function is invoked with a universal arg" (interactive "P") (let ((line (if arg "cerr" "cout"))) (goto-char (point-at-bol)) - ;; Regexp syntax sucks moose balls, honnest. To match '[', just - ;; put it as the first char in the [...] ... This leads to some - ;; obvious things like the following + ;; To match '[', put it as the first char in the [...] (while (re-search-forward "\\([][a-zA-Z0-9_.:\(\)]+\\)" (point-at-eol) t) (setq line (concat line " << \" " @@ -1780,17 +1881,31 @@ and refilling all the paragraphs." ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(defun ff/start-slide () - (interactive) - (insert "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +(defun ff/start-slide (universal) + (interactive "P") + + (if universal + (progn + (insert "\\end{frame} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \\begin{frame}{") + (save-excursion (insert "}{} - (save-excursion (insert "}{} +")) + ) + + (insert "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\\begin{frame}{") + + (save-excursion (insert "}{} \\end{frame} ")) + ) ) (add-hook @@ -1910,6 +2025,11 @@ a file in /tmp" (ff/start-lua) ) + (when (string-match "\\.py$" filename) + (python-mode) + (ff/start-python) + ) + (when (string-match "\\.html$" filename) (html-mode) (ff/start-html) @@ -2020,7 +2140,7 @@ a file in /tmp" (setq compilation-read-command t compile-command "make -j -k" - compile-history '("make clean" "make DEBUG=yes -j -k" "make -j -k") + ;; compile-history '("make clean" "make DEBUG=yes -j -k" "make -j -k") ) (defun ff/universal-compile (universal) (interactive "P") @@ -2505,12 +2625,15 @@ proposes to visit them." ;; The fridge! ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(defun ff/move-region-to-fridge () (interactive) +(defun ff/move-region-to-fridge (&optional universal) (interactive "P") "Cut the current region, paste it in a file called ./fridge with a time tag, and save this file" (unless (use-region-p) (error "No region selected")) (let ((bn (file-name-nondirectory (buffer-file-name)))) - (kill-region (region-beginning) (region-end)) + (if universal + (copy-region-as-kill (region-beginning) (region-end)) + (kill-region (region-beginning) (region-end)) + ) (with-current-buffer (find-file-noselect "fridge") (goto-char (point-max)) (insert "\n") @@ -2534,6 +2657,14 @@ with a time tag, and save this file" (setq ff/map (make-sparse-keymap)) (define-key global-map [(control \`)] ff/map) +;; (defun ff/start-stop-macro-recording () (interactive) + ;; (if (or defining-kbd-macro executing-kbd-macro) + ;; (kmacro-end-macro) + ;; (kmacro-start-macro)) + ;; ) + +;; (define-key global-map [(shift return)] 'ff/start-stop-macro-recording) + (unless window-system ;; (define-key global-map [(control @)] ff/map) (define-key global-map [(meta O) \`] ff/map) @@ -2553,16 +2684,16 @@ with a time tag, and save this file" (error "No file attached to this buffer"))) (defun ff/insert-date (&optional universal) (interactive "P") - ;; (insert (format-time-string "\n * %Y %b %d %H:%M:%S\n\n" (current-time))) - ;; (insert (format-time-string "%Y %b %d %H:%M:%S" (current-time))) - ;; (insert (format-time-string "%d.%m.%y" (current-time))) - (if universal - (insert (format-time-string "%d.%m.%Y %H:%M:%S" (current-time))) - (insert (format-time-string "%d.%m.%Y" (current-time)))) + (insert (format-time-string "\n * %H:%M:%S %A %B %d, %Y\n\n" (current-time))) + ;; ;; (insert (format-time-string "%Y %b %d %H:%M:%S" (current-time))) + ;; ;; (insert (format-time-string "%d.%m.%y" (current-time))) + ;; (if universal + ;; (insert (format-time-string "%d.%m.%Y %H:%M:%S" (current-time))) + ;; (insert (format-time-string "%d.%m.%Y" (current-time)))) ) (define-key ff/map [(control g)] 'ff/git-status) -(define-key ff/map [(control w)] 'server-edit) +;; (define-key ff/map [(control w)] 'server-edit) (define-key ff/map [(control d)] 'ff/elisp-debug-on) ;; (define-key ff/map "d" 'diary) (define-key ff/map "d" 'ff/insert-date) @@ -2574,7 +2705,8 @@ with a time tag, and save this file" (define-key ff/map [(control a)] 'auto-fill-mode) (define-key ff/map [(control i)] 'ff/system-info) (define-key ff/map "w" 'ff/word-occurences) -(define-key ff/map [(control c)] 'calendar) +;; (define-key ff/map [(control c)] 'calendar) +(define-key ff/map [(control c)] 'ff/show-compilation-buffer-split-window) ;; (define-key ff/map [(control c)] (lambda () (interactive) (save-excursion (calendar)))) (define-key ff/map [(control l)] 'goto-line) (define-key ff/map "l" 'longlines-mode) @@ -2591,6 +2723,7 @@ with a time tag, and save this file" (define-key ff/map [(control m)] 'woman) (define-key ff/map "b" 'bookmark-jump) (define-key ff/map [(control =)] 'calc) +(define-key ff/map "=" 'ff/number-beamer-frames) (define-key ff/map [(control shift b)] (lambda () (interactive) (bookmark-set) @@ -2773,28 +2906,26 @@ With argument ARG, do this that many times." ;; Privacy ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Where to save the bookmarks and where is bbdb +;; Where to save the bookmarks (setq bookmark-default-file (concat ff/emacs-dir "/bmk") - bbdb-file "~/private/bbdb" custom-file (concat ff/emacs-dir "/custom")) ;; enotes.el is one of my own scripts, check my web page -(when (ff/load-or-alert "enotes" t) - (setq enotes/file "~/private/enotes" - enotes/show-help nil - enotes/full-display nil - enotes/default-time-fields "9:30") - - (enotes/init) - ;; (add-hook 'enotes/alarm-hook - ;; (lambda () (ff/play-sound-async "~/local/sounds/three_notes2.wav"))) +;; ** ;; (when (ff/load-or-alert "enotes" t) +;; ** ;; (setq enotes/file "~/private/enotes" +;; ** ;; enotes/show-help nil +;; ** ;; enotes/full-display nil +;; ** ;; enotes/default-time-fields "9:30") +;; ** ;; +;; ** ;; (enotes/init) +;; ** ;; ) + +(when (ff/load-or-alert "goto-last-change.el") + (define-key global-map [(control -)] 'goto-last-change) ) -;; (when (ff/load-or-alert "goto-last-change.el") -;; (define-key global-map [(control x) (control a)] 'goto-last-change)) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; My private stuff (email adresses, mail filters, etc.) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;