From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Chris Zheng Newsgroups: gmane.emacs.bugs Subject: bug#20764: 25.0.50; Minor improvements for calculator.el Date: Mon, 08 Jun 2015 02:39:51 +0800 Message-ID: <20150608.023951.324799427836228432.chriszheng99@gmail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1433702914 14626 80.91.229.3 (7 Jun 2015 18:48:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 7 Jun 2015 18:48:34 +0000 (UTC) To: 20764@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Jun 07 20:48:18 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Z1fcB-000804-HA for geb-bug-gnu-emacs@m.gmane.org; Sun, 07 Jun 2015 20:48:11 +0200 Original-Received: from localhost ([::1]:54988 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1fcA-0006hF-PK for geb-bug-gnu-emacs@m.gmane.org; Sun, 07 Jun 2015 14:48:10 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54894) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1fc6-0006gx-GT for bug-gnu-emacs@gnu.org; Sun, 07 Jun 2015 14:48:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z1fc3-0004Jt-9K for bug-gnu-emacs@gnu.org; Sun, 07 Jun 2015 14:48:06 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:34332) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1fc3-0004Je-6I for bug-gnu-emacs@gnu.org; Sun, 07 Jun 2015 14:48:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Z1fc2-0006Wf-QG for bug-gnu-emacs@gnu.org; Sun, 07 Jun 2015 14:48:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Chris Zheng Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 07 Jun 2015 18:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 20764 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.143370282723254 (code B ref -1); Sun, 07 Jun 2015 18:48:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 7 Jun 2015 18:47:07 +0000 Original-Received: from localhost ([127.0.0.1]:44307 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z1fb8-00062M-Sa for submit@debbugs.gnu.org; Sun, 07 Jun 2015 14:47:07 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:40719) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z1fb7-0005ys-9I for submit@debbugs.gnu.org; Sun, 07 Jun 2015 14:47:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z1fau-0003L4-Mm for submit@debbugs.gnu.org; Sun, 07 Jun 2015 14:46:59 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:39281) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1fau-0003EH-Jx for submit@debbugs.gnu.org; Sun, 07 Jun 2015 14:46:52 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52536) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1fUJ-0005rD-VG for bug-gnu-emacs@gnu.org; Sun, 07 Jun 2015 14:40:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z1fUG-0007Qr-Fp for bug-gnu-emacs@gnu.org; Sun, 07 Jun 2015 14:40:03 -0400 Original-Received: from mail-yk0-x230.google.com ([2607:f8b0:4002:c07::230]:34544) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1fUG-0007Ql-C9 for bug-gnu-emacs@gnu.org; Sun, 07 Jun 2015 14:40:00 -0400 Original-Received: by ykfl8 with SMTP id l8so43890358ykf.1 for ; Sun, 07 Jun 2015 11:39:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:message-id:to:subject:from:mime-version:content-type :content-transfer-encoding; bh=+0FmJ8LwGoQUvcIcjZITOKei+SHs/2rGS6M2zQca1j8=; b=NGnvp7i9RiQKlC4gMkKLtaySA3n8AwPlROvjuBCgfxIawxtpe8njgMDsNxVORgVMUn Pd9SXFDS0ckLOEzF+01UdWAV9fZso8spWtwF7JGPFAyy3Kw3iwjkJAYax9+Nc5pquhcH okv25AfmdRMljLM3Nk3a1WJl4TBjVkhRQJqZHFHt5lv/yXiLxfYPyjr7FpKmsDO8DBuP 7fvhn21bJHcTVLlztUH603I4iD7BZ6iktxnuB8kgktQC+netoiW6H29NqX1akIJ8AHfJ NeVO34dJ2hdFVHEpyx92g6MaZgChd93WSTkmXmtFxSO+RGYraOuVzjhL0yFZ6miqsVeW CA5g== X-Received: by 10.13.213.71 with SMTP id x68mr2307766ywd.44.1433702399303; Sun, 07 Jun 2015 11:39:59 -0700 (PDT) Original-Received: from localhost ([180.201.223.222]) by mx.google.com with ESMTPSA id r10sm250964ywb.27.2015.06.07.11.39.57 for (version=SSLv3 cipher=RC4-SHA bits=128/128); Sun, 07 Jun 2015 11:39:58 -0700 (PDT) X-Mailer: Mew version 6.7rc1 on Emacs 25.0.50 / Mule 6.0 (HANACHIRUSATO) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:103712 Archived-At: Hello, Emacs. I find the calculator.el in Emacs is handy. However, there are two things I'd like to see changed. 1. Press F1 results in `??bad key?? (f1)'. 2. Can't enter exponent by `E'. Both of them can be reproduced by: (1) emacs -Q; (2) M-x calculator; (3) Press `F1' or `E'. I have the following patch trying to fix the above two things. Please let me know if I'm doing things wrong. Best Regards, Chris >From 12e6d1e28060ba1ef2218a1ad37e26e02c4a1cb0 Mon Sep 17 00:00:00 2001 From: Chris Zheng Date: Sat, 6 Jun 2015 08:48:25 +0200 Subject: [PATCH] Minor improvements for lisp/calculator.el. * calculator.el (calculator-mode-map): Bind `E' for `calculator-exp'. (calculator-last-input): Fix a bug that press F1 results in `??bad key?? (f1)'. --- lisp/calculator.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/calculator.el b/lisp/calculator.el index 4027887..d20faa3 100644 --- a/lisp/calculator.el +++ b/lisp/calculator.el @@ -394,7 +394,7 @@ Used for repeating operations in calculator-repR/L.") [kp-5] [kp-6] [kp-7] [kp-8] [kp-9]) (calculator-op [kp-divide] [kp-multiply]) (calculator-decimal "." [kp-decimal]) - (calculator-exp "e") + (calculator-exp "e" "E") (calculator-dec/deg-mode "D") (calculator-set-register "s") (calculator-get-register "g") @@ -1219,7 +1219,7 @@ arguments." "Last char (or event or event sequence) that was read. Use KEYS if given, otherwise use `this-command-keys'." (let ((inp (or keys (this-command-keys)))) - (if (or (stringp inp) (not (arrayp inp))) + (if (or (stringp inp) (not (arrayp inp)) (member inp '([f1] [help]))) inp ;; Translates kp-x to x and [tries to] create a string to lookup ;; operators; assume all symbols are translatable via -- 2.4.2 In GNU Emacs 25.0.50.2 (x86_64-w64-mingw32) of 2015-06-05 on KAEL Windowing system distributor `Microsoft Corp.', version 6.3.9600 Configured using: `configure --prefix=/z/emacs --host=x86_64-w64-mingw32 --target=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --with-wide-int --with-jpeg --with-xpm --with-png --with-tiff --with-rsvg --with-xml2 --with-gnutls --with-sound=yes --with-file-notification=yes --without-dbus --without-imagemagick 'CFLAGS=-O3 -fomit-frame-pointer -g0 -pipe' 'LDFLAGS=-static-libgcc -static-libstdc++ -static -s -Wl,-s'' Configured features: XPM JPEG TIFF GIF PNG RSVG SOUND NOTIFY ACL GNUTLS LIBXML2 ZLIB TOOLKIT_SCROLL_BARS