X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/901d426f8e841337176c8a60deaf0ce29362040a..a5807b1e0acdb7427fc14f24ddf0f040cc8b7b28:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 4f1fb58..7208737 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -46,6 +46,11 @@
 
 ;; Load some other bits of code.
 
+;; Magic to make ELPA packages work.
+(trap
+(package-initialize)
+)
+
 (maybe-autoload 'cc-mode "cc-mode" nil t)
 (maybe-autoload 'rexx-mode "rexx-mode" nil t)
 (maybe-autoload 'cvs-update "pcl-cvs" nil t)
@@ -130,6 +135,7 @@
 
 (and (or window-system (mdw-emacs-version-p 23))
      (not mdw-fast-startup)
+     (not (and (fboundp 'daemonp) (daemonp)))
      (progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")
 		  edit-server-new-frame nil
 		  gnuserv-frame t)
@@ -187,6 +193,8 @@
 (setq sendmail-program "~/bin/sendmail-hack"
       send-mail-function 'sendmail-send-it
       mail-interactive t
+      mail-specify-envelope-from t
+      mail-envelope-from 'header
       sendmail-error-reporting-interactive '("-odb" "-oee"))
 (autoload 'sendmail-send-it "sendmail")
 (autoload 'smtpmail-send-it "smtpmail")
@@ -220,6 +228,7 @@
       bbdb-north-american-phone-numbers-p nil
       bbdb-dwim-net-address-allow-redundancy t
       bbdb-extract-address-components-func 'bbdb-extract-address-components
+      bbdb-allow-duplicates t
       bbdb/news-auto-create-p
       (lambda ()
 	(let ((group gnus-newsgroup-name))
@@ -343,7 +352,7 @@
       eshell-cmpl-cycle-completions nil)
 (setq dired-deletion-confirmer		;Make deletion easier in dired
       (symbol-function 'y-or-n-p)
-      delete-by-moving-to-trash t
+      delete-by-moving-to-trash (mdw-emacs-version-p 24)
       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]
@@ -373,12 +382,14 @@
 (setq find-ls-option			;Build file lists efficiently
       '("-print0 | xargs -0r ls -ld" . "ld"))
 (setq bookmark-save-flag 0)		;Save bookmarks automatically
-(setq vc-follow-symlinks t)
+(setq vc-follow-symlinks t
+      vc-git-resolve-conflicts nil)
 (setq x-gtk-file-dialog-help-text nil)
 (setq use-dialog-box nil)
 (setq Info-fontify-maximum-menu-size 100000)
 (setq set-mark-command-repeat-pop t)
 (setq password-cache-expiry nil)
+(setq mouse-autoselect-window t)
 (setq-default proced-filter 'all
 	      proced-sort 'user)
 (setq ispell-program-name "aspell-hack"
@@ -410,6 +421,9 @@
      (define-key outline-mode-prefix-map [?\C-r] 'reveal-mode)
      (define-key outline-mode-prefix-map [?\C--] 'mdw-outline-collapse-all)))
 
+(define-key isearch-mode-map [?\C-?] 'isearch-del-char)
+(define-key isearch-mode-map [?\e ?\C-?] 'isearch-delete-char)
+
 (setq imenu-auto-rescan t
       imenu-auto-rescan-maxout (* 128 1024)
       imenu-max-items 60)
@@ -581,10 +595,7 @@
 (setq frame-background-mode (if mdw-black-background 'dark 'light)
       frame-inhibit-implied-resize t
       default-frame-alist
-      `((width . ,(+ mdw-column-width
-		     (cond ((<= emacs-major-version 20) 1)
-			   ((= emacs-major-version 26) 3)
-			   (t 0))))
+      `((width . ,(+ mdw-column-width mdw-frame-width-fudge))
 	(height . 33)
 	(vertical-scroll-bars . right)
 	(cursor-type . bar)
@@ -615,7 +626,12 @@
 
 ;; Other frame fiddling.
 
-(setq frame-title-format '("" invocation-name "@" system-name ": %b"))
+(defvar mdw-hostname
+  (if (string-match "\\." system-name)
+      (substring system-name 0 (match-beginning 0))
+    system-name))
+(setq frame-title-format '("Emacs " user-login-name "@" mdw-hostname " – %b")
+      icon-title-format frame-title-format)
 
 ;; Global keymap changes.
 
@@ -655,8 +671,8 @@
   (global-set-key [?\e ?\e] 'mdw-wrong)
   (global-set-key [?\e ?\C-\] ?\C-\]] 'keyboard-escape-quit)
   (global-set-key [?\C-c ?\M-x] 'execute-extended-command)
-  (global-set-key [?\C-c ?d ?w] 'devhelp-word-at-point)
   (global-set-key [?\C-c ?d ?a] 'devhelp-assistant-word-at-point)
+  (global-set-key [?\C-c ?d ?w] 'devhelp-word-at-point)
   (global-set-key [?\C-c ?g ?a] 'org-agenda)
   (global-set-key [?\C-c ?g ?b] 'org-iswitchb)
   (global-set-key [?\C-c ?g ?l] 'org-store-link)
@@ -698,6 +714,9 @@
   (global-set-key [?\C-c ?w left] 'windmove-left)
   (global-set-key [?\C-c ?w right] 'windmove-right)
   (global-set-key [?\C-h ?\C-m] 'manual-entry)
+  (global-set-key [?\C-x ?4 ?\C-j] 'dired-jump-other-window)
+  (global-set-key [?\C-x ?4 ?j] 'dired-jump-other-window)
+  (global-set-key [?\C-x ?\C-j] 'dired-jump)
   (global-set-key [?\C-x ?\C-n] 'skel-create-file)
   (global-set-key [?\C-x ?4 ?n] 'skel-create-file-other-window)
   (global-set-key [?\C-x ?5 ?n] 'skel-create-file-other-frame)
@@ -726,6 +745,9 @@
 				   try-expand-list-all-buffers)))
 		    hippie-expand-try-functions-list)))
 
+(autoload 'dired-jump "dired-x")
+(autoload 'dired-jump-other-window "dired-x")
+
 (eval-after-load "dired"
   '(progn
      (or (lookup-key dired-mode-map  [?\C-x ?\C-q])