chiark / gitweb /
dot/emacs: Fix paragraph comment style.
[profile] / dot / emacs
index 49dbe7079afe6ff89ad3922b5d8ed74a09c5552c..4bf9ae9f40d91f6254732cee93803bfdb794a559 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -36,6 +36,9 @@
 (require 'cl)
 (require 'dot-emacs)
 
+(unless (mdw-emacs-version-p 25)
+  (trap (require 'bracketed-paste) (bracketed-paste-enable)))
+
 ;;;--------------------------------------------------------------------------
 ;;; Some random initialisation.
 
 (setq calc-settings-file "~/.emacs-calc")
 (load calc-settings-file)
 
-;; ---- Some mail and news configuration ---
+;; Some mail and news configuration.
 
 (setq mail-from-style 'angles
       mail-signature t
     (apply #'set-input-mode
           (nconc (list (nth 0 im) (nth 1 im) 0) (nthcdr 3 im)))))
 
+;; Some unpleasant terminal hackery.  Screen prefixes the current terminal
+;; name with `screen.', and Emacs is too dim to split the name at the `.'.
+;; Help it out.
+
+(defun terminal-init-screen.xterm ()
+  (tty-run-terminal-initialization (selected-frame) "screen"))
+(defun terminal-init-screen.putty ()
+  (tty-run-terminal-initialization (selected-frame) "screen"))
+
 ;; Don't disable any commands.
 
 (mapatoms #'(lambda (sym) (put sym 'disabled nil)))
       ido-default-file-method 'selected-window
       ido-default-buffer-method 'selected-window)
 (setq ido-enable-flex-matching t
+      ido-everywhere t
       ido-confirm-unique-completion t
-      ido-use-filename-at-point nil)
+      ido-use-filename-at-point nil
+      ido-auto-merge-work-directories-length -1)
+(setq pcomplete-cycle-completions nil  ;Who thought that was a good idea?
+      eshell-cmpl-cycle-completions nil)
 (setq dired-deletion-confirmer         ;Make deletion easier in dired
       (symbol-function 'y-or-n-p)
       dired-listing-switches "-alF"    ;Do `ls -F' things in dired windows
 (setq read-quoted-char-radix 16)       ;C-q HEX-STUFF [RET]
 (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 blink-cursor-blinks 0)           ;Keep blinking the cursor
 (setq-default fill-column mdw-text-width) ;I use rather narrow windows
+(setq reb-re-syntax 'string)           ;Enough backslashes even with this
 (setq-default comment-column 40)       ;Set a standard comment column
 (setq-default truncate-partial-width-windows nil
              truncate-lines t)
 (setq default-indicate-empty-lines t)
 (setq view-read-only t)
+(setq-default view-exit-action #'kill-buffer)
 (setq whitespace-style '(trailing empty indentation face lines-tail
                         space-before-tab space-after-tab)
       whitespace-line-column mdw-text-width)
 (setq url-cookie-untrusted-urls '("."))
 
 (setq browse-url-browser-function (mdw-good-url-browser)
-      browse-url-generic-program "mdw-chrome"
+      browse-url-generic-program "chromium"
       browse-url-mozilla-program "mdw-iceweasel")
 
 (setq w3m-default-display-inline-images t
        (w32 (font . "fixed613 10")
             (background-color . "black")
             (foreground-color . "white"))
-       (nil (menu-bar-lines . 0))))
+       (nil (menu-bar-lines . 0)
+            (background-color . nil))))
 (let ((backg (frame-parameter nil 'background-color)))
   (if (and backg window-system)
       (push (cons 'background-color backg) default-frame-alist)))
 (setq windmove-wrap-around t)
 (trap (require 'ido) (ido-mode 1)
       (require 'ido-ubiquitous) (ido-ubiquitous-mode 1)
+      (setq ido-cr+-max-items nil
+           ido-ubiquitous-command-overrides
+           (append ido-ubiquitous-command-overrides
+                   `((enable-old regexp ,(concat "\\`"
+                                                 "gtags-find-"
+                                                 "\\("    "tag"
+                                                       "\\|file"
+                                                       "\\|rtag"
+                                                       "\\|symbol"
+                                                 "\\)"
+                                                 "\\(" "\\|-other-window"
+                                                 "\\)"
+                                                 "\\'")))))
       (setq magit-completing-read-function 'magit-ido-completing-read)
       (require 'smex) (smex-initialize) (global-set-key [?\M-x] 'smex))
+
 (progn
   (global-set-key [?\C-c ?\M-x] 'execute-extended-command)
   (global-set-key [?\e ?\e] 'mdw-wrong)
   (global-set-key [?\C-c ?t ?i] 'timeclock-in)
   (global-set-key [?\C-c ?t ?c] 'timeclock-change)
   (global-set-key [?\C-c ?t ?o] 'timeclock-out)
-  (global-set-key [?\C-c ?t ?r] 'timeclock-reread-log)
+  (global-set-key [?\C-c ?t ?R] 'timeclock-reread-log)
   (global-set-key [?\C-c ?t ?w] 'timeclock-workday-remaining-string)
   (global-set-key [?\C-c ?t ?s] 'timeclock-status-string)
   (global-set-key [?\C-c ?m ?m] 'magit-status)
   (global-set-key [?\C-c ?m ?d] 'magit-dispatch-popup)
   (global-set-key [?\C-c ?m ?w] 'magit-wip-log)
   (global-set-key [?\C-c ?m ?r] 'magit-list-repositories)
+  (global-set-key [?\C-c ?m ?b] 'magit-blame)
   (global-set-key [?\C-c ?p ?p] 'mdw-mpc-play-or-pause)
   (global-set-key [?\C-c ?p ?s] 'mdw-mpc-stop)
   (global-set-key [?\C-c ?p ?<] 'mdw-mpc-prev)
   (global-set-key [?\C-c ?p ?>] 'mdw-mpc-next)
+  (global-set-key [?\C-c ?p ?+] 'mdw-mpc-louder)
+  (global-set-key [?\C-c ?p ?-] 'mdw-mpc-quieter)
   (global-set-key [?\C-c ?p ??] 'mdw-mpc-now-playing)
+  (global-set-key [?\C-c ?t ?t] 'gtags-find-tag-from-here)
+  (global-set-key [?\C-c ?t ?.] 'gtags-find-tag)
+  (global-set-key [?\C-c ?t ?r] 'gtags-find-rtag)
+  (global-set-key [?\C-c ?t ?4 ?.] 'gtags-find-tag-other-window)
+  (global-set-key [?\C-c ?t ?,] 'gtags-pop-stack)
   (global-set-key [?\C-c ?k] 'mdw-compile)
   (global-set-key [?\C-x ?3] 'mdw-split-window-horizontally)
   (global-set-key [?\M-#] 'calc-dispatch)
      (trap (require 'dired-x))
      (and (fboundp 'dired-do-relsymlink)
          (define-key dired-mode-map [?\C-c ?\C-s] 'dired-do-relsymlink))))
+(setq dired-guess-shell-alist-user
+      '(("\\.pdf\\'" "mupdf")))
 
 (add-hook 'org-mode-hook
          #'(lambda () (mdw-clobber-evil-keymap org-mode-map)))
        TeXinfo-mode-hook tex-mode-hook latex-mode-hook
        texinfo-mode-hook emacs-lisp-mode-hook scheme-mode-hook
        lisp-mode-hook lisp-interaction-mode-hook makefile-mode-hook
-       inferior-lisp-mode-hook slime-repl-mode-hook
+       inferior-lisp-mode-hook slime-repl-mode-hook ielm-mode-hook
        sml-mode-hook haskell-mode-hook erlang-mode-hook
        smalltalk-mode-hook rexx-mode-hook lua-mode-hook
        arm-assembler-mode-hook))
   (add-hook 'lisp-mode-hook 'mdw-fontify-lispy t)
   (add-hook 'inferior-lisp-mode-hook 'mdw-fontify-lispy t)
   (add-hook 'lisp-interaction-mode-hook 'mdw-fontify-lispy t)
+  (add-hook 'ielm-mode-hook 'mdw-fontify-lispy t)
   (add-hook 'slime-repl-mode-hook 'mdw-fontify-lispy t)
   (add-hook 'lisp-mode-hook 'mdw-common-lisp-indent t)
   (add-hook 'inferior-lisp-mode-hook
        ("^html?$" "." "sensible-browser %o")))
 
 (setq TeX-view-program-list
-      '(("mupdf" "mupdf %o" (mode-io-correlate " %(outpage)"))))
+      '(("mupdf" ("mupdf %o" (mode-io-correlate " %(outpage)")))))
 
 (setq TeX-view-program-selection
       '(((output-dvi style-pstricks) "dvips and gv")