X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/8d6d55b983fb1c1f4cc870195e016380d10fc8dc..10fa241442b70ae50e73f747daa4751aced1db6d:/dot-emacs.el

diff --git a/dot-emacs.el b/dot-emacs.el
index 3da4450..d123512 100644
--- a/dot-emacs.el
+++ b/dot-emacs.el
@@ -302,7 +302,10 @@ input lists are not modified, although they'll probably become garbage."
   "Sets global-auto-revert-ignore-buffer appropriately for this buffer,
 taking into consideration whether it's been found using tramp, which seems to
 get itself into a twist."
-  (cond ((and (buffer-file-name)
+  (cond ((not (boundp 'global-auto-revert-ignore-buffer))
+	 nil)
+	((and (buffer-file-name)
+	      (fboundp 'tramp-tramp-file-p)
 	      (tramp-tramp-file-p (buffer-file-name)))
 	 (unless global-auto-revert-ignore-buffer
 	   (setq global-auto-revert-ignore-buffer 'tramp)))
@@ -423,7 +426,10 @@ a list of things:
 (make-variable-buffer-local 'mdw-fill-prefix)
 
 (defvar mdw-hanging-indents
-  "\\(\\(\\([*o]\\|--\\|[0-9]+\\.\\|\\[[0-9]+\\]\\|([a-zA-Z])\\)[ \t]+\\)?\\)"
+  (concat "\\(\\("
+	    "\\([*o]\\|-[-#]?\\|[0-9]+\\.\\|\\[[0-9]+\\]\\|([a-zA-Z])\\)"
+	    "[ \t]+"
+	  "\\)?\\)")
   "*Standard regular expression matching things which might be part of a
 hanging indent.  This is mainly useful in `auto-fill-mode'.")
 
@@ -650,8 +656,8 @@ doesn't cope with anything approximating a complicated case."
     (font-lock-keyword-face :weight bold)
     (font-lock-constant-face :weight bold)
     (font-lock-reference-face :weight bold)
-    (woman-bold-face :weight bold)
-    (woman-italic-face :slant italic)
+    (woman-bold :weight bold)
+    (woman-italic :slant italic)
     (diff-index :weight bold)
     (diff-file-header :weight bold)
     (diff-hunk-header :foreground "SkyBlue1")
@@ -1255,7 +1261,7 @@ strip numbers instead."
 		      "del" "elif" "else" "except" "exec" "finally" "for"
 		      "from" "global" "if" "import" "in" "is" "lambda"
 		      "not" "or" "pass" "print" "raise" "return" "try"
-		      "while" "yield")))
+		      "while" "with" "yield")))
     (setq font-lock-keywords
 	  (list