diff options
author | Gerd Moellmann <gerd@gnu.org> | 2000-04-03 19:23:35 +0000 |
---|---|---|
committer | Gerd Moellmann <gerd@gnu.org> | 2000-04-03 19:23:35 +0000 |
commit | 7e65cba265d1c25113c1e6d6dc28ca18b797ae44 (patch) | |
tree | bce1bc860a70d9fb1f431199365088596e85c67c /lisp/dabbrev.el | |
parent | 0166aed1b5ccd0343f8622fae81fb84c671bc6f4 (diff) | |
download | emacs-7e65cba265d1c25113c1e6d6dc28ca18b797ae44.tar.gz |
(dabbrev-ignored-regexps): New user-option.
(dabbrev--find-expansion): Ignore buffers matching a regexp
from dabbrev-ignored-regexps.
Diffstat (limited to 'lisp/dabbrev.el')
-rw-r--r-- | lisp/dabbrev.el | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el index 909b86dbbcf..34c9a41d709 100644 --- a/lisp/dabbrev.el +++ b/lisp/dabbrev.el @@ -1,6 +1,7 @@ ;;; dabbrev.el --- dynamic abbreviation package -;; Copyright (C) 1985, 86, 92, 94, 96, 1997 Free Software Foundation, Inc. +;; Copyright (C) 1985, 86, 92, 94, 96, 1997, 2000 +;; Free Software Foundation, Inc. ;; Author: Don Morrison ;; Maintainer: Lars Lindberg <Lars.Lindberg@sypro.cap.se> @@ -193,16 +194,25 @@ Dabbrev always searches the current buffer first. Then, if designated by `dabbrev-select-buffers-function'. Then, if `dabbrev-check-all-buffers' is non-nil, dabbrev searches -all the other buffers, except those named in `dabbrev-ignored-buffer-names'." +all the other buffers, except those named in `dabbrev-ignored-buffer-names', +or matched by `dabbrev-ignored-regexps'." :type 'boolean :group 'dabbrev) (defcustom dabbrev-ignored-buffer-names '("*Messages*" "*Buffer List*") - "*List of buffer names that dabbrev should not check." + "*List of buffer names that dabbrev should not check. +See also `dabbrev-ignored-regexps'." :type '(repeat (string :tag "Buffer name")) :group 'dabbrev :version "20.3") +(defcustom dabbrev-ignored-regexps nil + "*List of regexps matching names of buffers that dabbrev should not check. +See also `dabbrev-ignored-buffer-names'." + :type '(repeat regexp) + :group 'dabbrev + :version "21.1") + (defcustom dabbrev-check-other-buffers t "*Should \\[dabbrev-expand] look in other buffers?\ @@ -761,9 +771,16 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]." (nreverse (dabbrev-filter-elements buffer (buffer-list) - (and (not (member (buffer-name buffer) - dabbrev-ignored-buffer-names)) - (not (memq buffer dabbrev--friend-buffer-list))))) + (let ((bn (buffer-name buffer))) + (and (not (member bn dabbrev-ignored-buffer-names)) + (not (memq buffer dabbrev--friend-buffer-list)) + (not + (let ((tail dabbrev-ignored-regexps) + (match nil)) + (while (and tail (not match)) + (setq match (string-match (car tail) bn) + tail (cdr tail))) + match)))))) dabbrev--friend-buffer-list (append dabbrev--friend-buffer-list non-friend-buffer-list))))) |