diff options
| author | Chong Yidong | 2009-09-12 00:01:00 +0000 |
|---|---|---|
| committer | Chong Yidong | 2009-09-12 00:01:00 +0000 |
| commit | 34cab3d9c1c6d396f3d7cb5876417ca3379f5254 (patch) | |
| tree | c99034eedb053bc83b3faaed223a59e155a2fc20 | |
| parent | b4587710d34b1deeb4b3a965031f1dcd8eaad223 (diff) | |
| download | emacs-34cab3d9c1c6d396f3d7cb5876417ca3379f5254.tar.gz emacs-34cab3d9c1c6d396f3d7cb5876417ca3379f5254.zip | |
* progmodes/js.el (js--proper-indentation): Handle the case where
char-before is null. Reported by Deniz Dogan.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/js.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 45f6e33c5a5..5c3c42cc1d2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2009-09-11 Daniel Colascione <dan.colascione@gmail.com> | ||
| 2 | |||
| 3 | * progmodes/js.el (js--proper-indentation): Handle the case where | ||
| 4 | char-before is null. Reported by Deniz Dogan. | ||
| 5 | |||
| 1 | 2009-09-11 Juanma Barranquero <lekktu@gmail.com> | 6 | 2009-09-11 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 7 | ||
| 3 | * emacs-lisp/cl-macs.el (help-add-fundoc-usage): Declare. | 8 | * emacs-lisp/cl-macs.el (help-add-fundoc-usage): Declare. |
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 37b7d531501..db8a52330c1 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el | |||
| @@ -1753,7 +1753,7 @@ nil." | |||
| 1753 | (if (looking-at "[({[]\\s-*\\(/[/*]\\|$\\)") | 1753 | (if (looking-at "[({[]\\s-*\\(/[/*]\\|$\\)") |
| 1754 | (progn | 1754 | (progn |
| 1755 | (skip-syntax-backward " ") | 1755 | (skip-syntax-backward " ") |
| 1756 | (when (= (char-before) ?\)) (backward-list)) | 1756 | (when (eq (char-before) ?\)) (backward-list)) |
| 1757 | (back-to-indentation) | 1757 | (back-to-indentation) |
| 1758 | (cond (same-indent-p | 1758 | (cond (same-indent-p |
| 1759 | (current-column)) | 1759 | (current-column)) |