master updated (a6be184 -> 3b708f4)

[Stefan Kangas]

skangas pushed a change to branch master.

      from  a6be184   Fix indentation of non-comment HTML with -- in it
       new  f215332   Add cross-references to defvar-local
       new  7de495a   Make two eshell aliases obsolete
       new  c322728   Redefine two functions as regular defuns
       new  1fdd7a0   Make XEmacs compat alias obsolete in allout-widgets.el
       new  9785c6d   * lisp/hi-lock.el (hi-lock-mode): Doc fix; don't mention 
Emacs 21.
       new  d987ca6   Remove another variable obsolete since Emacs 23.2
       new  3b708f4   * test/src/minibuf-tests.el (test-inhibit-interaction): 
Fix test.


Summary of changes:
 etc/NEWS                  |  5 +++--
 lisp/allout-widgets.el    | 11 +++--------
 lisp/dframe.el            | 34 ++++++++++++++++------------------
 lisp/eshell/esh-cmd.el    | 18 +++++++++---------
 lisp/eshell/esh-util.el   |  7 +++----
 lisp/hi-lock.el           |  8 +-------
 lisp/subr.el              |  1 -
 src/data.c                |  4 +++-
 src/eval.c                |  2 ++
 src/keymap.c              |  9 ---------
 test/src/minibuf-tests.el |  8 ++++----
 11 files changed, 44 insertions(+), 63 deletions(-)