diff options
| author | Ted Zlatanov | 2013-07-10 10:34:13 -0400 |
|---|---|---|
| committer | Ted Zlatanov | 2013-07-10 10:34:13 -0400 |
| commit | c7a4d3688ebdee56857af83ab86ab5f2a4065aa6 (patch) | |
| tree | 3271234730514cfb73d54904885a995e5cf14507 | |
| parent | 12580a07f4b419d069247f3e2e5c359a639aae03 (diff) | |
| download | emacs-c7a4d3688ebdee56857af83ab86ab5f2a4065aa6.tar.gz emacs-c7a4d3688ebdee56857af83ab86ab5f2a4065aa6.zip | |
* progmodes/cfengine.el: Do not indent inside continued strings.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/cfengine.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 91ce836617c..c159daa161d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-07-10 Teodor Zlatanov <tzz@lifelogs.com> | ||
| 2 | |||
| 3 | * progmodes/cfengine.el (cfengine3-indent-line): Do not indent | ||
| 4 | inside continued strings. | ||
| 5 | |||
| 1 | 2013-07-10 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2013-07-10 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | Timestamp fixes for undo (Bug#14824). | 8 | Timestamp fixes for undo (Bug#14824). |
diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el index 55d5b8b0be7..85a9074760d 100644 --- a/lisp/progmodes/cfengine.el +++ b/lisp/progmodes/cfengine.el | |||
| @@ -387,10 +387,10 @@ Intended as the value of `indent-line-function'." | |||
| 387 | (skip-chars-forward " \t") | 387 | (skip-chars-forward " \t") |
| 388 | (current-column))) | 388 | (current-column))) |
| 389 | (error nil))) | 389 | (error nil))) |
| 390 | ;; Inside a string and it starts before this line. | 390 | ;; Inside a string and it starts before this line: do nothing. |
| 391 | ((and (nth 3 parse) | 391 | ((and (nth 3 parse) |
| 392 | (< (nth 8 parse) (save-excursion (beginning-of-line) (point)))) | 392 | (< (nth 8 parse) (save-excursion (beginning-of-line) (point)))) |
| 393 | (indent-line-to 0)) | 393 | ) |
| 394 | 394 | ||
| 395 | ;; Inside a defun, but not a nested list (depth is 1). This is | 395 | ;; Inside a defun, but not a nested list (depth is 1). This is |
| 396 | ;; a promise, usually. | 396 | ;; a promise, usually. |