master updated (5233186611 -> 9c0b90e6a9)

[Stefan Kangas]

skangas pushed a change to branch master.

      from  5233186611 Revert "Pacify -Wnull-dereference"
       new  2ea9f69f07 Fix failing eshell alias tests
       new  9c0b90e6a9 Prefer defvar-keymap in octave.el


Summary of changes:
 lisp/progmodes/octave.el          | 72 ++++++++++++++++++---------------------
 test/lisp/eshell/esh-var-tests.el | 20 ++++++-----
 2 files changed, 45 insertions(+), 47 deletions(-)