Comment changes.

[bpt/emacs.git] / lisp / dabbrev.el

diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index 1d789a0..c35db2f 100644 (file)
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -1,6 +1,6 @@
 ;;; dabbrev.el --- dynamic abbreviation package
 
-;; Copyright (C) 1985, 1986, 1992, 1994 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 86, 92, 94, 96, 1997 Free Software Foundation, Inc.
 
 ;; Author: Don Morrison
 ;; Maintainer: Lars Lindberg <Lars.Lindberg@sypro.cap.se>
@@ -88,7 +88,7 @@
 ;;  [tromey]   Tom Tromey <tromey@busco.lanl.gov>
 ;;  [Rolf]     Rolf Schreiber <rolf@mathematik.uni-stuttgart.de>
 ;;  [Petri]    Petri Raitio <per@tekla.fi>
-;;  [ejb]      Jay Berkenbilt <ejb@ERA.COM>
+;;  [ejb]      Jay Berkenbilt <ejb@ql.org>
 ;;  [hawley]   Bob Hawley <rth1@quartet.mt.att.com>
 ;;  ... and to all the people who have participated in the beta tests.
 
@@ -119,9 +119,7 @@
 
 Example: Set this to \"\\\\$\" for programming languages
 in which variable names may appear with or without a leading `$'.
-\(For example, in Makefiles.
-  :type 'regexp
-  :group 'dabbrev))
+\(For example, in Makefiles.\)
 
 Set this to nil if no characters should be skipped."
   :type '(choice regexp
@@ -136,7 +134,7 @@ A value of `case-fold-search' means case is significant
 Any other non-nil version means case is not significant."
   :type '(choice (const :tag "off" nil)
                 (const :tag "on" t)
-                (const :tag "like search" 'case-fold-search))
+                (const :tag "like search" case-fold-search))
   :group 'dabbrev)
 
 (defcustom dabbrev-upcase-means-case-search nil
@@ -158,7 +156,7 @@ This variable has an effect only when the value of
 `dabbrev-case-fold-search' specifies to ignore case."
   :type '(choice (const :tag "off" nil)
                 (const :tag "on" t)
-                (const :tag "like M-x query-replace" 'case-replace))
+                (const :tag "like M-x query-replace" case-replace))
   :group 'dabbrev)
 
 (defcustom dabbrev-abbrev-char-regexp nil
@@ -194,10 +192,16 @@ 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."
+all the other buffers, except those named in `dabbrev-ignored-buffer-names'."
   :type 'boolean
   :group 'dabbrev)
 
+(defcustom dabbrev-ignored-buffer-names '("*Messages")
+  "*List of buffer names that dabbrev should not check."
+  :type '(repeat (string :tag "Buffer name"))
+  :group 'dabbrev
+  :version "20.3")
+
 (defcustom dabbrev-check-other-buffers t
   "*Should \\[dabbrev-expand] look in other buffers?\
 
@@ -756,7 +760,9 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]."
                        (nreverse
                         (dabbrev-filter-elements
                          buffer (buffer-list)
-                         (not (memq buffer dabbrev--friend-buffer-list))))
+                         (and (not (member (buffer-name buffer)
+                                           dabbrev-ignored-buffer-names))
+                              (not (memq buffer dabbrev--friend-buffer-list)))))
                        dabbrev--friend-buffer-list
                        (append dabbrev--friend-buffer-list
                                non-friend-buffer-list)))))
@@ -826,7 +832,7 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]."
     (if old
        (save-excursion
          (search-backward old))
-      ;;(store-match-data (list (point-marker) (point-marker)))
+      ;;(set-match-data (list (point-marker) (point-marker)))
       (search-backward abbrev))
     ;; Make case of replacement conform to case of abbreviation
     ;; provided (1) that kind of thing is enabled in this buffer