X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=emacs.el;h=4328fb5d5c80a7430355d4c11005f71a1c885001;hb=5f219784ed5b5f3a2e53591f39fef83771dd0ea0;hp=aa22459a6118f3ae7460ac941dde6dd037b06063;hpb=0600e35543a1f991515a6c42a6bf1cdb4e8eaf4e;p=elisp.git diff --git a/emacs.el b/emacs.el index aa22459..4328fb5 100644 --- a/emacs.el +++ b/emacs.el @@ -48,7 +48,7 @@ (menu-bar-mode -1) ;; Nor fringes -(when (functionp 'fringe-mode) (fringe-mode '(0 . 0))) +;; (when (functionp 'fringe-mode) (fringe-mode '(0 . 0))) ;; (when (functionp 'fringe-mode) (fringe-mode '(0 . 1))) ;; And I do not like scrollbar neither @@ -137,8 +137,6 @@ load-warning buffer in case of failure." ;; (setq x-select-enable-clipboard t) ;; (global-set-key "\C-y" 'clipboard-yank) - - (setq message-log-max 1000 @@ -297,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) @@ -435,6 +435,7 @@ load-warning buffer in case of failure." (ff/configure-faces '( ;; (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) @@ -478,12 +479,11 @@ load-warning buffer in case of failure." (mode-line-inactive :background "#b0b0b0" :foreground "black" :box nil :inverse-video nil) ;; (fringe :background "black" :foreground "gray90") - (fringe :background "gray65") - (tex-verbatim :family "courrier") + (fringe :background "gray75") (ff/date-info-face :foreground "white" :weight 'bold) (ff/mail-alarm-face :foreground "white" :background "red2") ;; (alarm-vc-face :foreground "black" :background "yellow" :weight 'normal) - )) + )) ) ;; When we are root, put the modeline in red @@ -605,31 +605,6 @@ load-warning buffer in case of failure." ;; Counting various entities in text ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(defun ff/count-char () - "Prints the number of characters between the first previous \"--\" -and the firt next \"--\"." - (interactive) - (let ((from (save-excursion (re-search-backward "^--$\\|BEGIN_COUNT" nil t))) - (to (save-excursion (re-search-forward "^--$\\|END_COUNT" nil t)))) - (if (and to from) (message "%d character(s)" (- to from 6)) - (error "Can not find the -- delimiters")))) - -(defun ff/count-words () - "Print number of words between the first previous \"--\" and the -firt next \"--\"." - (interactive) - (let ((from (save-excursion (re-search-backward "^--$" nil t))) - (to (save-excursion (re-search-forward "^--$" nil t)))) - (if (and to from) - (save-excursion - (goto-char from) - (let ((count 0)) - (while (< (point) to) - (re-search-forward "\\w+\\W+") - (setq count (1+ count))) - (message "%d word(s)" count))) - (error "Can not find the -- delimiters")))) - (defun ff/word-occurences () "Display in a new buffer the list of words sorted by number of occurrences " @@ -1229,7 +1204,7 @@ ff/known-address-face is used." ) (defface ff/secure-date - '((t (:background "gold" :weight bold))) + '((t (:background "white" :weight bold))) "The face to display the dates in the modeline.") (defun ff/secure-note-add () (interactive) @@ -1240,7 +1215,7 @@ ff/known-address-face is used." (goto-char (point-min)) (insert "-- " (format-time-string "%Y %b %d %H:%M:%S" (current-time)) - " ------------------------------------------------\n\n") + " --\n\n") (previous-line 1) ;; Colorizes the dates @@ -1248,10 +1223,11 @@ ff/known-address-face is used." (save-excursion (goto-char (point-min)) (while (re-search-forward - "^-+ [0-9]+ [a-z]+ [0-9]+ [0-9]+:[0-9]+:[0-9]+.+$" + "^-- [0-9]+ [a-z]+ [0-9]+ [0-9]+:[0-9]+:[0-9]+ -+$" nil t) (add-text-properties - (match-beginning 0) (match-end 0) '(face ff/secure-date)))) + (match-beginning 0) (1+ (match-end 0)) + '(face ff/secure-date rear-nonsticky t)))) (set-buffer-modified-p nil) (setq buffer-undo-list nil) @@ -1434,7 +1410,7 @@ 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} @@ -1726,21 +1702,8 @@ and refilling all the paragraphs." (define-key latex-mode-map [(control c) (control a)] 'align-current) (define-key latex-mode-map [(control end)] 'tex-close-latex-block) (define-key latex-mode-map [(control tab)] 'ispell-complete-word) - ;; 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]*\\($\\|%\\)\\)")) - ;; (flyspell-mode 1) - ;; (reftex-mode 1) + (copy-face 'default 'tex-verbatim) + ;; (ff/configure-faces '((tex-verbatim :background "gray95"))) )) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -1839,7 +1802,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)) ) @@ -2390,6 +2353,14 @@ proposes to visit them." ) ) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(load "text-counters.el") + +;; Add them when entering the text-mode + +(add-hook 'text-mode-hook 'tc/add-text-counters-in-modeline) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; A function to remove temporary alarm windows ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;