From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Matt Hodges Newsgroups: gmane.emacs.devel,gmane.emacs.pretest.bugs Subject: 23.0.50; add-change-log-entry-other-window and Perl modes. Date: Thu, 20 Sep 2007 09:51:47 +0100 Message-ID: <87d4wd90t8.fsf@escpc40.esc.rl.ac.uk> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: sea.gmane.org 1190278400 28589 80.91.229.12 (20 Sep 2007 08:53:20 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 20 Sep 2007 08:53:20 +0000 (UTC) To: emacs-pretest-bug@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Sep 20 10:53:10 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1IYHmY-0008S9-1J for ged-emacs-devel@m.gmane.org; Thu, 20 Sep 2007 10:53:10 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IYHmV-000380-Sb for ged-emacs-devel@m.gmane.org; Thu, 20 Sep 2007 04:53:07 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IYHmN-00037v-Qk for emacs-devel@gnu.org; Thu, 20 Sep 2007 04:52:59 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IYHmK-00037e-Ae for emacs-devel@gnu.org; Thu, 20 Sep 2007 04:52:58 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IYHmJ-00037b-QC for emacs-devel@gnu.org; Thu, 20 Sep 2007 04:52:55 -0400 Original-Received: from fencepost.gnu.org ([140.186.70.10]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IYHmJ-0003Uj-II for emacs-devel@gnu.org; Thu, 20 Sep 2007 04:52:55 -0400 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by fencepost.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IYHlk-000212-E6 for emacs-pretest-bug@gnu.org; Thu, 20 Sep 2007 04:52:20 -0400 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1IYHmF-0003Tz-Ax for emacs-pretest-bug@gnu.org; Thu, 20 Sep 2007 04:52:54 -0400 Original-Received: from balin.rl.ac.uk ([130.246.135.155]) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1IYHmE-0003TE-MT for emacs-pretest-bug@gnu.org; Thu, 20 Sep 2007 04:52:50 -0400 X-RAL-MFrom: X-RAL-Connect: Original-Received: from escpc40.esc.rl.ac.uk (escpc40.esc.rl.ac.uk [130.246.77.13]) by balin.rl.ac.uk (8.12.8/8.12.8) with ESMTP id l8K8q9Ne019299; Thu, 20 Sep 2007 09:52:10 +0100 Original-Received: from mph45 by escpc40.esc.rl.ac.uk with local (Exim 4.67) (envelope-from ) id 1IYHlD-0008Um-Rs; Thu, 20 Sep 2007 09:51:47 +0100 User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/23.0.50 (gnu/linux) X-Scanned-By: MIMEDefang 2.39 X-Detected-Kernel: Linux 2.4-2.6 X-Detected-Kernel: Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:79361 gmane.emacs.pretest.bugs:19944 Archived-At: --=-=-= In GNU Emacs 23.0.50.4 (i686-pc-linux-gnu, GTK+ Version 2.10.13) of 2007-09-14 on escpc40 Windowing system distributor `The X.Org Foundation', version 11.0.10300000 configured using `configure '--with-gtk'' add-change-log-entry-other-window stopped detecting the current subroutine in perl/cperl-mode due to, I think, this change: revision 1.189 date: 2007-07-20 21:30:51 +0100; author: monnier; state: Exp; lines: +15 -15; commitid: 9SIF7GuRLekDZxqs; (add-change-log-entry, add-log-current-defun, change-log-merge): Use derived-mode-p rather than checking major-mode directly. The attached patch seems to fix it. Thanks, Matt --=-=-= Content-Type: text/x-patch Content-Disposition: attachment Content-Description: add-log.el patch. --- add-log.el 10 Sep 2007 08:53:06 +0100 1.195 +++ add-log.el 20 Sep 2007 09:44:54 +0100 @@ -802,6 +802,11 @@ "*Modes that look like TeX to `add-log-current-defun'.") ;;;###autoload +(defvar add-log-perl-like-modes + '(perl-mode cperl-mode) + "*Modes that look like Perl to `add-log-current-defun'.") + +;;;###autoload (defun add-log-current-defun () "Return name of function definition point is in, or nil. @@ -1016,7 +1021,7 @@ ((derived-mode-p 'texinfo-mode) (if (re-search-backward "^@node[ \t]+\\([^,\n]+\\)" nil t) (match-string-no-properties 1))) - ((derived-mode-p '(perl-mode cperl-mode)) + ((apply 'derived-mode-p add-log-perl-like-modes) (if (re-search-backward "^sub[ \t]+\\([^({ \t\n]+\\)" nil t) (match-string-no-properties 1))) ;; Emacs's autoconf-mode installs its own --=-=-= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Emacs-devel mailing list Emacs-devel@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-devel --=-=-=--