diff options
| author | Lars Magne Ingebrigtsen | 2011-07-06 19:45:01 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2011-07-06 19:45:01 +0200 |
| commit | fe204702284fb69d07b35a0e3912fe939cf30ff8 (patch) | |
| tree | 964be171fbd597b549896ef7c9543ed35dbd4de1 | |
| parent | a48868a7d83a1f0ec2297cc254abaae176233d79 (diff) | |
| download | emacs-fe204702284fb69d07b35a0e3912fe939cf30ff8.tar.gz emacs-fe204702284fb69d07b35a0e3912fe939cf30ff8.zip | |
* dabbrev.el (dabbrev-abbrev-char-regexp): Note that nil defaults
to "\\sw\\|\\s_" (bug#358).
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/dabbrev.el | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5dcdbad05b5..68533f8e89e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2011-07-06 Lars Magne Ingebrigtsen <larsi@gnus.org> | 1 | 2011-07-06 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 2 | ||
| 3 | * dabbrev.el (dabbrev-abbrev-char-regexp): Note that nil defaults | ||
| 4 | to "\\sw\\|\\s_" (bug#358). | ||
| 5 | |||
| 3 | * dired.el (dired-mode): Clarify "unmark or unflag" (bug#8770). | 6 | * dired.el (dired-mode): Clarify "unmark or unflag" (bug#8770). |
| 4 | (dired-unmark-backward): Ditto. | 7 | (dired-unmark-backward): Ditto. |
| 5 | (dired-flag-backup-files): Ditto. | 8 | (dired-flag-backup-files): Ditto. |
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el index 00e2ec802e2..540b93faad8 100644 --- a/lisp/dabbrev.el +++ b/lisp/dabbrev.el | |||
| @@ -206,7 +206,8 @@ starting with or containing `no-'. If you set this variable to | |||
| 206 | expanding `yes-or-no-' signals an error because `-' is not part of a word; | 206 | expanding `yes-or-no-' signals an error because `-' is not part of a word; |
| 207 | but expanding `yes-or-no' looks for a word starting with `no'. | 207 | but expanding `yes-or-no' looks for a word starting with `no'. |
| 208 | 208 | ||
| 209 | The recommended value is \"\\\\sw\\\\|\\\\s_\"." | 209 | The recommended value is nil, which will make dabbrev default to |
| 210 | using \"\\\\sw\\\\|\\\\s_\"." | ||
| 210 | :type '(choice (const nil) | 211 | :type '(choice (const nil) |
| 211 | regexp) | 212 | regexp) |
| 212 | :group 'dabbrev) | 213 | :group 'dabbrev) |