Cosmetics in the comments and strings.

[elisp.git] / emacs.el

diff --git a/emacs.el b/emacs.el
index 3e49e71..03b2bb9 100644 (file)
--- a/emacs.el
+++ b/emacs.el
@@ -130,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
 
@@ -342,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")
@@ -428,7 +434,8 @@ 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)
@@ -491,11 +498,13 @@ load-warning buffer in case of failure."
 (add-hook 'sh-mode-hook
           (lambda ()
             (set-face-attribute 'sh-heredoc nil
-                                :foreground "black"
-                                :background "#fff0f0")
+                                :foreground "#604000"
+                                :background "white"
+                                :italic t)
             (set-face-attribute 'sh-heredoc-face nil
-                                :foreground "black"
-                                :background "#fff0f0")
+                                :foreground "#604000"
+                                :background "white"
+                                :italic t)
             ))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -681,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
@@ -827,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)
 
@@ -1129,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
@@ -1192,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"
@@ -1200,7 +1215,6 @@ ff/known-address-face is used."
                                                    ;; :slant 'italic
                                                    )))
 
-
   )
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -1424,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
@@ -1444,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}
@@ -2105,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 ()
@@ -2488,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)