diff options
| author | Stefan Monnier | 2011-02-10 14:40:17 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2011-02-10 14:40:17 -0500 |
| commit | 9517f8af147c034fd2242377a5212c8de4115e1f (patch) | |
| tree | 4b072e0b8fa47d0e0148001284cf4b9548e92738 /lisp/ChangeLog | |
| parent | cf77dd27af3e9893f4051887cb0e17999bbdb631 (diff) | |
| download | emacs-9517f8af147c034fd2242377a5212c8de4115e1f.tar.gz emacs-9517f8af147c034fd2242377a5212c8de4115e1f.zip | |
* lisp/emacs-lisp/smie.el (smie-blink-matching-open): Don't use `pos' in two
conflicting ways.
(smie-indent--parent): Extend to "parent of arg".
(smie-indent-inside-string): New function.
(smie-indent-functions): Use it.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 70dc7697814..e89003e724b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,11 @@ | |||
| 1 | 2011-02-10 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2011-02-10 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 2 | ||
| 3 | * emacs-lisp/smie.el (smie-blink-matching-open): Don't use `pos' in two | ||
| 4 | conflicting ways. | ||
| 5 | (smie-indent--parent): Extend to "parent of arg". | ||
| 6 | (smie-indent-inside-string): New function. | ||
| 7 | (smie-indent-functions): Use it. | ||
| 8 | |||
| 3 | * vc/vc-dir.el (vc-dir-refresh): Reorder operations to try and avoid | 9 | * vc/vc-dir.el (vc-dir-refresh): Reorder operations to try and avoid |
| 4 | bzr locking race condition. | 10 | bzr locking race condition. |
| 5 | 11 | ||