From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Carlos Pita Newsgroups: gmane.emacs.bugs Subject: bug#19665: 25.0.50; python.el: mark defun bug when point is in class statement Date: Mon, 9 Feb 2015 14:36:33 -0300 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=001a11c25f72542fc6050eab3796 X-Trace: ger.gmane.org 1423503500 6908 80.91.229.3 (9 Feb 2015 17:38:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 9 Feb 2015 17:38:20 +0000 (UTC) To: 19665@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Feb 09 18:38:16 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 1YKsHn-00031Q-NH for geb-bug-gnu-emacs@m.gmane.org; Mon, 09 Feb 2015 18:38:15 +0100 Original-Received: from localhost ([::1]:34233 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKsHn-0004cV-3j for geb-bug-gnu-emacs@m.gmane.org; Mon, 09 Feb 2015 12:38:15 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40755) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKsHe-0004a0-8a for bug-gnu-emacs@gnu.org; Mon, 09 Feb 2015 12:38:11 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YKsHa-0005dl-SP for bug-gnu-emacs@gnu.org; Mon, 09 Feb 2015 12:38:06 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:47277) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKsHa-0005dd-Ou for bug-gnu-emacs@gnu.org; Mon, 09 Feb 2015 12:38:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YKsHa-0001fX-B4 for bug-gnu-emacs@gnu.org; Mon, 09 Feb 2015 12:38:02 -0500 X-Loop: help-debbugs@gnu.org In-Reply-To: Resent-From: Carlos Pita Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 09 Feb 2015 17:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19665 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 19665-submit@debbugs.gnu.org id=B19665.14235034226331 (code B ref 19665); Mon, 09 Feb 2015 17:38:02 +0000 Original-Received: (at 19665) by debbugs.gnu.org; 9 Feb 2015 17:37:02 +0000 Original-Received: from localhost ([127.0.0.1]:38517 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YKsGb-0001dx-N4 for submit@debbugs.gnu.org; Mon, 09 Feb 2015 12:37:01 -0500 Original-Received: from mail-lb0-f175.google.com ([209.85.217.175]:34330) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YKsGZ-0001dk-Th for 19665@debbugs.gnu.org; Mon, 09 Feb 2015 12:37:00 -0500 Original-Received: by mail-lb0-f175.google.com with SMTP id n10so26862787lbv.6 for <19665@debbugs.gnu.org>; Mon, 09 Feb 2015 09:36:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:from:date:message-id:subject:to:cc:content-type; bh=QT7chgXVtREZzSo4W0rY3HFX26S43dvL1zvWPt9OGRk=; b=f9JNfv70zpWYkjlu19NzHpa3nqI1/KTr2Zzuq31CvTDpnOe/s68bGmj4Gt92YO0zpu pn5/f5dck+ZW1OBOe/1gxHqoBObSwqRC5njYNCZQsOCX/PWvvUUTGPWbGsGUIfZA0zgk bht5pSLNL4yTXMc8Thxz09SYmrgzCivKEW/ZGCNSTvhYi7lIvZkF6WzYoytmT87+nKdU +t/W9Kuf3WHQLSAMs25/B1qvBOi2xyGzGpOJPby47JAk80cSyhsEsrpUEP5rTb/ccmXU Xjogzbk9xni/l2fG67VCr1zLzAvPKs+KQZwE8viXB4ETt9BIAFtDW4skftlGyT5gtNQZ usRg== X-Received: by 10.112.180.135 with SMTP id do7mr18779511lbc.23.1423503413992; Mon, 09 Feb 2015 09:36:53 -0800 (PST) Original-Received: by 10.112.124.202 with HTTP; Mon, 9 Feb 2015 09:36:33 -0800 (PST) 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:99218 Archived-At: --001a11c25f72542fc6050eab3796 Content-Type: text/plain; charset=UTF-8 Here is a variation of the last patch that behaves better when the point is in empty lines above a defun. Another entirely different approach to solve this issue without redefining mark-defun could be to differentiate: class M: def m(): pass* and class M: def m(): pass * (where * stands for the point) In the second case, C-M-h will select the class, while in the first it will select the method. Then, there would be no need to hack mark-defun. What do you think? --001a11c25f72542fc6050eab3796 Content-Type: text/x-patch; charset=US-ASCII; name="mark-defun.patch" Content-Disposition: attachment; filename="mark-defun.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_i5y55xht1 ZGlmZiAtLWdpdCBhLy5lbWFjcy5kL2xpc3AvcHl0aG9uLmVsIGIvLmVtYWNzLmQvbGlzcC9weXRo b24uZWwKaW5kZXggMzBiNjJmNS4uMDMzN2ExNyAxMDA2NDQKLS0tIGEvLmVtYWNzLmQvbGlzcC9w eXRob24uZWwKKysrIGIvLmVtYWNzLmQvbGlzcC9weXRob24uZWwKQEAgLTI4NCw2ICsyODQsNyBA QAogICAgIChkZWZpbmUta2V5IG1hcCBbcmVtYXAgYmFja3dhcmQtc2VudGVuY2VdICdweXRob24t bmF2LWJhY2t3YXJkLWJsb2NrKQogICAgIChkZWZpbmUta2V5IG1hcCBbcmVtYXAgZm9yd2FyZC1z ZW50ZW5jZV0gJ3B5dGhvbi1uYXYtZm9yd2FyZC1ibG9jaykKICAgICAoZGVmaW5lLWtleSBtYXAg W3JlbWFwIGJhY2t3YXJkLXVwLWxpc3RdICdweXRob24tbmF2LWJhY2t3YXJkLXVwLWxpc3QpCisg ICAgKGRlZmluZS1rZXkgbWFwIFtyZW1hcCBtYXJrLWRlZnVuXSAncHl0aG9uLW1hcmstZGVmdW4p CiAgICAgKGRlZmluZS1rZXkgbWFwICJcQy1jXEMtaiIgJ2ltZW51KQogICAgIDs7IEluZGVudCBz cGVjaWZpYwogICAgIChkZWZpbmUta2V5IG1hcCAiXDE3NyIgJ3B5dGhvbi1pbmRlbnQtZGVkZW50 LWxpbmUtYmFja3NwYWNlKQpAQCAtMTI4NSw3ICsxMjg2LDcgQEAgV2l0aCBwb3NpdGl2ZSBBUkcg c2VhcmNoIGJhY2t3YXJkcywgZWxzZSBzZWFyY2ggZm9yd2FyZHMuIgogICAgICAgICAgICAgICAg ICAgICAgMCkpKSkKICAgICAgICAgIChmb3VuZAogICAgICAgICAgIChwcm9nbgotICAgICAgICAg ICAgKHdoZW4gKGFuZCAoPCBhcmcgMCkKKyAgICAgICAgICAgICh3aGVuIChhbmQgKD4gYXJnIDAp CiAgICAgICAgICAgICAgICAgICAgICAgIChweXRob24taW5mby1sb29raW5nLWF0LWJlZ2lubmlu Zy1vZi1kZWZ1bikpCiAgICAgICAgICAgICAgIChlbmQtb2YtbGluZSAxKSkKICAgICAgICAgICAg ICh3aGlsZSAoYW5kIChmdW5jYWxsIHJlLXNlYXJjaC1mbgpAQCAtNDQ2MCw2ICs0NDYxLDEyIEBA IGRlZmF1bHQgdG8gdXRmLTguIgogDAogOzs7IFV0aWxpdHkgZnVuY3Rpb25zCiAKKyhkZWZ1biBw eXRob24tbWFyay1kZWZ1biAoKQorICAoaW50ZXJhY3RpdmUpCisgICh3aGVuIChweXRob24taW5m by1sb29raW5nLWF0LWJlZ2lubmluZy1vZi1kZWZ1bikKKyAgICAoZW5kLW9mLWxpbmUgMSkpCisg IChtYXJrLWRlZnVuKSkKKwogKGRlZnVuIHB5dGhvbi11dGlsLWdvdG8tbGluZSAobGluZS1udW1i ZXIpCiAgICJNb3ZlIHBvaW50IHRvIExJTkUtTlVNQkVSLiIKICAgKGdvdG8tY2hhciAocG9pbnQt bWluKSkK --001a11c25f72542fc6050eab3796--