diff options
| author | Joakim Verona | 2012-12-14 21:12:14 +0100 |
|---|---|---|
| committer | Joakim Verona | 2012-12-14 21:12:14 +0100 |
| commit | 0872f5e617a91c213e0218affdefaeac93a970f9 (patch) | |
| tree | d5a221919f02cf47717bac9901ece164796a09a3 /lisp | |
| parent | b29dde6b4e5a34b41c3fb6f5ea6890a2ad109e7b (diff) | |
| parent | cccaebd24d257278c31493e10a7a837ddb12fc4f (diff) | |
| download | emacs-0872f5e617a91c213e0218affdefaeac93a970f9.tar.gz emacs-0872f5e617a91c213e0218affdefaeac93a970f9.zip | |
auto upstream
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/json.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/ruby-mode.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/json.el b/lisp/json.el index 0927625de9f..8432ba40c12 100644 --- a/lisp/json.el +++ b/lisp/json.el | |||
| @@ -100,7 +100,7 @@ tell the difference between `false' and `null'. Consider let-binding | |||
| 100 | this around your call to `json-read' instead of `setq'ing it.") | 100 | this around your call to `json-read' instead of `setq'ing it.") |
| 101 | 101 | ||
| 102 | (defvar json-encoding-separator "," | 102 | (defvar json-encoding-separator "," |
| 103 | "Value to use as an element seperator when encoding.") | 103 | "Value to use as an element separator when encoding.") |
| 104 | 104 | ||
| 105 | (defvar json-encoding-default-indentation " " | 105 | (defvar json-encoding-default-indentation " " |
| 106 | "The default indentation level for encoding. | 106 | "The default indentation level for encoding. |
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index 8ac2f659058..bc53c1f9556 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el | |||
| @@ -1340,7 +1340,7 @@ It will be properly highlighted even when the call omits parens.")) | |||
| 1340 | (goto-char start) | 1340 | (goto-char start) |
| 1341 | ;; Find all expression expansions and | 1341 | ;; Find all expression expansions and |
| 1342 | ;; - save the match data to a text property, for font-locking later, | 1342 | ;; - save the match data to a text property, for font-locking later, |
| 1343 | ;; - set the syntax of all double quotes and backticks to puctuation. | 1343 | ;; - set the syntax of all double quotes and backticks to punctuation. |
| 1344 | (while (re-search-forward ruby-expression-expansion-re end 'move) | 1344 | (while (re-search-forward ruby-expression-expansion-re end 'move) |
| 1345 | (let ((beg (match-beginning 2)) | 1345 | (let ((beg (match-beginning 2)) |
| 1346 | (end (match-end 2))) | 1346 | (end (match-end 2))) |