X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=emacs.el;h=781cd839bb00625b745a79ee16c42f42b553a45d;hb=ae03de07c48254ed13e6d41fad59ded5709215fa;hp=63b51c3eae4b6d820d4657a9dca3ba9eb2d927b7;hpb=10b4d5177ae8d16fd25bad4a4a960b8563f5bea6;p=elisp.git

diff --git a/emacs.el b/emacs.el
index 63b51c3..781cd83 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
@@ -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)
@@ -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")))
    ))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -2331,21 +2294,6 @@ 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
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -2405,6 +2353,16 @@ proposes to visit them."
    )
   )
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; My script to automatically count the number of words and characters
+;; between two markers
+
+(ff/load-or-alert "text-counters.el")
+
+;; Display them in the modeline when in text-mode
+
+(add-hook 'text-mode-hook 'tc/add-text-counters-in-modeline)
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; A function to remove temporary alarm windows
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;