branch: elpa/pg
commit b6547e6fe09867f5d7a84b5c20d914e69af454bc
Author: Eric Marsden <[email protected]>
Commit: Eric Marsden <[email protected]>

    Fix botched merge
---
 pg.el | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pg.el b/pg.el
index 48d0f78f0c..44f35a988c 100644
--- a/pg.el
+++ b/pg.el
@@ -655,12 +655,12 @@ presented to the user."
       (let ((c (pg--read-char con)))
         (unless (member c '(?Z ?E))
           (message "Unexpected message type after ErrorMsg (error was %s): %s" 
e c)
-          (pg--unread-char con)))
-          ;; Read message length then status.
-          (pg--read-net-int con 4)
-          (let ((status (pg--read-char con)))
-            (when (eql ?Z c)
-              (pg--set-transaction-status con status)))))
+          (pg--unread-char con))
+        ;; Read message length then status.
+        (pg--read-net-int con 4)
+        (let ((status (pg--read-char con)))
+          (when (eql ?Z c)
+            (pg--set-transaction-status con status)))))
     (let ((msg (format "%s%s: %s (%s) SQLSTATE=%s"
                        (pgerror-severity e)
                        (if context (concat " " context) "")

Reply via email to