Mercurial > emacs
changeset 110057:a256d36d6257
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Fri, 27 Aug 2010 07:07:20 +0000 |
| parents | 6c405a2a9f8e (current diff) 5eae6917d2e0 (diff) |
| children | 1b626601d32d |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Aug 27 01:53:01 2010 +0000 +++ b/lisp/ChangeLog Fri Aug 27 07:07:20 2010 +0000 @@ -1,3 +1,7 @@ +2010-08-27 Vinicius Jose Latorre <viniciusjl@ig.com.br> + + * whitespace.el (whitespace-style): Adjust type declaration. + 2010-08-26 Nathan Weizenbaum <nweiz@cressida.sea.corp.google.com> (tiny change) * progmodes/js.el: Make indentation more customizable (Bug#6914).
--- a/lisp/whitespace.el Fri Aug 27 01:53:01 2010 +0000 +++ b/lisp/whitespace.el Fri Aug 27 07:07:20 2010 +0000 @@ -529,6 +529,8 @@ See also `whitespace-display-mappings' for documentation." :type '(repeat :tag "Kind of Blank" (choice :tag "Kind of Blank Face" + (const :tag "(Face) Face visualization" + face) (const :tag "(Face) Trailing TABs, SPACEs and HARD SPACEs" trailing) (const :tag "(Face) SPACEs and HARD SPACEs"