Merge branch 'master' of git+ssh://metalzone.distorted.org.uk/~mdw/etc/profile

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index 1546c2c..e5ae0b8 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -328,6 +328,7 @@
 
 (setq display-time-24hr-format t)
 (display-time)
+(column-number-mode 1)
 (trap
   (if window-system
       (let ((view-diary-entries-initially t))
@@ -381,14 +382,12 @@
         (cursor-color . "red"))
        (if mdw-black-background
           '((background-mode . dark))
-        '((background-mode . light)))
-       (and (eq window-system 'x)
-           '((font . "6x13")))
-       (and (eq window-system 'pm)
-           '((font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850")
-             (menu-font . "8.Helv")
-             (background-color . "lightgrey")))
-       default-frame-alist))
+        '((background-mode . light)))))
+(setq window-system-default-frame-alist
+      '((pm (font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850")
+           (menu-font . "8.Helv")
+           (background-color . "lightgrey"))
+       (nil (menu-bar-lines . 0))))
 
 ;; Other frame fiddling.
 
@@ -442,8 +441,11 @@
 
 (eval-after-load "dired"
   '(progn
-     (define-key dired-mode-map [?\C-x ?\C-q]
-       'wdired-change-to-wdired-mode)))
+     (or (lookup-key dired-mode-map  [?\C-x ?\C-q])
+        (define-key dired-mode-map [?\C-x ?\C-q]
+          'wdired-change-to-wdired-mode))
+     (and (fboundp 'dired-do-relsymlink)
+         (define-key dired-mode-map [?\C-c ?\C-s] 'dired-do-relsymlink))))
 
 (add-hook 'org-mode-hook
          #'(lambda () (mdw-clobber-evil-keymap org-mode-map)))