Merge commit 'kha/safe'

diff --git a/.mailmap b/.mailmap
index cdb1bebbe1deaaaf935b7b5c77f05dc8803f009f..1a2b506b87773d9da39bbd9e175262f7f833df3f 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -3,5 +3,5 @@
 
 Bryan Larsen <bryan.larsen@gmail.com>
 Bryan Larsen <bryanlarsen@yahoo.com>
-Karl Hasselström <kha@treskal.com>
+Karl Wiberg <kha@treskal.com>
 Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

diff --git a/AUTHORS b/AUTHORS
index 66178065727525bf98909f57c03f32a17bf09859..34de9fd639fffbda9672c7bf74a675292fd7f3d2 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,4 @@
 Catalin Marinas <catalin.marinas@gmail.com>
         http://www.procode.org/about.html
-Karl Hasselström <kha@treskal.com>
+Karl Wiberg <kha@treskal.com>
         http://www.treskal.com/kalle/

diff --git a/contrib/stgit.el b/contrib/stgit.el
index ed6342ca2c4a626580492ad6b10b937f48df4c03..3ebbffb6bb862488ce430c25c3a40f96296807f3 100644 (file)
--- a/contrib/stgit.el
+++ b/contrib/stgit.el
@@ -68,6 +68,8 @@ (defmacro stgit-capture-output (name &rest body)
   "Capture StGit output and, if there was any output, show it in a window
 at the end.
 Returns nil if there was no output."
+  (declare (debug ([&or stringp null] body))
+           (indent 1))
   `(let ((output-buf (get-buffer-create ,(or name "*StGit output*")))
          (stgit-dir default-directory)
          (inhibit-read-only t))
@@ -82,7 +84,6 @@ (defmacro stgit-capture-output (name &rest body)
        (setq buffer-read-only t)
        (if (< (point-min) (point-max))
            (display-buffer output-buf t)))))
-(put 'stgit-capture-output 'lisp-indent-function 1)
 
 (defun stgit-make-run-args (args)
   "Return a copy of ARGS with its elements converted to strings."