X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/cb1389c00e0b2589bd02bf6a4f4900f810e13f32..b0ef6a6629b8f51972a8a1ca7401144e52299235:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index ef0feac..f70c338 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -62,8 +62,13 @@
 
 (trap (or mdw-fast-startup (require 'tex-site)))
 
-(trap (or mdw-fast-startup (semantic-load-enable-minimum-features)))
+(trap (or mdw-fast-startup (semantic-load-enable-excessive-code-helpers)))
 (setq semanticdb-default-save-directory "~/.emacs.d/semanticdb/")
+(eval-after-load "senator"
+  '(setq isearch-mode-hook
+	 (remq 'senator-isearch-mode-hook isearch-mode-hook)
+	 isearch-mode-end-hook
+	 (remq 'senator-isearch-mode-hook isearch-mode-end-hook)))
 
 ;; Skeleton stuff.
 
@@ -198,10 +203,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
@@ -267,6 +272,14 @@
 
 (setq w3m-default-display-inline-images t)
 
+(eval-after-load "w3m"
+  '(let ((entries '(("application/pdf" "\\.pdf\\'" ("evince" file) nil)
+		    ("application/x-pdf" "\\.pdf\\'" ("evince" file) nil))))
+     (dolist (e entries)
+       (setq w3m-content-type-alist
+	     (cons e (remove* (car e) w3m-content-type-alist
+			      :key #'car :test #'string=))))))
+
 (setq w3-do-incremental-display t
       w3-use-menus '(file edit view go bookmark options
 		     buffers style search emacs nil help)
@@ -328,6 +341,7 @@
 
 (setq display-time-24hr-format t)
 (display-time)
+(column-number-mode 1)
 (trap
   (if window-system
       (let ((view-diary-entries-initially t))
@@ -381,12 +395,12 @@
 	 (cursor-color . "red"))
        (if mdw-black-background
 	   '((background-mode . dark))
-	 '((background-mode . light)))
-       (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.
 
@@ -440,8 +454,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)))
@@ -496,6 +513,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.