[PATCH] espresso-mode breaks on JSON input

[Deniz Dogan <deniz.a.m.dogan@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 599 bytes --]

(N.B. I'm not sure if this patch belongs here.)

Using a buffer with the following contents (JSON), espresso-mode would
break telling me it expected a number or marker but got nil whenever I
tried to indent the region. I put together a patch which effectively
indents it correctly and doesn't report an error. It basically checks
that (char-before) is non-nil before comparing it to ?\).

[
   {
     "pk": 2,
  "fields": {
          "url": "http://abc.go.com/",
       "name": "ABC"
    }
      }
]

Attached is the patch. I'm not sure about the format, but I hope it can be used.

-- 
Deniz Dogan

[-- Attachment #2: espresso-fix-json-indent-deniz.patch --]
[-- Type: application/octet-stream, Size: 762 bytes --]

diff -c /home/deniz/sources/espresso/espresso.el /home/deniz/.emacs.d/espresso.el
--- /home/deniz/sources/espresso/espresso.el	2009-09-12 01:08:12.000000000 +0200
+++ /home/deniz/.emacs.d/espresso.el	2009-09-12 01:09:13.000000000 +0200
@@ -1809,7 +1809,9 @@
              (if (looking-at "[({[]\\s-*\\(/[/*]\\|$\\)")
                  (progn
                    (skip-syntax-backward " ")
-                   (when (= (char-before) ?\)) (backward-list))
+                   (when (and (char-before)
+                              (= (char-before) ?\)))
+                     (backward-list))
                    (back-to-indentation)
                    (cond (same-indent-p
                           (current-column))

Diff finished.  Sat Sep 12 01:09:22 2009