X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/572d95bda58d1d6e5d28c77e05c9e00f47a1e8db..d70716b50ff8627257daad4e0fd9fe40a196cc77:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 478566b..708817f 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -198,10 +198,10 @@
 (setq display-buffer-reuse-frames nil	;Don't confuse me by showing buffers
       iswitchb-default-method 'samewindow) ;in other random frames
 (setq dired-deletion-confirmer		;Make deletion easier in dired
-      (symbol-function 'y-or-n-p))
+      (symbol-function 'y-or-n-p)
+      dired-listing-switches "-alF"	;Do `ls -F' things in dired windows
+      wdired-allow-to-change-permissions 'advanced)
 (setq read-quoted-char-radix 16)	;C-q HEX-STUFF [RET]
-(setq dired-listing-switches "-alF")	;Do `ls -F' things in dired windows
-(setq wdired-allow-to-change-permissions t)
 (setq case-fold-file-names nil)		;Don't translate file names (grr...)
 (setq scroll-step 5)			;Don't scroll too much at a time
 (setq-default fill-column 77)		;I use rather narrow windows
@@ -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)))
@@ -498,6 +500,13 @@
 
 (setq completion-ignored-extensions
       (append `(".hc" ".hi") completion-ignored-extensions))
+(dolist (dir (remove-if-not (lambda (ext)
+			      (= (aref ext (- (length ext) 1)) ?/))
+			    completion-ignored-extensions))
+  (if (/= (aref dir 0) ?/)
+      (setq completion-ignored-extensions
+	    (cons (concat "/" dir)
+		  (remove dir completion-ignored-extensions)))))
 
 ;; Some common local definitions.