Merge branch 'master' of us:git/staging/profile

* 'master' of us:git/staging/profile:
  el/dot-emacs.el: Don't highlight bad whitespace in read-only buffers.

diff --git a/dot/gnus-local.el.distorted b/dot/gnus-local.el.distorted
index 4f6e014be912c0a617ef46621dd48652437dbf2e..02dea2e1551cd3d32fc632082eff487d2553a87f 100644 (file)
--- a/dot/gnus-local.el.distorted
+++ b/dot/gnus-local.el.distorted
@@ -88,6 +88,7 @@
          (from "cron daemon" "admin.misc")
          (from "uucp@distorted\\.org\\.uk" "admin.uucp")
          (from "darchive@.*\\.distorted\\.org\\.uk" "admin.misc")
+         (from "bugs@distorted\\.org\\.uk" "admin.bugs")
 
          ;; Colo provider.
          (from "\\(accounts\\|support\\)@jump\\.net\\.uk" "keep.colo")

diff --git a/dot/lisp-init.lisp b/dot/lisp-init.lisp
index ed6acd11fc26d58be2bb0327d92510bb5280a74b..146b25037cf4aa8fabbad230d6d1eab4c6c2874d 100644 (file)
--- a/dot/lisp-init.lisp
+++ b/dot/lisp-init.lisp
@@ -22,12 +22,7 @@ (setf *compile-verbose* nil)
 
 ;; Tell SBCL where to find its source source.
 #+sbcl
-(let ((#1=#:sbcl-src #p"/usr/share/sbcl-source/"))
-  (flet ((#2=#:sbcl-dir (#3=#:p)
-          (merge-pathnames #3# #1#)))
-    (setf (logical-pathname-translations "SYS")
-         `(("SYS:SRC;**;*.*.*" ,(#2# "src/**/*.*"))
-           ("SYS:CONTRIB;**;*.*.*" ,(#2# "contrib/**/*.*"))))))
+(sb-ext:set-sbcl-source-location #p"/usr/share/sbcl-source/")
 
 ;; Tell some Lisps about my home directory.
 #+cmu (ext:clear-search-list "HOME")

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 1b0e3507f9972f2f7e78660ca28d220680b263bd..0967471a783a105d9cef5036fcbc04185a80ec0f 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -1236,7 +1236,7 @@ (mdw-define-face whizzy-error-face
 (mdw-define-face mdw-ellipsis-face
   (((type tty)) :foreground "blue") (t :foreground "grey60"))
 (let ((dollar (make-glyph-code ?$ 'mdw-ellipsis-face))
-      (backslash (make-glyph-code ?\ 'mdw-ellipsis-face))
+      (backslash (make-glyph-code ?\\ 'mdw-ellipsis-face))
       (dot (make-glyph-code ?. 'mdw-ellipsis-face))
       (bar (make-glyph-code ?| mdw-ellipsis-face)))
   (set-display-table-slot standard-display-table 0 dollar)