stgit.el: Fix some incorrect indentation

[stgit] / contrib / stgit.el

diff --git a/contrib/stgit.el b/contrib/stgit.el
index 7f64a51c986c003aefd913d936413901d3b58560..9dc8bfd24cd7c2e980fb6923c612b5409890b55e 100644 (file)
--- a/contrib/stgit.el
+++ b/contrib/stgit.el
@@ -267,7 +267,7 @@ (defun stgit-reload ()
                    (propertize
                     (substitute-command-keys "--\n\"\\[stgit-toggle-worktree]\"\
  shows the working tree\n")
                    (propertize
                     (substitute-command-keys "--\n\"\\[stgit-toggle-worktree]\"\
  shows the working tree\n")

-                   'face 'stgit-description-face)))
+                    'face 'stgit-description-face)))

     (stgit-run-series stgit-ewoc)
     (if curpatch
         (stgit-goto-patch curpatch (and curfile (stgit-file-file curfile)))
     (stgit-run-series stgit-ewoc)
     (if curpatch
         (stgit-goto-patch curpatch (and curfile (stgit-file-file curfile)))


@@ -505,10 +505,8 @@ (defstruct (stgit-file)
   old-perm new-perm copy-or-rename cr-score cr-from cr-to status file)
 
 (defun stgit-describe-copy-or-rename (file)
   old-perm new-perm copy-or-rename cr-score cr-from cr-to status file)
 
 (defun stgit-describe-copy-or-rename (file)

-  (let (from to common-head common-tail
-        (arrow (concat " "
-                       (propertize "->" 'face 'stgit-description-face)
-                       " ")))
+  (let ((arrow (concat " " (propertize "->" 'face 'stgit-description-face) " "))
+        from to common-head common-tail)

 
     (when stgit-abbreviate-copies-and-renames
       (setq from (split-string (stgit-file-cr-from file) "/")
 
     (when stgit-abbreviate-copies-and-renames
       (setq from (split-string (stgit-file-cr-from file) "/")


@@ -1051,10 +1049,10 @@ (defun stgit-rename (name)
     (let ((name-sym (intern name)))
       (when (memq old-patchsym stgit-expanded-patches)
         (setq stgit-expanded-patches
     (let ((name-sym (intern name)))
       (when (memq old-patchsym stgit-expanded-patches)
         (setq stgit-expanded-patches

-            (cons name-sym (delq old-patchsym stgit-expanded-patches))))
+              (cons name-sym (delq old-patchsym stgit-expanded-patches))))

       (when (memq old-patchsym stgit-marked-patches)
         (setq stgit-marked-patches
       (when (memq old-patchsym stgit-marked-patches)
         (setq stgit-marked-patches

-            (cons name-sym (delq old-patchsym stgit-marked-patches))))
+              (cons name-sym (delq old-patchsym stgit-marked-patches))))

       (stgit-reload)
       (stgit-goto-patch name-sym))))
 
       (stgit-reload)
       (stgit-goto-patch name-sym))))
 


@@ -1310,8 +1308,8 @@ (defun stgit-show-patch (unmerged-stage ignore-whitespace)
                                  (and space-arg (list "-O" space-arg))
                                  (list (stgit-patch-name-at-point)))))
                (apply 'stgit-run args)))))
                                  (and space-arg (list "-O" space-arg))
                                  (list (stgit-patch-name-at-point)))))
                (apply 'stgit-run args)))))

-         (t
-          (error "No patch or file at point")))
+        (t
+         (error "No patch or file at point")))

       (with-current-buffer standard-output
         (goto-char (point-min))
         (diff-mode)))))
       (with-current-buffer standard-output
         (goto-char (point-min))
         (diff-mode)))))


@@ -1378,8 +1376,8 @@ (defun stgit-file-toggle-index ()
                           (stgit-file-cr-to patched-file)
                         (stgit-file-file patched-file)))
            (point-file  (if (eq patched-status 'rename)
                           (stgit-file-cr-to patched-file)
                         (stgit-file-file patched-file)))
            (point-file  (if (eq patched-status 'rename)

-                          (stgit-file-cr-from patched-file)
-                        (stgit-neighbour-file))))
+                            (stgit-file-cr-from patched-file)
+                          (stgit-neighbour-file))))

 
       (cond ((eq patch-name :work)
              (stgit-move-change-to-index (stgit-file-file patched-file)
 
       (cond ((eq patch-name :work)
              (stgit-move-change-to-index (stgit-file-file patched-file)