Merge remote-tracking branch 'origin/master' into feature/android

diff --cc lisp/mouse.el
index 50c10880da701dffb3b01989b71ac3c25f4cb070,1e1f0808f9f648c18a163ca5b4d454f50b7ceb38..6ccee8e18afc0c9108d95132da6047ba4efad67e
--- 1/lisp/mouse.el
--- 2/lisp/mouse.el
+++ b/lisp/mouse.el
@@@ -206,11 -206,13 +206,16 @@@ always return a positive integer or zer
  \f
  ;; Provide a mode-specific menu on a mouse button.
  
- (defun minor-mode-menu-from-indicator (indicator &optional event)
 -(defun minor-mode-menu-from-indicator (indicator &optional window)
++(defun minor-mode-menu-from-indicator (indicator &optional window event)
    "Show menu for minor mode specified by INDICATOR.
+ 
+ INDICATOR is either a string object returned by `posn-object' or
+ the car of such an object.  WINDOW may be the window whose mode
+ line is being displayed.
+ 
 +EVENT may be the mouse event that is causing this menu to be
 +displayed.
 +
  Interactively, INDICATOR is read using completion.
  If there is no menu defined for the minor mode, then create one with
  items `Turn Off' and `Help'."
@@@ -243,11 -260,10 +263,13 @@@
  (defun mouse-minor-mode-menu (event)
    "Show minor-mode menu for EVENT on minor modes area of the mode line."
    (interactive "@e")
-   (let ((indicator (car (nth 4 (car (cdr event))))))
-     (minor-mode-menu-from-indicator indicator event)))
+   (let* ((posn (event-start event))
+          (indicator (posn-object posn))
+          (window (posn-window posn)))
 -    (minor-mode-menu-from-indicator indicator window)))
++    (minor-mode-menu-from-indicator indicator window event)))
 +
 +;; See (elisp)Touchscreen Events.
 +(put 'mouse-minor-mode-menu 'mouse-1-menu-command t)
  
  (defun mouse-menu-major-mode-map ()
    (run-hooks 'activate-menubar-hook 'menu-bar-update-hook)