From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 26 Jul 2012 01:29:24 +0000 (-0400)
Subject: * lisp/mouse.el (popup-menu): Fix last change.
X-Git-Tag: emacs-24.2.90~1077
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=670d85ea14e772836797d43101f9c5c5cc1af05e;p=emacs.git

* lisp/mouse.el (popup-menu): Fix last change.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 40cded6f9cc..e249b4ab759 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* mouse.el (popup-menu): Fix last change.
+
 2012-07-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	Autoload from Lisp with more care.  Follow aliases when looking for
@@ -31,7 +35,6 @@
 	* emacs-lisp/byte-opt.el (byte-compile-inline-expand):
 	* calc/calc.el (name): Use autoloadp & autoload-do-load.
 
-
 2012-07-25  Alp Aker  <alp.tekin.aker@gmail.com>
 
 	* international/mule-cmds.el (ucs-insert): Mark it as an obsolete
@@ -88,8 +91,8 @@
 
 2012-07-21  Leo Liu  <sdl.web@gmail.com>
 
-	* progmodes/cc-cmds.el (c-defun-name): Use
-	match-string-no-properties instead for consistency.
+	* progmodes/cc-cmds.el (c-defun-name):
+	Use match-string-no-properties instead for consistency.
 
 2012-07-20  Leo Liu  <sdl.web@gmail.com>
 
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el
index f22bda1559a..2d00aa62c20 100644
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@ -260,7 +260,7 @@ Remove from SYMBOL's plist the property PROPNAME and its value.
 ;;;;;;  cl-do cl-loop cl-return-from cl-return cl-block cl-etypecase
 ;;;;;;  cl-typecase cl-ecase cl-case cl-load-time-value cl-eval-when
 ;;;;;;  cl-destructuring-bind cl-function cl-defmacro cl-defun cl-gentemp
-;;;;;;  cl-gensym) "cl-macs" "cl-macs.el" "6b06545d8d17e8b902435f08be6ac0c2")
+;;;;;;  cl-gensym) "cl-macs" "cl-macs.el" "db390970b6e9bd057169b197d5189781")
 ;;; Generated autoloads from cl-macs.el
 
 (autoload 'cl-gensym "cl-macs" "\
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 84b76e184a8..07277a409ae 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -116,7 +116,7 @@ PREFIX is the prefix argument (if any) to pass to the command."
   (setq position
 	(cond
 	 ((eq position 'point)
-	  (let* ((pp (posn-at-point pos window))
+	  (let* ((pp (posn-at-point))
                  (xy (posn-x-y pp)))
 	    (list (list (car xy) (cdr xy)) (posn-window pp))))
 	 ((not position)