Merge commit 'metalzone/master'

[profile] / dot-emacs.el

diff --git a/dot-emacs.el b/dot-emacs.el
index 3da4450..cb2047d 100644 (file)
--- 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."
   "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)))
              (tramp-tramp-file-p (buffer-file-name)))
         (unless global-auto-revert-ignore-buffer
           (setq global-auto-revert-ignore-buffer 'tramp)))


@@ -650,8 +653,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)
     (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")
     (diff-index :weight bold)
     (diff-file-header :weight bold)
     (diff-hunk-header :foreground "SkyBlue1")


@@ -1255,7 +1258,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"
                      "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
 
     (setq font-lock-keywords
          (list