Mercurial > emacs
view lisp/erc/ChangeLog @ 107653:bfde3c2dbef5
Make occur handle multi-line matches cleanly with context.
http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg01280.html
* replace.el (occur-accumulate-lines): Add optional arg `pt'.
(occur-engine): Add local variables `ret', `prev-after-lines',
`prev-lines'. Use more arguments for `occur-context-lines'.
Set first elem of its returned list to `data', and the second elem
to `prev-after-lines'. Don't print the separator line.
In the end, print remaining context after-lines.
(occur-context-lines): Add new arguments `begpt', `endpt',
`lines', `prev-lines', `prev-after-lines'. Rewrite to combine
after-lines of the previous match with before-lines of the
current match and not overlap them. Return a list with two
values: the output line and the list of context after-lines.
* search.texi (Other Repeating Search): Remove line that `occur'
can not handle multiline matches.
* occur-testsuite.el (occur-tests): Add tests for context lines.
author | Juri Linkov <juri@jurta.org> |
---|---|
date | Tue, 30 Mar 2010 19:03:08 +0300 |
parents | b4d27afff1bf |
children | 973b5bc5fcfe |
line wrap: on
line source
2010-03-10 Chong Yidong <cyd@stupidchicken.com> * Branch for 23.2. 2010-02-07 Vivek Dasmohapatra <vivek@etla.org> * erc-services.el (erc-nickserv-alist): Fix defcustom type (Bug#5520). 2010-01-25 Vivek Dasmohapatra <vivek@etla.org> * erc-backend.el (erc-session-connector): New var. (erc-server-reconnect): Use it to reconnect via old connector (Bug#4958). * erc.el (erc-determine-parameters): Save erc-server-connect-function to erc-session-connector. 2009-11-03 Stefan Monnier <monnier@iro.umontreal.ca> * erc.el (erc-display-line-1, erc-process-away): * erc-truncate.el (erc-truncate-buffer-to-size): Use with-current-buffer. 2009-10-24 Glenn Morris <rgm@gnu.org> * erc-dcc.el (pcomplete-erc-all-nicks): * erc-notify.el (pcomplete-erc-all-nicks): Autoload it, to silence compiler. * erc-dcc.el (pcomplete/erc-mode/DCC): Replace cl-function remove-duplicates with erc-delete-dups. 2009-09-27 Johan Bockgård <bojohan@gnu.org> * erc-button.el (erc-button-keymap): Bind `follow-link'. 2009-09-26 Johan Bockgård <bojohan@gnu.org> * erc-button.el (erc-button-add-button): Only call `widget-convert-button' in XEmacs. For Emacs (at least), it doesn't seem to have any purpose except creating lots of overlays, slowing everything down. 2009-09-19 Glenn Morris <rgm@gnu.org> * erc-lang.el (line): Define for compiler. 2009-07-22 Kevin Ryde <user42@zip.com.au> * erc/erc.el (erc-cmd-MODE): Hyperlink urls in docstring with URL `...'. 2009-03-13 D. Goel <deego3@gmail.com> * erc-backend.el: In (multiple-value-bind/setq .. ls), ls-> (values-list ls) throughout. * erc.el: Ditto. 2009-01-18 Michael Olson <mwolson@gnu.org> * erc.el (erc-header-line-uses-tabbar-p): Set to nil by default. 2009-01-16 Glenn Morris <rgm@gnu.org> * erc.el (erc-input-message): Conditionalize previous change for XEmacs. * erc-dcc.el (erc-dcc-server): Silence warning about obsolete function behind fboundp test. 2009-01-09 Glenn Morris <rgm@gnu.org> * erc.el (erc-input-message): Replace last-command-char with last-command-event. 2009-01-08 Glenn Morris <rgm@gnu.org> * erc.el (tabbar--local-hlf): Silence compiler. 2009-01-03 Michael Olson <mwolson@gnu.org> * erc.el (erc-user-input): Do not include text properties when returning user input. See ChangeLog.08 for earlier changes. Copyright (C) 2009, 2010 Free Software Foundation, Inc. This file is part of GNU Emacs. GNU Emacs is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;; Local Variables: ;; coding: utf-8 ;; add-log-time-zone-rule: t ;; End: ;; arch-tag: d4703244-4a8d-49b1-ab34-ad0d56600ef8