X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/e61fa1ae5f252cb86c5b86b12c68fd55113e8b55..285a138691b40d6d20931676cc9f2fdb52fe6737:/dot-emacs.el?ds=sidebyside

diff --git a/dot-emacs.el b/dot-emacs.el
index cb2047d..704f37d 100644
--- a/dot-emacs.el
+++ b/dot-emacs.el
@@ -29,8 +29,6 @@
   "Whether .emacs should optimize for rapid startup.
 This may be at the expense of cool features.")
 (let ((probe nil) (next command-line-args))
-  (message "probe = %s" probe)
-  (message "next = %s" next)
   (while next
     (cond ((string= (car next) "--mdw-fast-startup")
 	   (setq mdw-fast-startup t)
@@ -326,6 +324,7 @@ Not much right now.  Just support for doing MailCrypt stuff."
   (setq local-abbrev-table text-mode-abbrev-table)
   (setq major-mode 'mdwmail-mode)
   (setq mode-name "[mdw] mail")
+  (set-buffer-file-coding-system 'utf-8)
   (make-local-variable 'paragraph-separate)
   (make-local-variable 'paragraph-start)
   (setq paragraph-start (concat "[ \t]*[-_][-_][-_]+$\\|^-- \\|-----\\|"
@@ -364,6 +363,29 @@ Not much right now.  Just support for doing MailCrypt stuff."
     (perform-replace "\n-- \n" "\n-- " nil nil nil)))
 (add-hook 'mail-setup-hook 'mdwmail-mangle-signature)
 
+;;;----- Dired hacking ------------------------------------------------------
+
+(defadvice dired-maybe-insert-subdir
+    (around mdw-marked-insertion first activate)
+  "The DIRNAME may be a list of directory names to insert.  Interactively, if
+files are marked, then insert all of them.  With a numeric prefix argument,
+select that many entries near point; with a non-numeric prefix argument,
+prompt for listing options."
+  (interactive
+   (list (dired-get-marked-files nil
+				 (and (integerp current-prefix-arg)
+				      current-prefix-arg)
+				 #'file-directory-p)
+	 (and current-prefix-arg
+	      (not (integerp current-prefix-arg))
+	      (read-string "Switches for listing: "
+			   (or dired-subdir-switches
+			       dired-actual-switches)))))
+  (let ((dirs (ad-get-arg 0)))
+    (dolist (dir (if (listp dirs) dirs (list dirs)))
+      (ad-set-arg 0 dir)
+      ad-do-it)))
+
 ;;;----- URL viewing --------------------------------------------------------
 
 (defun mdw-w3m-browse-url (url &optional new-session-p)
@@ -426,7 +448,10 @@ a list of things:
 (make-variable-buffer-local 'mdw-fill-prefix)
 
 (defvar mdw-hanging-indents
-  "\\(\\(\\([*o]\\|--\\|[0-9]+\\.\\|\\[[0-9]+\\]\\|([a-zA-Z])\\)[ \t]+\\)?\\)"
+  (concat "\\(\\("
+	    "\\([*o]\\|-[-#]?\\|[0-9]+\\.\\|\\[[0-9]+\\]\\|([a-zA-Z])\\)"
+	    "[ \t]+"
+	  "\\)?\\)")
   "*Standard regular expression matching things which might be part of a
 hanging indent.  This is mainly useful in `auto-fill-mode'.")