Merge remote branches 'ponder' and 'crybaby'

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index 054f9dab60a80edecb7943fe1e88d4da02c07c9b..2a7796a6b09479800ec4f0bf40fc353b4a5fbe72 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -45,7 +45,7 @@
      (add-to-list 'auto-mode-alist
                  `(,(concat "/debian/"
                               "\\("
      (add-to-list 'auto-mode-alist
                  `(,(concat "/debian/"
                               "\\("

-                                "[" "[:lower:][:digit:]]"
+                                "[" "[:lower:][:digit:]]"

                                     "[[:lower:][:digit:].+-" "]+"
                                 "\\."
                               "\\)?"
                                     "[[:lower:][:digit:].+-" "]+"
                                 "\\."
                               "\\)?"


@@ -203,7 +203,11 @@
 (setq-default fill-column 77)          ;I use rather narrow windows
 (setq-default comment-column 40)       ;Set a standard comment column
 (setq-default truncate-partial-width-windows nil)
 (setq-default fill-column 77)          ;I use rather narrow windows
 (setq-default comment-column 40)       ;Set a standard comment column
 (setq-default truncate-partial-width-windows nil)

-(setq woman-use-own-frame nil)         ;Keep man pages somewhere sensible
+(setq default-indicate-empty-lines t)
+(setq whitespace-style
+      '(trailing space-before-tab space-after-tab empty indentation))
+(setq woman-use-own-frame nil          ;Keep man pages somewhere sensible
+      woman-fill-column 72)            ;Right margin position.

 (setq diff-switches "-u"               ;I like reading unified diffs
       cvs-diff-flags (list diff-switches))
 (setq echo-keystrokes 10)              ;Long delay before keystrokes echo
 (setq diff-switches "-u"               ;I like reading unified diffs
       cvs-diff-flags (list diff-switches))
 (setq echo-keystrokes 10)              ;Long delay before keystrokes echo