Update.

[elisp.git] / emacs.el

diff --git a/emacs.el b/emacs.el
index 9030548..0ea7c14 100644 (file)
--- a/emacs.el
+++ b/emacs.el
@@ -31,6 +31,9 @@
 ;; Xft.antialias: true
 ;; Xft.rgba: rgb
 
+(when (fboundp 'horizontal-scroll-bar-mode)
+  (horizontal-scroll-bar-mode -1))
+
 ;; This is where I put most of my emacs-related files
 (setq ff/emacs-dir "~/private/emacs")
 (unless (file-exists-p ff/emacs-dir)
@@ -264,8 +267,9 @@ load-warning buffer in case of failure."
 ;; Stop this crazy blinking cursor
 (blink-cursor-mode 0)
 
-;; (setq blink-cursor-delay 0.25
-;; blink-cursor-interval 0.25)
+;; (setq blink-cursor-delay 0.05
+      ;; blink-cursor-blinks 0
+      ;; blink-cursor-interval 0.25)
 
 ;; (set-terminal-coding-system 'utf-8)
 
@@ -292,8 +296,12 @@ load-warning buffer in case of failure."
  ;; This is the default coding system when toggle-input-method is
  ;; invoked (C-\)
  default-input-method "latin-1-prefix"
+
  ;; do not put tabs when indenting
  indent-tabs-mode nil
+ ;; Stop indenting automatically, that's annoying
+ electric-indent-chars nil
+
  ;; And yes, we have a fast display / connection / whatever
  baud-rate 524288
  ;; baud-rate 10
@@ -508,7 +516,7 @@ load-warning buffer in case of failure."
      (ff/mail-alarm-face :foreground "white" :background "red2")
      ;; (alarm-vc-face :foreground "black" :background "yellow" :weight 'normal)
      (gui-button-face :background "green" :foreground "black")
-    ))
+     ))
   )
 
 ;; When we are root, put the modeline in red
@@ -703,7 +711,8 @@ occurrences "
       ps-header-line-pad 0.3
       ps-header-font-family 'Courier
       ps-header-title-font-size '(8.5 . 10)
-      ps-header-font-size '(6 . 7)
+      ;; ps-header-font-size '(6 . 7)
+      ps-header-font-size '(10 . 12)
       ps-font-size '(7 . 8)
       )
 
@@ -1205,14 +1214,9 @@ ff/known-address-face is used."
     )
 
   (ff/configure-faces '((ff/robot-address-face :foreground "green4")
-                        (ff/personal-address-face :foreground "blue2" :weight 'bold)
+                        (ff/personal-address-face :foreground "dark magenta" :weight 'bold)
                         (ff/important-address-face :foreground "red3"
-                                                   ;; :foreground "blue2"
-                                                   ;; :underline t
-                                                   ;; :background "white"
-                                                   ;; :foreground "green4"
                                                    :weight 'bold
-                                                   ;; :slant 'italic
                                                    )))
 
   )
@@ -1233,15 +1237,18 @@ ff/known-address-face is used."
   "The face to display the dates in the modeline.")
 
 (defun ff/secure-note-add () (interactive)
-  (find-file ff/secure-note-file)
-
-  ;; Adds a new entry (i.e. date and a bunch of empty lines)
 
-  (goto-char (point-min))
-  (insert "-- "
-          (format-time-string "%Y %b %d %H:%M:%S" (current-time))
-          " --\n\n")
-  (previous-line 1)
+  (unless
+      (let ((b (find-buffer-visiting ff/secure-note-file)))
+        (and b (switch-to-buffer b)))
+    (find-file ff/secure-note-file)
+    ;; Adds a new entry (i.e. date and a bunch of empty lines)
+    (goto-char (point-min))
+    (insert "-- "
+            (format-time-string "%Y %b %d %H:%M:%S" (current-time))
+            " --\n\n")
+    (previous-line 1)
+  )
 
   ;; Colorizes the dates
 
@@ -1451,12 +1458,12 @@ universal argument starts xfig even if the .fig does not exist"
 \\def\\argmin{\\operatornamewithlimits{argmin}}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Sans serif fonts
-%% \\usepackage[T1]{fontenc}
-%% \\usepackage[scaled]{helvet}
-%% \\usepackage[cm]{sfmath}
-%% \\renewcommand{\\ttdefault}{pcr}
-%% \\renewcommand*\\familydefault{\\sfdefault}
+%% Open sans font
+%%\\usepackage[default]{opensans}
+%%\\usepackage{cmbright}
+%%\\renewcommand{\\familydefault}{fos}
+%%\\renewcommand{\\seriesdefault}{l}
+%%\\renewcommand{\\bfdefault}{sb}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% The \\todo command
 \\newcounter{nbdrafts}
@@ -2406,6 +2413,10 @@ proposes to visit them."
 
 (add-hook 'text-mode-hook 'tc/add-text-counters-in-modeline)
 
+;; (add-hook 'text-mode-hook
+          ;; (lambda ()
+            ;; (setq comment-start " > ")))
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; A function to remove temporary alarm windows
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -2455,7 +2466,7 @@ proposes to visit them."
   (if flyspell-mode (flyspell-mode -1)
     (flyspell-mode 1)
     (flyspell-buffer))
-)
+  )
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; The fridge!
@@ -2483,32 +2494,8 @@ with a time tag, and save this file"
     )
   )
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Let's be zen. Remove the modeline and fringes.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(setq ff/zen-original-setting nil)
-
-(defun ff/zen () (interactive)
-  (if ff/zen-original-setting
-      (setq mode-line-format (car ff/zen-original-setting)
-            fringe-mode (cdr ff/zen-original-setting)
-            ff/zen-original-setting nil)
-    (setq ff/zen-original-setting (cons mode-line-format fringe-mode)
-          mode-line-format nil
-          fringe-mode '(0 . 0))
-    (delete-other-windows)
-    )
-  (fringe-mode fringe-mode)
-  (if ff/zen-original-setting
-      (message "Zen mode")
-    (message "Cluttered mode"))
-  )
-
-;; (define-key global-map [(control x) (x)] 'ff/zen)
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; My own keymap
+;; My own keymap mapped to C-`
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (setq ff/map (make-sparse-keymap))
@@ -2517,7 +2504,7 @@ with a time tag, and save this file"
 (unless window-system
   ;; (define-key global-map [(control @)] ff/map)
   (define-key global-map [(meta O) \`] ff/map)
-)
+  )
 
 (define-key esc-map "`" ff/map)
 
@@ -2526,9 +2513,14 @@ with a time tag, and save this file"
       (git-status (file-name-directory (buffer-file-name)))
     (error "No file attached to this buffer")))
 
-(defun ff/insert-date () (interactive)
-  (insert (format-time-string "\n * %Y %b %d %H:%M:%S\n\n" (current-time)))
-  )
+(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))))
+       )
 
 (define-key ff/map [(control g)] 'ff/git-status)
 (define-key ff/map [(control w)] 'server-edit)
@@ -2576,7 +2568,6 @@ with a time tag, and save this file"
 (define-key ff/map [?\C-3] 'ff/twin-horizontal-current-buffer)
 
 (define-key ff/map " " 'delete-trailing-whitespace)
-(define-key ff/map [(control x)] 'ff/zen)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Hacks so that all keys are functionnal in xterm and through ssh.