annotate lisp/net/trampver.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 c7b77eccd57b
children e97568b31550 5a6b4fafaa52
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
50338
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
1 ;;; trampver.el --- Transparent Remote Access, Multiple Protocol
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
2 ;;; lisp/trampver.el. Generated from trampver.el.in by configure.
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
3
101727
65cd5deb8072 * net/trampver.el: Update release number.
Michael Albinus <michael.albinus@gmx.de>
parents: 100908
diff changeset
4 ;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008,
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 105908
diff changeset
5 ;; 2009, 2010 Free Software Foundation, Inc.
50338
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
6
93126
46ad4668db91 Fix up encoding.
Michael Albinus <michael.albinus@gmx.de>
parents: 93081
diff changeset
7 ;; Author: Kai Großjohann <kai.grossjohann@gmx.net>
50338
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
8 ;; Keywords: comm, processes
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
9
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
10 ;; This file is part of GNU Emacs.
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
11
94702
80bd1cb865de Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
12 ;; GNU Emacs is free software: you can redistribute it and/or modify
50338
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
13 ;; it under the terms of the GNU General Public License as published by
94702
80bd1cb865de Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
14 ;; the Free Software Foundation, either version 3 of the License, or
80bd1cb865de Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
15 ;; (at your option) any later version.
50338
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
16
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
17 ;; GNU Emacs is distributed in the hope that it will be useful,
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
20 ;; GNU General Public License for more details.
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
21
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
22 ;; You should have received a copy of the GNU General Public License
94702
80bd1cb865de Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
23 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
50338
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
24
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
25 ;;; Code:
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
26
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
27 ;; In the Tramp CVS repository, the version numer and the bug report address
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
28 ;; are auto-frobbed from configure.ac, so you should edit that file and run
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
29 ;; "autoconf && ./configure" to change them. (X)Emacs version check is defined
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
30 ;; in macro AC_EMACS_INFO of aclocal.m4; should be changed only there.
50338
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
31
107502
c7b77eccd57b * lisp/net/trampver.el: Update release number.
Michael Albinus <albinus@detlef>
parents: 106815
diff changeset
32 (defconst tramp-version "2.1.18-23.2"
50338
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
33 "This version of Tramp.")
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
34
60763
3ba8f94e9cfa Sync with Tramp 2.0.48.
Michael Albinus <michael.albinus@gmx.de>
parents: 59582
diff changeset
35 (defconst tramp-bug-report-address "tramp-devel@gnu.org"
50338
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
36 "Email address to send bug reports to.")
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
37
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
38 ;; Check for (X)Emacs version.
105908
0cbe044d923b * net/trampver.el: Update release number.
Michael Albinus <michael.albinus@gmx.de>
parents: 105898
diff changeset
39 (let ((x (if (or (< emacs-major-version 21) (and (featurep 'xemacs) (= emacs-major-version 21) (< emacs-minor-version 4))) (format "Tramp 2.1.18-pre is not fit for %s" (when (string-match "^.*$" (emacs-version)) (match-string 0 (emacs-version)))) "ok")))
87142
a33cd731dd95 Fix buggy calls to `error' in the net/ directory.
Deepak Goel <deego@gnufans.org>
parents: 85508
diff changeset
40 (unless (string-match "\\`ok\\'" x) (error "%s" x)))
81758
f03856eb136b * files.el (file-remote-p): Introduce optional parameter CONNECTED.
Michael Albinus <michael.albinus@gmx.de>
parents: 77986
diff changeset
41
50338
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
42 (provide 'trampver)
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
43
93975
1e3a407766b9 Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93429
diff changeset
44 ;; arch-tag: 443576ca-f8f1-4bb1-addc-5c70861e93b1
50338
155b4b78aa3b * tramp.el: Version 2.0.31 released.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
diff changeset
45 ;;; trampver.el ends here
93081
dc3dfd7208a1 * net/trampver.el: Move coding cookie at the end.
Michael Albinus <michael.albinus@gmx.de>
parents: 87749
diff changeset
46
dc3dfd7208a1 * net/trampver.el: Move coding cookie at the end.
Michael Albinus <michael.albinus@gmx.de>
parents: 87749
diff changeset
47 ;; Local Variables:
dc3dfd7208a1 * net/trampver.el: Move coding cookie at the end.
Michael Albinus <michael.albinus@gmx.de>
parents: 87749
diff changeset
48 ;; mode: Emacs-Lisp
dc3dfd7208a1 * net/trampver.el: Move coding cookie at the end.
Michael Albinus <michael.albinus@gmx.de>
parents: 87749
diff changeset
49 ;; coding: utf-8
dc3dfd7208a1 * net/trampver.el: Move coding cookie at the end.
Michael Albinus <michael.albinus@gmx.de>
parents: 87749
diff changeset
50 ;; End: