From mboxrd@z Thu Jan  1 00:00:00 1970
Path: main.gmane.org!not-for-mail
From: John Paul Wallington <jpw@shootybangbang.com>
Newsgroups: gmane.emacs.devel
Subject: Re: A few questions about occur-mode
Date: Mon, 23 Sep 2002 21:53:52 +0100
Sender: emacs-devel-admin@gnu.org
Message-ID: <877khcbf6n.fsf@bundalo.shootybangbang.com>
References: <87n0q9r3lu.fsf@bundalo.shootybangbang.com>
	<20020923102906.5C55.LEKTU@terra.es>
	<20020923134527.5C5E.LEKTU@terra.es>
NNTP-Posting-Host: localhost.gmane.org
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Trace: main.gmane.org 1032814252 13487 127.0.0.1 (23 Sep 2002 20:50:52 GMT)
X-Complaints-To: usenet@main.gmane.org
NNTP-Posting-Date: Mon, 23 Sep 2002 20:50:52 +0000 (UTC)
Cc: emacs-devel@gnu.org
Return-path: <emacs-devel-admin@gnu.org>
Original-Received: from quimby.gnus.org ([80.91.224.244])
	by main.gmane.org with esmtp (Exim 3.35 #1 (Debian))
	id 17taAN-0003VO-00
	for <emacs-devel@main.gmane.org>; Mon, 23 Sep 2002 22:50:51 +0200
Original-Received: from monty-python.gnu.org ([199.232.76.173])
	by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian))
	id 17taqp-0002OU-00
	for <emacs-devel@quimby.gnus.org>; Mon, 23 Sep 2002 23:34:43 +0200
Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.10)
	id 17taAN-0004lG-00; Mon, 23 Sep 2002 16:50:51 -0400
Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.10)
	id 17ta7n-0004UO-00
	for emacs-devel@gnu.org; Mon, 23 Sep 2002 16:48:11 -0400
Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.10)
	id 17ta7j-0004Td-00
	for emacs-devel@gnu.org; Mon, 23 Sep 2002 16:48:09 -0400
Original-Received: from cmailg2.svr.pol.co.uk ([195.92.195.172])
	by monty-python.gnu.org with esmtp (Exim 4.10)
	id 17ta7i-0004T9-00
	for emacs-devel@gnu.org; Mon, 23 Sep 2002 16:48:06 -0400
Original-Received: from modem-875.cloyster.dialup.pol.co.uk ([217.135.97.107] helo=bundalo.shootybangbang.com)
	by cmailg2.svr.pol.co.uk with esmtp (Exim 3.35 #1)
	id 17ta7e-00068C-00; Mon, 23 Sep 2002 21:48:03 +0100
Original-Received: from jpw by bundalo.shootybangbang.com with local (Exim 3.32 #1 (Debian))
	id 17taDJ-0002w9-00; Mon, 23 Sep 2002 21:53:53 +0100
Original-To: Juanma Barranquero <lektu@terra.es>
In-Reply-To: <20020923134527.5C5E.LEKTU@terra.es> (Juanma Barranquero's
 message of "Mon, 23 Sep 2002 13:50:24 +0200")
X-Face: R(_z-<e!Z,qjN8xeu/^:Szs}15R'D_9}g7Qlm0x+2sF<`w9o]-oT>rF:grdKO.*u`n);p.i
 $Eiz=h^CO5eDYv"4:K@#\HN09*Ykx}}B{kF/KH}%f_o^Wp<kb`,1KLtZp"^C{-{e~S=IP0_"8B6K+C
 kbKw='FSzftzu
Original-Lines: 59
User-Agent: Gnus/5.090008 (Oort Gnus v0.08) Emacs/21.3.50
 (i686-pc-linux-gnu)
Errors-To: emacs-devel-admin@gnu.org
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.0.11
Precedence: bulk
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Post: <mailto:emacs-devel@gnu.org>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=subscribe>
List-Id: Emacs development discussions. <emacs-devel.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/emacs-devel/>
Xref: main.gmane.org gmane.emacs.devel:8129
X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:8129

Juanma Barranquero <lektu@terra.es> wrote:

> because otherwise there could be problems with matches at the end of a
> line. This leaves the point at the beginning of a match after M-n or M-p,
> but that seems preferable IMHO.
>
> Opinions?

If we put `occur-point' properties in `occur-engine' output because
of compatibility maybe they should go at the end of each match for
the same reason?   We could acomplish that by sticking a space on the
end of each line's string before propertizing it:

Index: replace.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/replace.el,v
retrieving revision 1.159
diff -u -r1.159 replace.el
*** replace.el	18 Sep 2002 16:03:58 -0000	1.159
--- replace.el	23 Sep 2002 20:46:42 -0000
***************
*** 804,811 ****
  		    (setq lines (+ lines (1- (count-lines origpt endpt))))
  		    (setq marker (make-marker))
  		    (set-marker marker matchbeg)
! 		    (setq curstring (buffer-substring begpt
! 						      (line-end-position)))
  		    ;; Depropertize the string, and maybe
  		    ;; highlight the matches
  		    (let ((len (length curstring))
--- 804,813 ----
  		    (setq lines (+ lines (1- (count-lines origpt endpt))))
  		    (setq marker (make-marker))
  		    (set-marker marker matchbeg)
! 		    (setq curstring (concat
! 				     (buffer-substring begpt
! 						       (line-end-position))
! 				     " "))
  		    ;; Depropertize the string, and maybe
  		    ;; highlight the matches
  		    (let ((len (length curstring))
***************
*** 821,826 ****
--- 823,834 ----
  					      (when match-face
  						`(font-lock-face ,match-face)))
  					     curstring)
+ 			;; `occur-point' property is used by occur-next and
+ 			;; occur-prev to move between matches.
+ 			(put-text-property (match-end 0)
+ 					   (1+ (match-end 0))
+ 					   'occur-point t 
+ 					   curstring)
  			(setq start (match-end 0))))
  		    ;; Generate the string to insert for this match
  		    (let* ((out-line

-- 
John Paul Wallington