X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=elisp.git;a=blobdiff_plain;f=emacs.el;h=6d4ffe8cad3efe1ec8ebd8abe04975e600e9881a;hp=4328fb5d5c80a7430355d4c11005f71a1c885001;hb=41d67536a6418bc1b6259cc3f390b892cb931417;hpb=5f219784ed5b5f3a2e53591f39fef83771dd0ea0
diff --git a/emacs.el b/emacs.el
index 4328fb5..6d4ffe8 100644
--- a/emacs.el
+++ b/emacs.el
@@ -31,6 +31,21 @@
;; Xft.antialias: true
;; Xft.rgba: rgb
+;; (set-default-font "Bitstream vera sans mono-12")
+;; (set-default-font "Liberation Mono-13")
+(set-default-font "Inconsolata 15")
+;; (set-default-font "DejaVu sans mono 11")
+;; (set-default-font "Droid sans mono 13")
+;; (set-default-font "Opensans 10")
+
+(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)
+ (mkdir ff/emacs-dir t))
+
;; Give the focus to the emacs window if we are under a windowing
;; system
@@ -50,6 +65,7 @@
;; Nor fringes
;; (when (functionp 'fringe-mode) (fringe-mode '(0 . 0)))
;; (when (functionp 'fringe-mode) (fringe-mode '(0 . 1)))
+(when (functionp 'fringe-mode) (fringe-mode 10))
;; And I do not like scrollbar neither
(when (functionp 'scroll-bar-mode) (scroll-bar-mode -1))
@@ -57,6 +73,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)
@@ -70,10 +90,11 @@
)
;; Activate the dynamic completion of buffer names
-(iswitchb-mode 1)
+;; (iswitchb-mode 1)
+;; (load "lcomplete")
;; Save the minibuffer history
-(setq savehist-file "~/private/emacs/savehist")
+(setq savehist-file (concat ff/emacs-dir "/savehist"))
(when (functionp 'savehist-mode) (savehist-mode 1))
;; And allow minibuffer recursion
@@ -208,7 +229,8 @@ load-warning buffer in case of failure."
;; And I like ascii files
epa-armor t
- tramp-default-method "ssh"
+ ;; tramp-default-method "ssh"
+ tramp-default-method "scp"
;; I have no problem with files having their own local variables
enable-local-eval t
@@ -219,6 +241,12 @@ load-warning buffer in case of failure."
mc-use-default-recipients t
;; browse-url-new-window-flag t
+
+ ;; I do not like compilation to automatically split the active window
+ ;; vertically, even when the said window is very wide
+ split-height-threshold 0
+ split-width-threshold nil
+
)
;; The backups
@@ -247,7 +275,8 @@ load-warning buffer in case of failure."
;; Stop this crazy blinking cursor
(blink-cursor-mode 0)
-;; (setq blink-cursor-delay 0.25
+;; (setq blink-cursor-delay 0.05
+;; blink-cursor-blinks 0
;; blink-cursor-interval 0.25)
;; (set-terminal-coding-system 'utf-8)
@@ -275,8 +304,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
@@ -295,12 +328,14 @@ load-warning buffer in case of failure."
;; What modes for what file extentions
(add-to-list 'auto-mode-alist '("\\.h\\'" . c++-mode))
+(add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode))
+
(require 'org-table)
(add-to-list 'auto-mode-alist '("\\.txt\\'" . (lambda()
(text-mode)
(orgtbl-mode)
- (auto-fill-mode)
+ ;; (auto-fill-mode)
(flyspell-mode))))
(add-hook 'c++-mode-hook 'flyspell-prog-mode)
@@ -377,6 +412,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 "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)
@@ -393,11 +430,10 @@ load-warning buffer in case of failure."
(font-lock-string-face :foreground "green")
(font-lock-variable-name-face :foreground "blue")
(font-lock-constant-face :foreground "blue")
- (font-lock-function-name-face :foreground "blue")
(font-lock-preprocessor-face :foreground "green")
(font-lock-function-name-face :foreground "cyan")
- (flyspell-incorrect-face :foreground "red2")
- (flyspell-duplicate-face :foreground "OrangeRed2")
+ (flyspell-incorrect :foreground "red2")
+ (flyspell-duplicate :foreground "OrangeRed2")
(hl-line :background "white")
(sh-heredoc :foreground "black" :background "#fff0f0")
(sh-heredoc-face :foreground "black" :background "#fff0f0")
@@ -415,11 +451,16 @@ load-warning buffer in case of failure."
:inverse-video nil)
(mode-line-inactive :background "gray60" :foreground "black" :box nil
:inverse-video nil)
- (region :background "springgreen2")
+ (region :background "white" :foreground "black")
(ff/date-info-face :foreground "white" :weight 'bold)
(ff/mail-alarm-face :foreground "red" :weight 'bold)
+ (selector/selection :background "yellow")
(gui-button-face :background "green" :foreground "white")
(enotes/information-face :foreground "cyan")
+
+ (file-name-shadow :foreground "black")
+ (shadow :foreground "black")
+ (warning :foreground "black" :background "red")
))
)
@@ -452,11 +493,12 @@ load-warning buffer in case of failure."
(font-lock-builtin-face :foreground "deeppink3")
(font-lock-string-face :foreground "dark olive green")
(font-lock-variable-name-face :foreground "sienna")
- (font-lock-function-name-face :foreground "blue4" :weight 'bold)
+ ;; (font-lock-function-name-face :foreground "blue" :weight 'bold)
+ (font-lock-function-name-face :foreground "blue")
;; (font-lock-comment-delimiter-face :foreground "dark violet")
;; (font-lock-comment-face :foreground "dark violet")
- (flyspell-incorrect-face :foreground "red2")
- (flyspell-duplicate-face :foreground "OrangeRed2")
+ (flyspell-incorrect :background "#ff0000" :foreground "black")
+ (flyspell-duplicate :background "#ff9000" :foreground "black")
(hl-line :background "white")
(sh-heredoc :foreground "black" :background "#fff0f0")
(sh-heredoc-face :foreground "black" :background "#fff0f0")
@@ -476,14 +518,15 @@ load-warning buffer in case of failure."
:inverse-video nil)
(header-line :background "cornflowerblue" :foreground "black" :box nil
:inverse-video nil)
- (mode-line-inactive :background "#b0b0b0" :foreground "black" :box nil
+ (mode-line-inactive :background "gray80" :foreground "black" :box nil
:inverse-video nil)
;; (fringe :background "black" :foreground "gray90")
- (fringe :background "gray75")
+ (fringe :background "gray80")
(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)
- ))
+ (gui-button-face :background "green" :foreground "black")
+ ))
)
;; When we are root, put the modeline in red
@@ -541,6 +584,16 @@ load-warning buffer in case of failure."
(define-key global-map [(meta up)] 'ff/scroll-down)
(define-key global-map [(meta down)] 'ff/scroll-up)
+
+(define-key global-map [(meta shift up)]
+ (lambda () (interactive) (condition-case nil (scroll-down 10) (error nil))))
+
+(define-key global-map [(meta shift down)]
+ (lambda () (interactive) (condition-case nil (scroll-up 10) (error nil))))
+
+;; (define-key global-map [(meta shift up)] (lambda () (interactive) (ff/scroll-down 10)))
+;; (define-key global-map [(meta shift down)] 'ff/scroll-up)
+
(define-key global-map [(meta p)] 'ff/scroll-down)
(define-key global-map [(meta n)] 'ff/scroll-up)
(define-key global-map [(meta right)] 'ff/scroll-left)
@@ -678,7 +731,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)
)
@@ -764,10 +818,12 @@ printer."
;; Dealing with the laptop battery
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(defcustom ff/battery-dir "/sys/class/power_supply/BAT0"
+(defcustom ff/battery-dirs '("/sys/class/power_supply/BAT0"
+ "/sys/class/power_supply/BAT1")
"*Where to gather the battery information")
-(defcustom ff/temperature-file "/sys/class/thermal/thermal_zone0/temp"
+(defcustom ff/temperature-files '("/sys/class/thermal/thermal_zone0/temp"
+ "/sys/class/thermal/thermal_zone1/temp")
"*Where to gather the thermal information")
(defun ff/file-first-line (file)
@@ -775,99 +831,122 @@ printer."
(insert-file-contents-literally file)
(buffer-substring (point-at-bol) (point-at-eol))))
-(defun ff/battery-percent (prefix)
+(defun ff/battery-discharging (l)
+ (and l (or (string= (ff/file-first-line (concat (car l) "/status")) "Discharging")
+ (ff/battery-discharging (cdr l)))))
+
+;; If there is one "Discharging" among the states of all the
+;; batteries, the global state is 'discharging. Otherwise, if there is
+;; a "Charging", the state is 'charging. If none is true, it is
+;; 'unknown
+(defun ff/battery-state (l)
+ (if l
+ (let ((u (ff/file-first-line (concat (car l) "/status"))))
+ (if (string= u "Discharging") 'discharging
+ (let ((s (ff/battery-state (cdr l))))
+ (if (eq s 'discharging) 'discharging
+ (if (or (eq s 'charging) (string= u "Charging"))
+ 'charging
+ 'unknown))
+ )
+ )
+ )
+ 'unknown))
+
+(defun ff/sum-values-from-files (list-files prefix)
+ (apply '+
+ (mapcar
+ (lambda (f)
+ (condition-case nil
+ (string-to-number (ff/file-first-line (format "%s/%s" f prefix)))
+ (error 0))
+ )
+ list-files)))
+
+(defun ff/battery-percent ()
(condition-case nil
- (/ (* 100 (string-to-number (ff/file-first-line (format "%s/%s_now" ff/battery-dir prefix))))
- (string-to-number (ff/file-first-line (format "%s/%s_full" ff/battery-dir prefix))))
+ (/ (* 100 (ff/sum-values-from-files ff/battery-dirs "energy_now"))
+ (ff/sum-values-from-files ff/battery-dirs "energy_full"))
(error -1))
)
-(defun ff/laptop-info-string () (interactive)
- (condition-case nil
- (concat
-
- ;; The temperature
+(defun ff/temp-and-battery-info-string () (interactive)
+ (condition-case nil
+ (concat
- (let ((temp (/ (string-to-number (ff/file-first-line ff/temperature-file)) 1000)))
- (if (> temp 50)
- (concat
- (let ((s (format "%dC " temp)))
- (if (> temp 65) (propertize s 'face
- 'font-lock-warning-face)
- s))
+ ;; The temperature
+
+ (let ((temp (/
+ (apply 'max (mapcar
+ (lambda (f) (string-to-number (ff/file-first-line f)))
+ ff/temperature-files))
+ 1000)))
+
+ (if (> temp 50)
+ (let ((s (format "%dC " temp)))
+ (if (> temp 70)
+ (propertize s 'face 'font-lock-warning-face)
+ s)
+ )
+ )
)
- )
- )
- ;; The battery
+ ;; The battery
- (let ((battery-status (ff/file-first-line (concat ff/battery-dir "/status"))))
+ (pcase (ff/battery-state ff/battery-dirs)
+ (`charging (format "c%d%%" (ff/battery-percent)))
+ (`discharging (format "d%d%%" (ff/battery-percent)))
+ (`unknown "f")
+ (_ "?"))
- (cond
- ((string= battery-status "Full") "L")
-
- ((string= battery-status "Charging")
- (format "L%d%%" (max (ff/battery-percent "charge")
- (ff/battery-percent "energy"))))
-
- ((string= battery-status "Discharging")
- (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)
-
- ))
+ )
+ (error nil))
)
- (error nil))
- )
-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defun ff/system-info () (interactive)
- (let ((buf (get-buffer-create "*system info*"))
- (map (make-sparse-keymap)))
-
- (define-key map "q" 'kill-this-buffer)
- (display-buffer buf)
- (set-buffer buf)
- (setq show-trailing-whitespace nil)
- (erase-buffer)
-
- (let ((highlight nil))
-
- (mapc (lambda (x)
- (insert
- (if (setq highlight (not highlight))
- (propertize
- (with-temp-buffer (apply 'call-process x)
- (buffer-string))
- 'face '(:background "#c0c0ff"))
- (with-temp-buffer (apply 'call-process x)
- (buffer-string))
- ))
- )
-
- '(
- ("hostname" nil t nil "-v")
- ("acpi" nil t)
- ("df" nil t nil "-h")
- ;; ("mount" nil t)
- ("ifconfig" nil t)
- ("ssh-add" nil t nil "-l")
- )))
-
- (goto-char (point-min))
- (while (re-search-forward "^$" nil t) (backward-delete-char 1))
-
- (fit-window-to-buffer (get-buffer-window buf))
- (use-local-map map)
- (set-buffer-modified-p nil)
- ))
+ (let ((buf (get-buffer-create "*system info*"))
+ (map (make-sparse-keymap)))
+
+ (define-key map "q" 'kill-this-buffer)
+ (display-buffer buf)
+ (set-buffer buf)
+ (setq show-trailing-whitespace nil)
+ (erase-buffer)
+
+ (let ((highlight nil))
+
+ (mapc (lambda (x)
+ (insert
+ (if (setq highlight (not highlight))
+ (propertize
+ (with-temp-buffer (apply 'call-process x)
+ (buffer-string))
+ 'face '(:background "#c0c0ff"))
+ (with-temp-buffer (apply 'call-process x)
+ (buffer-string))
+ ))
+ )
+
+ '(
+ ("hostname" nil t nil "-f")
+ ("acpi" nil t)
+ ("df" nil t nil "-h")
+ ;; ("mount" nil t)
+ ("ifconfig" nil t)
+ ("ssh-add" nil t nil "-l")
+ )))
+
+ (goto-char (point-min))
+ (while (re-search-forward "^$" nil t) (backward-delete-char 1))
+
+ (fit-window-to-buffer (get-buffer-window buf))
+ (use-local-map map)
+ (set-buffer-modified-p nil)
+ ))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Make a sound when there is new mail
@@ -904,6 +983,9 @@ printer."
;; " ")
;; )
+ ,(if (ff/temp-and-battery-info-string)
+ '(concat (ff/temp-and-battery-info-string) " "))
+
(propertize (concat 24-hours ":" minutes
" "
dayname " "
@@ -913,9 +995,6 @@ printer."
load
- ,(if (ff/laptop-info-string)
- '(concat " " (ff/laptop-info-string)))
-
)
;; display-time-format "%b %a %e %H:%M"
@@ -949,8 +1028,13 @@ printer."
(setq list (cdr list)))
(switch-to-buffer found)))
-(define-key global-map [?\C-x right] 'ff/next-buffer)
-(define-key global-map [?\C-x left] 'ff/prev-buffer)
+;; (define-key global-map [?\C-x right] 'ff/next-buffer)
+;; (define-key global-map [?\C-x left] 'ff/prev-buffer)
+;; (define-key global-map [?\M-\]] 'ff/next-buffer)
+;; (define-key global-map [?\M-\[] 'ff/prev-buffer)
+
+(define-key global-map [(meta right)] 'ff/next-buffer)
+(define-key global-map [(meta left)] 'ff/prev-buffer)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; There is actually a decent terminal emulator in emacs!
@@ -959,15 +1043,15 @@ printer."
(load "term")
(defun ff/kill-associated-buffer (process str) (interactive)
- (let ((buffer (process-buffer process)))
- (kill-buffer buffer))
- (message "Process finished (%s)" (replace-regexp-in-string "\n$" "" str)))
+ (let ((buffer (process-buffer process)))
+ (kill-buffer buffer))
+ (message "Process finished (%s)" (replace-regexp-in-string "\n$" "" str)))
(defun ff/kill-associated-buffer-and-delete-windows (process str) (interactive)
- (let ((buffer (process-buffer process)))
- (delete-windows-on buffer)
- (kill-buffer buffer))
- (message "Process finished (%s)" (replace-regexp-in-string "\n$" "" str)))
+ (let ((buffer (process-buffer process)))
+ (delete-windows-on buffer)
+ (kill-buffer buffer))
+ (message "Process finished (%s)" (replace-regexp-in-string "\n$" "" str)))
(defun ff/shell-new-buffer (buffername program &rest param)
"Start a terminal-emulator in a new buffer with the shell PROGRAM,
@@ -1180,14 +1264,9 @@ 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"
- ;; :foreground "green4"
+ (ff/personal-address-face :foreground "dark magenta" :weight 'bold)
+ (ff/important-address-face :foreground "red3"
:weight 'bold
- ;; :slant 'italic
)))
)
@@ -1208,30 +1287,33 @@ 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)
+ (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)
+ )
- (goto-char (point-min))
- (insert "-- "
- (format-time-string "%Y %b %d %H:%M:%S" (current-time))
- " --\n\n")
- (previous-line 1)
+ ;; Colorizes the dates
- ;; Colorizes the dates
+ (save-excursion
+ (goto-char (point-min))
+ (while (re-search-forward
+ "^-- [0-9]+ [a-z]+ [0-9]+ [0-9]+:[0-9]+:[0-9]+ -+$"
+ nil t)
+ (add-text-properties
+ (match-beginning 0) (1+ (match-end 0))
+ '(face ff/secure-date rear-nonsticky t))))
- (save-excursion
- (goto-char (point-min))
- (while (re-search-forward
- "^-- [0-9]+ [a-z]+ [0-9]+ [0-9]+:[0-9]+:[0-9]+ -+$"
- nil t)
- (add-text-properties
- (match-beginning 0) (1+ (match-end 0))
- '(face ff/secure-date rear-nonsticky t))))
-
- (set-buffer-modified-p nil)
- (setq buffer-undo-list nil)
- )
+ (set-buffer-modified-p nil)
+ (setq buffer-undo-list nil)
+ )
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Spelling
@@ -1395,13 +1477,13 @@ universal argument starts xfig even if the .fig does not exist"
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defun ff/snip () (interactive)
- (let ((start (condition-case nil (region-beginning) (error (point))))
- (end (condition-case nil (region-end) (error (point)))))
- (goto-char end)
- (insert "---------------------------- snip snip -------------------------------\n")
- (goto-char start)
- (insert "---------------------------- snip snip -------------------------------\n")
- ))
+ (let ((start (condition-case nil (region-beginning) (error (point))))
+ (end (condition-case nil (region-end) (error (point)))))
+ (goto-char end)
+ (insert "----------------------------- snip snip -----------------------------\n")
+ (goto-char start)
+ (insert "----------------------------- snip snip -----------------------------\n")
+ ))
(defun ff/start-latex ()
"Adds all that stuff to start a new LaTeX document."
@@ -1409,7 +1491,7 @@ universal argument starts xfig even if the .fig does not exist"
(goto-char (point-min))
(insert "%% -*- mode: latex; mode: reftex; mode: flyspell; coding: utf-8; tex-command: \"pdflatex.sh\" -*-
-\\documentclass[12pt]{article}
+\\documentclass[12pt,a4paper,twoside]{article}
\\usepackage[a4paper,top=2.5cm,bottom=2cm,left=2.5cm,right=2.5cm]{geometry}
\\usepackage[utf8]{inputenc}
\\usepackage{amsmath}
@@ -1426,12 +1508,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}
@@ -1495,12 +1577,12 @@ universal argument starts xfig even if the .fig does not exist"
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defun ff/remove-ip-header () (interactive)
- (save-excursion
- (goto-char (point-min))
- (when (and (re-search-forward "START_IP_HEADER" nil t)
- (re-search-forward "END_IP_HEADER" nil t))
- (message "yep"))
- ))
+ (save-excursion
+ (goto-char (point-min))
+ (when (and (re-search-forward "START_IP_HEADER" nil t)
+ (re-search-forward "END_IP_HEADER" nil t))
+ (message "yep"))
+ ))
(defun ff/add-gpl ()
"Adds the GPL statements at the beginning of current buffer."
@@ -1631,6 +1713,11 @@ int main(int argc, char **argv) {
+
@@ -1727,26 +1814,26 @@ and refilling all the paragraphs."
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defun ff/code-to-html () (interactive)
- (save-restriction
- (narrow-to-region (region-beginning) (region-end))
- (replace-string "\"" """ nil (point-min) (point-max))
- (replace-string " " " " nil (point-min) (point-max))
- (replace-string ">" ">" nil (point-min) (point-max))
- (replace-string "<" "<" nil (point-min) (point-max))
- (replace-string "\e" "^[" nil (point-min) (point-max))
- (replace-string "" "^?" nil (point-min) (point-max))
- (replace-string " " "^_" nil (point-min) (point-max))
- (replace-regexp "$" "
" nil (point-min) (point-max))
- )
- )
+ (save-restriction
+ (narrow-to-region (region-beginning) (region-end))
+ (replace-string "\"" """ nil (point-min) (point-max))
+ (replace-string " " " " nil (point-min) (point-max))
+ (replace-string ">" ">" nil (point-min) (point-max))
+ (replace-string "<" "<" nil (point-min) (point-max))
+ (replace-string "\e" "^[" nil (point-min) (point-max))
+ (replace-string "" "^?" nil (point-min) (point-max))
+ (replace-string " " "^_" nil (point-min) (point-max))
+ (replace-regexp "$" "
" nil (point-min) (point-max))
+ )
+ )
(defun ff/downcase-html-tags () (interactive)
- (save-excursion
- (beginning-of-buffer)
- (while (re-search-forward "<\\([^>]+\\)>" nil t)
- (downcase-region (match-beginning 1) (match-end 1)))
- )
- )
+ (save-excursion
+ (beginning-of-buffer)
+ (while (re-search-forward "<\\([^>]+\\)>" nil t)
+ (downcase-region (match-beginning 1) (match-end 1)))
+ )
+ )
;; If we enter html mode and there is no makefile around, create a
;; compilation command with tidy (this is cool stuff)
@@ -1797,55 +1884,55 @@ a file in /tmp"
;; Create the adequate embryo of a file if it does not exist
(defun ff/start-file () (interactive)
- (let ((filename (buffer-file-name)))
- (when filename
-
- (when (string-match "\\.sh$" filename)
- (sh-mode)
- (insert "#!/bin/bash\n\nset -e\nset -o pipefail\n\n")
- (save-excursion
- (ff/add-copyrights))
- )
-
- (when (string-match "\\.html$" filename)
- (html-mode)
- (ff/start-html)
- (previous-line 4)
- )
-
- (when (string-match "\\.h$" filename)
- (c++-mode)
- (ff/headerize)
- (save-excursion
- (ff/add-copyrights)
- (newline))
- (newline)
- (newline)
- (previous-line 1)
- )
-
- (when (string-match "\\.c$" filename)
- (c-mode)
- (ff/add-copyrights)
- (ff/start-c))
-
- (when (string-match "\.\\(cc\\|cpp\\)$" filename)
- (c++-mode)
- (ff/add-copyrights)
- (let ((headername (replace-regexp-in-string "\\.\\(cc\\|cpp\\)$" ".h"
- filename)))
- (if (file-exists-p headername)
- (insert (concat "\n#include \"" (file-name-nondirectory headername) "\"\n"))
- (ff/start-c++))
- ))
+ (let ((filename (buffer-file-name)))
+ (when filename
+
+ (when (string-match "\\.sh$" filename)
+ (sh-mode)
+ (insert "#!/bin/bash\n\nset -e\nset -o pipefail\n\n")
+ (save-excursion
+ (ff/add-copyrights))
+ )
+
+ (when (string-match "\\.html$" filename)
+ (html-mode)
+ (ff/start-html)
+ (previous-line 4)
+ )
+
+ (when (string-match "\\.h$" filename)
+ (c++-mode)
+ (ff/headerize)
+ (save-excursion
+ (ff/add-copyrights)
+ (newline))
+ (newline)
+ (newline)
+ (previous-line 1)
+ )
+
+ (when (string-match "\\.c$" filename)
+ (c-mode)
+ (ff/add-copyrights)
+ (ff/start-c))
+
+ (when (string-match "\.\\(cc\\|cpp\\)$" filename)
+ (c++-mode)
+ (ff/add-copyrights)
+ (let ((headername (replace-regexp-in-string "\\.\\(cc\\|cpp\\)$" ".h"
+ filename)))
+ (if (file-exists-p headername)
+ (insert (concat "\n#include \"" (file-name-nondirectory headername) "\"\n"))
+ (ff/start-c++))
+ ))
- (when (string-match "\\.tex$" filename)
- (latex-mode)
- (ff/start-latex)
- ))
- )
- (set-buffer-modified-p nil)
- )
+ (when (string-match "\\.tex$" filename)
+ (latex-mode)
+ (ff/start-latex)
+ ))
+ )
+ (set-buffer-modified-p nil)
+ )
(if (>= emacs-major-version 22)
(add-to-list 'find-file-not-found-functions 'ff/start-file)
@@ -1934,14 +2021,14 @@ a file in /tmp"
)
(defun ff/universal-compile () (interactive)
- (funcall (or (cdr (assoc major-mode
- '(
- (latex-mode . tex-file)
- (html-mode . browse-url-of-buffer)
- ;; Here you can add other mode -> compile command
- )))
- 'ff/fast-compile ;; And this is the failsafe
- )))
+ (funcall (or (cdr (assoc major-mode
+ '(
+ (latex-mode . tex-file)
+ (html-mode . browse-url-of-buffer)
+ ;; Here you can add other mode -> compile command
+ )))
+ 'ff/fast-compile ;; And this is the failsafe
+ )))
(define-key global-map [f1] 'ff/universal-compile)
(define-key global-map [(shift f1)] 'compile)
@@ -1954,14 +2041,27 @@ a file in /tmp"
;; (when (ff/load-or-alert "flyspell-timer" t)
;; (add-hook 'flyspell-mode-hook 'flyspell-timer-ensure-idle-timer))
+(defun ff/start-flyspell () (interactive)
+ (ff/configure-faces
+ '(
+ ;; (flyspell-incorrect :background "#ff0000" :foreground "black")
+ ;; (flyspell-duplicate :background "#ff9000" :foreground "black")
+ (flyspell-incorrect :foreground "#ff0000" :weight 'bold)
+ (flyspell-duplicate :foreground "#ff9000" :weight 'bold)
+ ))
+ ;; (flyspell-buffer)
+ )
+
+(add-hook 'flyspell-mode-hook 'ff/start-flyspell)
+
(defun ff/pick-dictionnary () (interactive)
- (when (and (boundp 'flyspell-mode) flyspell-mode)
- (if (and current-input-method (string-match "latin" current-input-method))
- (ispell-change-dictionary "francais")
- (ispell-change-dictionary "american"))
- ;; (flyspell-buffer)
- )
- )
+ (when (and (boundp 'flyspell-mode) flyspell-mode)
+ (if (and current-input-method (string-match "latin" current-input-method))
+ (ispell-change-dictionary "francais")
+ (ispell-change-dictionary "american"))
+ ;; (flyspell-buffer)
+ )
+ )
(defadvice toggle-input-method (after ff/switch-dictionnary nil activate)
(ff/pick-dictionnary))
@@ -2014,16 +2114,16 @@ This may be a useful alternative binding for \\[delete-other-windows]
;; Usefull to deal with results in latex files
(defun ff/round-floats-in-region () (interactive)
- (save-restriction
- (condition-case nil
- (narrow-to-region (region-beginning) (region-end))
- (error (thing-at-point 'word)))
- (save-excursion
- (goto-char (point-min))
- (while (re-search-forward "[0-9\.]+" nil t)
- (let ((value (string-to-number (buffer-substring (match-beginning 0) (match-end 0)))))
- (delete-region (match-beginning 0) (match-end 0))
- (insert (format "%0.2f" value)))))))
+ (save-restriction
+ (condition-case nil
+ (narrow-to-region (region-beginning) (region-end))
+ (error (thing-at-point 'word)))
+ (save-excursion
+ (goto-char (point-min))
+ (while (re-search-forward "[0-9\.]+" nil t)
+ (let ((value (string-to-number (buffer-substring (match-beginning 0) (match-end 0)))))
+ (delete-region (match-beginning 0) (match-end 0))
+ (insert (format "%0.2f" value)))))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Keymaping
@@ -2080,28 +2180,6 @@ This may be a useful alternative binding for \\[delete-other-windows]
;; Closes the current \begin{}
-(when (ff/load-or-alert "longlines")
-
- (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 ()
- ;; (when (save-excursion
- ;; (goto-char (point-min))
- ;; (re-search-forward "^.\\{81,\\}$" nil t))
- ;; (longlines-mode)
- ;; (message "Switched on the lonlines mode automatically")
- ;; ))
-
- ;; (add-hook 'latex-mode-hook 'ff/auto-longlines)
-
- )
-
;; Meta-/ remaped (completion)
(define-key global-map [(shift right)] 'dabbrev-expand)
@@ -2110,14 +2188,14 @@ This may be a useful alternative binding for \\[delete-other-windows]
;; Change the current window.
(defun ff/next-same-frame-window () (interactive)
- (select-window (next-window (selected-window)
- (> (minibuffer-depth) 0)
- nil)))
+ (select-window (next-window (selected-window)
+ (> (minibuffer-depth) 0)
+ nil)))
(defun ff/previous-same-frame-window () (interactive)
- (select-window (previous-window (selected-window)
- (> (minibuffer-depth) 0)
- nil)))
+ (select-window (previous-window (selected-window)
+ (> (minibuffer-depth) 0)
+ nil)))
(define-key global-map [(shift prior)] 'ff/next-same-frame-window)
(define-key global-map [(shift next)] 'ff/previous-same-frame-window)
@@ -2131,19 +2209,19 @@ This may be a useful alternative binding for \\[delete-other-windows]
;; (define-key global-map [(control shift next)] 'previous-multiframe-window)
;; I have two screens sometime!
+;; (define-key global-map [(meta next)] 'other-frame)
+;; (define-key global-map [(meta prior)] (lambda () (interactive) (other-frame -1)))
-(define-key global-map [(meta next)] 'other-frame)
-(define-key global-map [(meta prior)] (lambda () (interactive) (other-frame -1)))
-
-(define-key global-map [(shift home)] 'delete-other-windows-vertically)
+;; (load "winner")
+(winner-mode 1)
+(define-key global-map [(shift backspace)] 'winner-undo)
+;; (define-key global-map [(shift home)] 'delete-other-windows-vertically)
;; (define-key global-map [(control +)] 'enlarge-window)
;; (define-key global-map [(control -)] 'shrink-window)
-
;; Goes to next/previous buffer
-
-(define-key global-map [(control prior)] 'ff/next-buffer)
-(define-key global-map [(control next)] 'ff/prev-buffer)
+;; (define-key global-map [(control prior)] 'ff/next-buffer)
+;; (define-key global-map [(control next)] 'ff/prev-buffer)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; If M-. on a symbol, show where it is defined in another window
@@ -2153,12 +2231,12 @@ This may be a useful alternative binding for \\[delete-other-windows]
(when (ff/load-or-alert "etags")
(defun ff/find-tag-nofocus () (interactive)
- "Show in another window the definition of the current tag"
- (let ((tag (find-tag-default)))
- (display-buffer (find-tag-noselect tag (string= tag last-tag)))
- (message "Tag %s" tag)
- )
- )
+ "Show in another window the definition of the current tag"
+ (let ((tag (find-tag-default)))
+ (display-buffer (find-tag-noselect tag (string= tag last-tag)))
+ (message "Tag %s" tag)
+ )
+ )
(define-key global-map [(meta .)] 'ff/find-tag-nofocus)
)
@@ -2191,7 +2269,7 @@ next one. With universal argument, kill all killable buffers."
(if (string-match ff/kill-this-buffer-and-delete-window-exceptions (buffer-name))
(ff/next-buffer)
(kill-this-buffer)))
- ;; (unless (one-window-p t) (delete-window))
+ (unless (one-window-p t) (delete-window))
)
(define-key global-map [(control backspace)] 'ff/kill-this-buffer-and-delete-window)
@@ -2218,10 +2296,10 @@ next one. With universal argument, kill all killable buffers."
(message "elisp debug off")))
(defun ff/create-dummy-buffer (&optional universal) (interactive "P")
- (find-file (concat "/tmp/" (ff/non-existing-filename "/tmp/" "dummy" "")))
- (text-mode)
- (if universal (ff/insert-url (current-kill 0)))
- (message "New dummy text-mode buffer"))
+ (find-file (concat "/tmp/" (ff/non-existing-filename "/tmp/" "dummy" "")))
+ (text-mode)
+ (if universal (ff/insert-url (current-kill 0)))
+ (message "New dummy text-mode buffer"))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Recentf to keep a list of recently visited files. I use it
@@ -2245,7 +2323,7 @@ next one. With universal argument, kill all killable buffers."
"\.bbl$" "\.aux$" "\.toc$"
))
recentf-max-saved-items 1000
- recentf-save-file "~/private/emacs/recentf"
+ recentf-save-file (concat ff/emacs-dir "/recentf")
)
(when (boundp 'recentf-keep) (add-to-list 'recentf-keep 'file-remote-p))
@@ -2281,7 +2359,7 @@ next one. With universal argument, kill all killable buffers."
media/add-current-song-to-interrupted-when-killing t
media/duration-to-history 30
media/history-size 1000
- media/playlist-file "~/private/emacs/media-playlists"
+ media/playlist-file (concat ff/emacs-dir "/media-playlists")
media/mplayer/args '(
"-framedrop"
"-zoom"
@@ -2290,7 +2368,7 @@ next one. With universal argument, kill all killable buffers."
;; "-stop-xscreensaver"
;; "-osdlevel" "3"
)
- media/mplayer/timing-request-period 5.0
+ media/mplayer/timing-request-period 1.0
)
)
@@ -2336,31 +2414,37 @@ proposes to visit them."
)
(defun ff/selector-mail-from-bbdb () (interactive)
- (selector/select
- (mapcar
- (lambda (r) (cons (concat (elt r 0)
- " "
- (elt r 1)
- " ("
- (car (elt r 6))
- ")")
- r))
- (bbdb-records))
- (if (string= mode-name "Mail")
- 'ff/selector-insert-record-callback
- 'ff/selector-compose-mail-callback)
- "*bbdb-search*"
- )
- )
+ (selector/select
+ (mapcar
+ (lambda (r) (cons (concat (elt r 0)
+ " "
+ (elt r 1)
+ " ("
+ (car (elt r 6))
+ ")")
+ r))
+ (bbdb-records))
+ (if (string= mode-name "Mail")
+ 'ff/selector-insert-record-callback
+ 'ff/selector-compose-mail-callback)
+ "*bbdb-search*"
+ )
+ )
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; My script to automatically count the number of words and characters
+;; between two markers
-(load "text-counters.el")
+(ff/load-or-alert "text-counters.el")
-;; Add them when entering the text-mode
+;; Display them in the modeline when in text-mode
(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
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -2395,67 +2479,76 @@ proposes to visit them."
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defun ff/twin-horizontal-current-buffer () (interactive)
- (delete-other-windows)
- (split-window-horizontally)
- (balance-windows)
- )
+ (delete-other-windows)
+ (split-window-horizontally)
+ (balance-windows)
+ )
(defun ff/twin-vertical-current-buffer () (interactive)
- (delete-other-windows)
- (split-window-vertically)
- (balance-windows)
- )
+ (delete-other-windows)
+ (split-window-vertically)
+ (balance-windows)
+ )
(defun ff/flyspell-mode (arg) (interactive "p")
- (if flyspell-mode (flyspell-mode -1)
- (flyspell-mode 1)
- (flyspell-buffer))
-)
+ (if flyspell-mode (flyspell-mode -1)
+ (flyspell-mode 1)
+ (flyspell-buffer))
+ )
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; The fridge!
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defun ff/move-region-to-fridge () (interactive)
- "Cut the current region, paste it in a file called ./fridge
+ "Cut the current region, paste it in a file called ./fridge
with a time tag, and save this file"
- (unless (use-region-p) (error "No region selected"))
- (let ((bn (file-name-nondirectory (buffer-file-name))))
- (kill-region (region-beginning) (region-end))
- (with-current-buffer (find-file-noselect "fridge")
- (goto-char (point-max))
- (insert "\n")
- (insert "######################################################################\n")
- (insert "\n"
- (format-time-string "%Y %b %d %H:%M:%S" (current-time))
- " (from "
- bn
- ")\n\n")
- (yank)
- (save-buffer)
- (message "Region moved to fridge")
- )
- )
- )
+ (unless (use-region-p) (error "No region selected"))
+ (let ((bn (file-name-nondirectory (buffer-file-name))))
+ (kill-region (region-beginning) (region-end))
+ (with-current-buffer (find-file-noselect "fridge")
+ (goto-char (point-max))
+ (insert "\n")
+ (insert "######################################################################\n")
+ (insert "\n"
+ (format-time-string "%Y %b %d %H:%M:%S" (current-time))
+ " (from "
+ bn
+ ")\n\n")
+ (yank)
+ (save-buffer)
+ (message "Region moved to fridge")
+ )
+ )
+ )
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; My own keymap
+;; My own keymap mapped to C-`
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(setq ff/map (make-sparse-keymap))
(define-key global-map [(control \`)] ff/map)
-;;(define-key global-map [(control @)] ff/map)
+
+(unless window-system
+ ;; (define-key global-map [(control @)] ff/map)
+ (define-key global-map [(meta O) \`] ff/map)
+ )
(define-key esc-map "`" ff/map)
(defun ff/git-status (&optional dir) (interactive)
- (if (buffer-file-name)
- (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)))
- )
+ (if (buffer-file-name)
+ (git-status (file-name-directory (buffer-file-name)))
+ (error "No file attached to this buffer")))
+
+(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)
@@ -2670,9 +2763,9 @@ With argument ARG, do this that many times."
;; Where to save the bookmarks and where is bbdb
-(setq bookmark-default-file "~/private/emacs/bmk"
+(setq bookmark-default-file (concat ff/emacs-dir "/bmk")
bbdb-file "~/private/bbdb"
- custom-file "~/private/emacs/custom")
+ custom-file (concat ff/emacs-dir "/custom"))
;; enotes.el is one of my own scripts, check my web page