From: Kenichi Handa Date: Mon, 1 Nov 2010 07:55:44 +0000 (+0900) Subject: merge trunk X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~421 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8877ed24fa258b82e1e813bb2b328bd35677e31a;p=emacs.git merge trunk --- 8877ed24fa258b82e1e813bb2b328bd35677e31a diff --cc lisp/ChangeLog index 9be6d045de3,7a9434d3767..94d7c9de921 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,19 -1,10 +1,24 @@@ +2010-11-01 Kenichi Handa + + * faces.el (glyphless-char): Inherit underline for tty. + +2010-10-28 Kenichi Handa + + Implement various display methods for glyphless characters. + + * international/characters.el (char-acronym-table): New variable. + (glyphless-char-control): New variable. + (update-glyphless-char-display): New funciton. + + * faces.el (glyphless-char): New face. + 2010-11-01 Glenn Morris + * calendar/holidays.el (general-holidays, oriental-holidays) + (local-holidays, other-holidays, hebrew-holidays, christian-holidays) + (islamic-holidays, bahai-holidays, solar-holidays): Move aliases before + the definitions of their targets. + * emacs-lisp/smie.el (smie): New custom group. (smie-blink-matching-inners, smie-indent-basic): Add :group.