From: Glenn Morris <rgm@gnu.org>
Date: Sun, 13 Dec 2015 11:25:35 +0000 (-0500)
Subject: ; Auto-commit of ChangeLog files.
X-Git-Tag: emacs-26.0.90~2895
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=23b5c22703eeee7b4fe6608ce12ffe3b87794933;p=emacs.git

; Auto-commit of ChangeLog files.
---

diff --git a/ChangeLog.2 b/ChangeLog.2
index 07a6c0eeff9..c4d954f4c8c 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -1,3 +1,10 @@
+2015-12-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/calculator.el (calculator-define-key): Undo last change
+
+	Make map argument mandatory instead (bug#22106).
+	(calculator-add-operators): Pass the argument that's not optional any more.
+
 2015-12-03  Glenn Morris  <rgm@gnu.org>
 
 	* Makefile.in: Avoid duplication.
@@ -20033,7 +20040,7 @@
 
 This file records repository revisions from
 commit 9d56a21e6a696ad19ac65c4b405aeca44785884a (exclusive) to
-commit ffefb6e899fbcdcbd79cb34292d57b7bc3043fcc (inclusive).
+commit 6148555ee5a3d0139ae517803718b3e0357933c7 (inclusive).
 See ChangeLog.1 for earlier changes.
 
 ;; Local Variables: