Merge remote-tracking branches 'distorted/master' and 'ponder/master'

[profile] / el / dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index b5bdfd0..d2eba21 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -358,6 +358,9 @@ so that it can be used for convenient filtering."
          (setenv "REAL_MOVEMAIL" try))
       (setq path (cdr path)))))
 
+(eval-after-load "erc"
+    '(load "~/.ercrc.el"))
+
 ;;;--------------------------------------------------------------------------
 ;;; Utility functions.
 
@@ -1026,13 +1029,14 @@ doesn't match any of the regular expressions in
                  (arglist-cont-nonempty . mdw-c-lineup-arglist)
                  (topmost-intro . mdw-c-indent-extern-mumble)
                  (cpp-define-intro . 0)
+                 (knr-argdecl . 0)
                  (inextern-lang . [0])
                  (label . 0)
                  (case-label . +)
                  (access-label . -)
                  (inclass . +)
                  (inline-open . ++)
-                 (statement-cont . 0)
+                 (statement-cont . +)
                  (statement-case-intro . +)))
               t))
 
@@ -2139,8 +2143,8 @@ strip numbers instead."
                   (home (expand-file-name "~")) (nhome (length home)))
              (if (and (>= npwd nhome)
                       (or (= nhome npwd)
-                          (= (elt pwd nhome) ?/)
-                      (string= (substring pwd 0 nhome) home)))
+                          (= (elt pwd nhome) ?/))
+                      (string= (substring pwd 0 nhome) home))
                  (concat "~" (substring pwd (length home)))
                pwd))
            right)))