Mercurial > emacs
view lisp/net/sasl-ntlm.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 | 280c8ae2476d 376148b31b5e |
line wrap: on
line source
;;; sasl-ntlm.el --- NTLM (NT Lan Manager) module for the SASL client framework ;; Copyright (C) 2000, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Taro Kawagishi <tarok@transpulse.org> ;; Keywords: SASL, NTLM ;; Version: 1.00 ;; Created: February 2001 ;; 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: ;; This is a SASL interface layer for NTLM authentication message ;; generation by ntlm.el ;;; Code: (require 'sasl) (require 'ntlm) (defconst sasl-ntlm-steps '(ignore ;nothing to do before making sasl-ntlm-request ;authentication request sasl-ntlm-response) ;response to challenge "A list of functions to be called in sequence for the NTLM authentication steps. They are called by `sasl-next-step'.") (defun sasl-ntlm-request (client step) "SASL step function to generate a NTLM authentication request to the server. Called from `sasl-next-step'. CLIENT is a vector [mechanism user service server sasl-client-properties] STEP is a vector [<previous step function> <result of previous step function>]" (let ((user (sasl-client-name client))) (ntlm-build-auth-request user))) (defun sasl-ntlm-response (client step) "SASL step function to generate a NTLM response against the server challenge stored in the 2nd element of STEP. Called from `sasl-next-step'." (let* ((user (sasl-client-name client)) (passphrase (sasl-read-passphrase (format "NTLM passphrase for %s: " user))) (challenge (sasl-step-data step))) (ntlm-build-auth-response challenge user (ntlm-get-password-hashes passphrase)))) (put 'sasl-ntlm 'sasl-mechanism (sasl-make-mechanism "NTLM" sasl-ntlm-steps)) (provide 'sasl-ntlm) ;; arch-tag: 1d9164c1-1df0-418f-b7ab-360157fd05dc ;;; sasl-ntlm.el ends here