Mercurial > emacs
view lisp/abbrevlist.el @ 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 | 1d1d5d9bd884 |
children | a3e1f7134e6e 376148b31b5e |
line wrap: on
line source
;;; abbrevlist.el --- list one abbrev table alphabetically ordered ;; Copyright (C) 1986, 1992, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Suggested by a previous version by Gildea. ;; Maintainer: FSF ;; Keywords: abbrev ;; 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/>. ;;; Commentary: ;;; Code: ;;;###autoload (defun list-one-abbrev-table (abbrev-table output-buffer) "Display alphabetical listing of ABBREV-TABLE in buffer OUTPUT-BUFFER." (with-output-to-temp-buffer output-buffer (save-excursion (let ((abbrev-list nil) (first-column 0)) (set-buffer standard-output) (mapatoms (function (lambda (abbrev) (setq abbrev-list (cons abbrev abbrev-list)))) abbrev-table) (setq abbrev-list (sort abbrev-list 'string-lessp)) (while abbrev-list (if (> (+ first-column 40) (window-width)) (progn (insert "\n") (setq first-column 0))) (indent-to first-column) (insert (symbol-name (car abbrev-list))) (indent-to (+ first-column 8)) (insert (symbol-value (car abbrev-list))) (setq first-column (+ first-column 40)) (setq abbrev-list (cdr abbrev-list))))))) (provide 'abbrevlist) ;; arch-tag: 178f0638-6597-4c16-bcee-576c3d8e9217 ;;; abbrevlist.el ends here