master updated (514372722a -> 681f2e23ae)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  514372722a Fix generalized variable documentation for recent change
       new  ec4f976e8e Document how :map and :scale interacts in image maps
       new  681f2e23ae Add a new user option grep-command-position


Summary of changes:
 doc/lispref/display.texi |  8 ++++++++
 lisp/progmodes/grep.el   | 24 +++++++++++++++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)