From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Jari Aalto Newsgroups: gmane.emacs.bugs Subject: [PATCH] 21.2 add-log.el::change-log-version-number-search bug fix Date: Sun, 11 Sep 2005 21:59:32 +0300 Organization: Private Message-ID: NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1126465268 28323 80.91.229.2 (11 Sep 2005 19:01:08 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sun, 11 Sep 2005 19:01:08 +0000 (UTC) Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Sep 11 21:01:03 2005 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1EEX4J-0000bg-Mi for geb-bug-gnu-emacs@m.gmane.org; Sun, 11 Sep 2005 21:00:47 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EEX4F-0007LA-46 for geb-bug-gnu-emacs@m.gmane.org; Sun, 11 Sep 2005 15:00:43 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1EEX47-0007Fm-6c for bug-gnu-emacs@gnu.org; Sun, 11 Sep 2005 15:00:35 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1EEX40-0007CS-C4 for bug-gnu-emacs@gnu.org; Sun, 11 Sep 2005 15:00:28 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EEX40-0007CH-9a for bug-gnu-emacs@gnu.org; Sun, 11 Sep 2005 15:00:28 -0400 Original-Received: from [193.4.58.12] (helo=horus.isnic.is) by monty-python.gnu.org with esmtp (TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24) (Exim 4.34) id 1EEX42-0007ge-8g for bug-gnu-emacs@gnu.org; Sun, 11 Sep 2005 15:00:31 -0400 Original-Received: from smtp32.kolumbus.fi (smtp32.kolumbus.fi [193.229.0.37]) by horus.isnic.is (8.12.9p2/8.12.9/isnic) with ESMTP id j8BIxquC066986 for ; Sun, 11 Sep 2005 18:59:53 GMT (envelope-from news@phys-news1.kolumbus.fi) Original-Received: from news.kolumbus.fi (news.kolumbus.fi [193.229.0.31]) by smtp32.kolumbus.fi (8.12.10/8.12.4) with ESMTP id j8BIxoMD006082 for ; Sun, 11 Sep 2005 21:59:50 +0300 (EEST) Original-Received: (from news@localhost) by news.kolumbus.fi (8.11.6+Sun/8.11.6) id j8BIxnV14361 for gnu-emacs-bug@moderators.isc.org; Sun, 11 Sep 2005 21:59:49 +0300 (EEST) Original-To: gnu-emacs-bug@moderators.isc.org Original-Path: not-for-mail Original-Newsgroups: gnu.emacs.bug Original-Lines: 58 Original-NNTP-Posting-Host: a81-197-0-130.elisa-laajakaista.fi Original-X-Trace: phys-news1.kolumbus.fi 1126465189 13897 81.197.0.130 (11 Sep 2005 18:59:49 GMT) Original-X-Complaints-To: abuse@kolumbus.fi Original-NNTP-Posting-Date: Sun, 11 Sep 2005 18:59:49 +0000 (UTC) User-Agent: Gnus/5.110004 (No Gnus v0.4) Emacs/21.3 (windows-nt) Cancel-Lock: sha1:f/grUG5I7D95gv78+yH3oq9qMwY= X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:12969 Archived-At: Here fix for BUG that I encountered: Open empty file from directory which is revision controlled. Since the file is empty, the search command `re-search-forward' fils when END is `0' (must be at least 1). The only actual change here is " (and (> size 1)". Everything else is indentation change. 2005-09-11 Jari Aalto * add-log.el (change-log-version-number-search): Before searching with `change-log-version-number-regexp-list', check that buffer size > 1. Fixes error: "Invalid search bound" when `end' was 0 on empty buffer. *** modified file 'add-log.el' --- add-log.el +++ add-log.el @@ -311,7 +311,9 @@ (/ size 10) size)) version) - (or (and buffer-file-name (vc-workfile-version buffer-file-name)) + (or (and buffer-file-name + (vc-workfile-version buffer-file-name)) + (and (> size 1) (save-restriction (widen) (let ((regexps change-log-version-number-regexp-list)) @@ -320,7 +322,7 @@ (goto-char (point-min)) (when (re-search-forward (pop regexps) end t) (setq version (match-string 1) - regexps nil))))))))) + regexps nil)))))))))) ;;;###autoload ----------------------------------------------------------------------- Debugger entered--Lisp error: (error "Invalid search bound (wrong side of point)") re-search-forward("^(def[^ \n]+[ ]+[^ \n][ ]\"\\([0-9]+.[0-9.]+\\)" 0 t) (if (re-search-forward (pop regexps) end t) (progn (setq version ... regexps nil))) (when (re-search-forward (pop regexps) end t) (setq version (match-string 1) regexps nil)) (save-excursion (goto-char (point-min)) (when (re-search-forward ... end t) (setq version ... regexps nil))) (while regexps (save-excursion (goto-char ...) (when ... ...))) (let ((regexps change-log-version-number-regexp-list)) (while regexps (save-excursion ... ...))) (save-restriction (widen) (let (...) (while regexps ...))) (or (and buffer-file-name (vc-workfile-version buffer-file-name)) (save-restriction (widen) (let ... ...))) (let* ((size ...) (end ...) version) (or (and buffer-file-name ...) (save-restriction ... ...))) change-log-version-number-search() (and change-log-version-info-enabled (change-log-version-number-search)) (let* ((defun ...) (version ...) (buf-file-name ...) (buffer-file ...) (file-name ...) (entry ...) bound) (if (or ... ...) (find-file-other-window file-name) (find-file file-name)) (or (eq major-mode ...) (change-log-mode)) (undo-boundary) (goto-char (point-min)) (let (...) (if ... ... ...)) (setq bound (progn ... ...)) (goto-char (point-min)) (cond (... ...) (... ... ... ... ... ... ...) (t ... ... ... ... ... ... ... ...)) (if defun (progn ... ... ... ... ...) (unless ... ... ...))) add-change-log-entry(nil nil t) add-change-log-entry-other-window() * call-interactively(add-change-log-entry-other-window)