*** empty log message ***

diff --git a/emacs.el b/emacs.el
index 364adec..9e07d60 100644 (file)
--- a/emacs.el
+++ b/emacs.el
@@ -25,7 +25,7 @@
   (add-to-list 'load-path "/usr/share/emacs/site-lisp/vm/")
   (add-to-list 'load-path "/usr/share/emacs/site-lisp/bbdb/lisp/")
   (add-to-list 'load-path "/usr/share/emacs/site-lisp/mailcrypt/")
-)
+  )
 
 ;; It's better to set the preferences in the .Xresources so that the
 ;; window is not first displayed with the wrong options
@@ -90,7 +90,7 @@
 (icomplete-mode 1)
 
 ;; (setq highlight-current-line-globally t
-      ;; highlight-current-line-ignore-regexp "Faces\\|Colors\\| \\*Mini\\|\\*media\\|INBOX")
+;; highlight-current-line-ignore-regexp "Faces\\|Colors\\| \\*Mini\\|\\*media\\|INBOX")
 
 ;; (highlight-current-line-minor-mode 1)
 ;; (highlight-current-line-set-bg-color "gray75")
@@ -337,11 +337,11 @@ load-warning buffer in case of failure."
 
 ;; ;; If my own letter icon is here, use it and change its color
 ;; (when (file-exists-p "~/local/share/emacs/letter.xbm")
-  ;; (setq-default display-time-mail-icon
-                ;; (find-image
-                 ;; '((:type xbm
-                          ;; :file "~/local/share/emacs/letter.xbm"
-                          ;; :ascent center)))))
+;; (setq-default display-time-mail-icon
+;; (find-image
+;; '((:type xbm
+;; :file "~/local/share/emacs/letter.xbm"
+;; :ascent center)))))
 
 ;; My funky setting of face colors. Basically, we switch to a sober
 ;; look and darken a bit the colors which need to (because of the
@@ -414,7 +414,7 @@ load-warning buffer in case of failure."
 
 (when window-system
   ;; (setq
-   ;; display-time-use-mail-icon t)
+  ;; display-time-use-mail-icon t)
 
   (ff/configure-faces
    '(
@@ -1402,8 +1402,8 @@ universal argument starts xfig even if the .fig does not exist"
   (define-key global-map [(control \?)] 'lookup-dict))
 
 ;; (defun ff/generate-password () (interactive)
-  ;; (let ((c "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-"))
-    ;; (nth (random (length c)) c))
+;; (let ((c "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-"))
+;; (nth (random (length c)) c))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Automatization of things I do often
@@ -1511,7 +1511,7 @@ universal argument starts xfig even if the .fig does not exist"
     (goto-char (point-min))
     (when (and (re-search-forward "START_IP_HEADER" nil t)
                (re-search-forward "END_IP_HEADER" nil t))
-        (message "yep"))
+      (message "yep"))
     ))
 
 (defun ff/add-gpl ()
@@ -1662,8 +1662,8 @@ int main(int argc, char **argv) {
 
 (defun ff/cout-var (arg)
   "Invoked on a line with a list of variables names,
-it inserts a line which displays their values in cout
-(or cerr if the function is invoked with a universal arg)"
+it inserts a line which displays their values in cout, or cerr if
+the function is invoked with a universal arg"
   (interactive "P")
   (let ((line (if arg "cerr" "cout")))
     (goto-char (point-at-bol))
@@ -1841,10 +1841,11 @@ a file in /tmp"
         (ff/add-copyrights)
         (ff/start-c))
 
-      (when (string-match "\\.cc$" filename)
+      (when (string-match "\.\\(cc\\|cpp\\)$" filename)
         (c++-mode)
         (ff/add-copyrights)
-        (let ((headername  (replace-regexp-in-string "\.cc" ".h" filename)))
+        (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++))
@@ -2263,11 +2264,17 @@ next one. With universal argument, kill all killable buffers."
 (when (ff/load-or-alert "media")
 
   (unless window-system
-    (ff/configure-faces '(
-                          (media/mode-string-face :foreground "blue4" :weight 'bold)
-                          (media/current-tune-face :foreground "black" :background "yellow" :weight 'normal)
-                          (media/instant-highlight-face :foreground "black" :background "orange" :weight 'normal)
-                          ))
+    (ff/configure-faces
+     '(
+       (media/mode-string-face
+        :foreground "blue4" :weight 'bold)
+
+       (media/current-tune-face
+        :foreground "black" :background "yellow" :weight 'normal)
+
+       (media/instant-highlight-face
+        :foreground "black" :background "orange" :weight 'normal)
+       ))
     )
 
   (define-key global-map [(meta \\)] 'media)
@@ -2396,17 +2403,27 @@ proposes to visit them."
   (flyspell-mode)
   (when flyspell-mode (flyspell-buffer)))
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; The fridge!
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
 (defun ff/move-region-to-fridge () (interactive)
   "Cut the current region, paste it in a file called ./fridge
 with a time tag, and save this file"
-  (kill-region (region-beginning) (region-end))
-  (with-current-buffer (find-file-noselect "fridge")
-    (goto-char (point-max))
-    (insert "\n"
-            (format-time-string "%Y %b %d %H:%M:%S" (current-time))
-            "\n\n")
-    (yank)
-    (save-buffer)
+  (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"
+              (format-time-string "%Y %b %d %H:%M:%S" (current-time))
+              " (from "
+              bn
+              ")\n\n")
+      (yank)
+      (save-buffer)
+      (message "Region moved to fridge")
+      )
     )
   )
 
@@ -2466,6 +2483,8 @@ with a time tag, and save this file"
 (define-key ff/map "3" 'ff/twin-horizontal-current-buffer)
 (define-key ff/map [?\C-3] 'ff/twin-horizontal-current-buffer)
 
+(define-key ff/map " " 'delete-trailing-whitespace)
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Hacks so that all keys are functionnal in xterm and through ssh.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;