From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: bug#15694: battery.el for Mac OS X Mavericks Date: Wed, 23 Oct 2013 15:45:14 -0400 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1382557568 11174 80.91.229.3 (23 Oct 2013 19:46:08 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 23 Oct 2013 19:46:08 +0000 (UTC) To: 15694-done@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Oct 23 21:46:12 2013 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 1VZ4Nf-0003Br-S3 for geb-bug-gnu-emacs@m.gmane.org; Wed, 23 Oct 2013 21:46:11 +0200 Original-Received: from localhost ([::1]:51213 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZ4Nf-0003yj-4l for geb-bug-gnu-emacs@m.gmane.org; Wed, 23 Oct 2013 15:46:11 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49103) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZ4Nb-0003yY-Aa for bug-gnu-emacs@gnu.org; Wed, 23 Oct 2013 15:46:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VZ4NW-0002gw-W7 for bug-gnu-emacs@gnu.org; Wed, 23 Oct 2013 15:46:07 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:52886) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZ4NW-0002gs-T5 for bug-gnu-emacs@gnu.org; Wed, 23 Oct 2013 15:46:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1VZ4NW-0000Es-MS for bug-gnu-emacs@gnu.org; Wed, 23 Oct 2013 15:46:02 -0400 Resent-From: Glenn Morris Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Wed, 23 Oct 2013 19:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 15694 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Mail-Followup-To: 15694@debbugs.gnu.org, rgm@gnu.org, masfj.dev@gmail.com Original-Received: via spool by 15694-done@debbugs.gnu.org id=D15694.1382557519856 (code D ref 15694); Wed, 23 Oct 2013 19:46:02 +0000 Original-Received: (at 15694-done) by debbugs.gnu.org; 23 Oct 2013 19:45:19 +0000 Original-Received: from localhost ([127.0.0.1]:38671 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VZ4Mo-0000Dj-Tm for submit@debbugs.gnu.org; Wed, 23 Oct 2013 15:45:19 -0400 Original-Received: from fencepost.gnu.org ([208.118.235.10]:37597 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VZ4Ml-0000DX-Qf for 15694-done@debbugs.gnu.org; Wed, 23 Oct 2013 15:45:16 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1VZ4Ml-0005a3-1p; Wed, 23 Oct 2013 15:45:15 -0400 X-Spook: anthrax underground Geraldton BATF ARPA LABLINK BROMURE X-Ran: +kFupR%v$M^\|&(aZI5O@xJJ@O:V#D& (Masashi Fujimoto's message of "Thu, 24 Oct 2013 03:53:51 +0900") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) 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:79552 Archived-At: Version: 24.4 Applied with a tweak (shy group). *** lisp/battery.el 2013-03-05 17:13:01 +0000 --- lisp/battery.el 2013-10-23 19:41:17 +0000 *************** *** 615,621 **** (with-temp-buffer (ignore-errors (call-process "pmset" nil t nil "-g" "ps")) (goto-char (point-min)) ! (when (re-search-forward "Currentl?y drawing from '\\(AC\\|Battery\\) Power'" nil t) (setq power-source (match-string 1)) (when (re-search-forward "^ -InternalBattery-0[ \t]+" nil t) (when (looking-at "\\([0-9]\\{1,3\\}\\)%") --- 615,621 ---- (with-temp-buffer (ignore-errors (call-process "pmset" nil t nil "-g" "ps")) (goto-char (point-min)) ! (when (re-search-forward "\\(?:Currentl?y\\|Now\\) drawing from '\\(AC\\|Battery\\) Power'" nil t) (setq power-source (match-string 1)) (when (re-search-forward "^ -InternalBattery-0[ \t]+" nil t) (when (looking-at "\\([0-9]\\{1,3\\}\\)%")