diff options
| author | Miles Bader <miles@gnu.org> | 2007-01-26 06:16:11 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-01-26 06:16:11 +0000 |
| commit | c0466914ba3ad88c402b0301646b4b5db8aeb913 (patch) | |
| tree | 964d8df324ab5f46872dfedc92ccea9fe50a1441 /lisp/progmodes/cperl-mode.el | |
| parent | c97a3f22ed5841f1c8bcdbb80df2bd49635c6a56 (diff) | |
| parent | 58f8a3f97bd49484d0eb4f83a70662ded0daf9cc (diff) | |
| download | emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.tar.gz emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.tar.bz2 emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 586-614)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- Merge from erc--main--0
- Make byte compiler correctly write circular constants
* gnus--rel--5.10 (patch 186-196)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
Diffstat (limited to 'lisp/progmodes/cperl-mode.el')
| -rw-r--r-- | lisp/progmodes/cperl-mode.el | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 14cbaf9c0f4..29f4cc372d3 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -1,7 +1,7 @@ ;;; cperl-mode.el --- Perl code editing commands for Emacs ;; Copyright (C) 1985, 1986, 1987, 1991, 1992, 1993, 1994, 1995, 1996, 1997, -;; 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +;; 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 ;; Free Software Foundation, Inc. ;; Author: Ilya Zakharevich and Bob Olson @@ -352,7 +352,15 @@ Can be overwritten by `cperl-hairy' if nil." (defcustom cperl-electric-keywords nil "*Not-nil (and non-null) means keywords are electric in CPerl. -Can be overwritten by `cperl-hairy' if nil." +Can be overwritten by `cperl-hairy' if nil. + +Uses `abbrev-mode' to do the expansion. If you want to use your +own abbrevs in cperl-mode, but do not want keywords to be +electric, you must redefine `cperl-mode-abbrev-table': do +\\[edit-abbrevs], search for `cperl-mode-abbrev-table', and, in +that paragraph, delete the words that appear at the ends of lines and +that begin with \"cperl-electric\". +" :type '(choice (const null) boolean) :group 'cperl-affected-by-hairy) |