X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=elisp.git;a=blobdiff_plain;f=emacs.el;h=77626cf05e59de2a923421b58923a194eecad9f0;hp=636b90efddeee61e85cdff436f53dc5038f7412b;hb=3435c1b2ecff7b6c318809b9f316a6b3e9ac4a02;hpb=4a6b190fd5ebdcf5846421383b1f1211b64a6786

diff --git a/emacs.el b/emacs.el
index 636b90e..77626cf 100644
--- 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)
@@ -63,6 +66,10 @@
 ;; Make all "yes or no" prompts be "y or n" instead
 (fset 'yes-or-no-p 'y-or-n-p)
 
+;; The space bar acting as "yes" has been several times really
+;; problematic.
+(define-key query-replace-map (kbd "SPC") nil)
+
 ;; Show the matching parenthesis and do it immediately, we are in a
 ;; hurry
 (setq show-paren-delay 0)
@@ -288,8 +295,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
@@ -390,8 +401,8 @@ load-warning buffer in case of failure."
   (ff/configure-faces
    '((italic :underline nil)
      (info-title-2 :foreground "green")
-     (font-lock-comment-delimiter-face :foreground "black")
-     (font-lock-comment-face :foreground "black")
+     (font-lock-comment-delimiter-face :foreground "green")
+     (font-lock-comment-face :foreground "green")
      (cperl-array-face :background "gray90" :foreground "blue" :weight 'bold)
      (cperl-hash-face :background "gray90" :foreground "purple" :weight 'bold)
      (diff-added :background "gray90" :foreground "green4" :weight 'bold)
@@ -435,10 +446,8 @@ load-warning buffer in case of failure."
      (selector/selection :background "yellow")
      (gui-button-face :background "green" :foreground "white")
      (enotes/information-face :foreground "cyan")
+
      (file-name-shadow :foreground "black")
-     (font-lock-comment-delimiter-face :foreground "magenta")
-     (font-lock-comment-face :foreground "blue")
-     (font-lock-variable-name-face :foreground "green")
      (shadow :foreground "black")
      (warning :foreground "black" :background "red")
      ))
@@ -506,7 +515,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
@@ -1449,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}
@@ -2453,7 +2462,7 @@ proposes to visit them."
   (if flyspell-mode (flyspell-mode -1)
     (flyspell-mode 1)
     (flyspell-buffer))
-)
+  )
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; The fridge!
@@ -2481,32 +2490,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))
@@ -2515,7 +2500,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)
 
@@ -2574,7 +2559,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.