aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris2012-04-16 15:01:30 -0400
committerGlenn Morris2012-04-16 15:01:30 -0400
commit20f0c46dcdb597702fbb444729ec35411c036352 (patch)
tree74b236ea529d27c703c7b4dfc44e22deab2bf43f /lisp
parent5a0978ce61cc768c55d621d3f17e6f2c035caebc (diff)
downloademacs-20f0c46dcdb597702fbb444729ec35411c036352.tar.gz
emacs-20f0c46dcdb597702fbb444729ec35411c036352.zip
* lisp/progmodes/perl-mode.el (c-macro-expand): Remove unnecessary autoload
(it is in loaddefs.el).
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/progmodes/perl-mode.el7
2 files changed, 4 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3bed71495e5..24b564b6d70 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12012-04-16 Glenn Morris <rgm@gnu.org> 12012-04-16 Glenn Morris <rgm@gnu.org>
2 2
3 * progmodes/perl-mode.el (c-macro-expand):
4 Remove unnecessary autoload (it is in loaddefs.el).
5
3 * textmodes/picture.el (picture-desired-column) 6 * textmodes/picture.el (picture-desired-column)
4 (picture-update-desired-column): Convert comments to doc-strings. 7 (picture-update-desired-column): Convert comments to doc-strings.
5 (picture-substitute): Remove function. 8 (picture-substitute): Remove function.
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index aab5f8f65a4..cfca438a44b 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -1,6 +1,6 @@
1;;; perl-mode.el --- Perl code editing commands for GNU Emacs 1;;; perl-mode.el --- Perl code editing commands for GNU Emacs
2 2
3;; Copyright (C) 1990, 1994, 2001-2012 Free Software Foundation, Inc. 3;; Copyright (C) 1990, 1994, 2001-2012 Free Software Foundation, Inc.
4 4
5;; Author: William F. Mann 5;; Author: William F. Mann
6;; Maintainer: FSF 6;; Maintainer: FSF
@@ -133,11 +133,6 @@
133 map) 133 map)
134 "Keymap used in Perl mode.") 134 "Keymap used in Perl mode.")
135 135
136(autoload 'c-macro-expand "cmacexp"
137 "Display the result of expanding all C macros occurring in the region.
138The expansion is entirely correct because it uses the C preprocessor."
139 t)
140
141(defvar perl-mode-syntax-table 136(defvar perl-mode-syntax-table
142 (let ((st (make-syntax-table (standard-syntax-table)))) 137 (let ((st (make-syntax-table (standard-syntax-table))))
143 (modify-syntax-entry ?\n ">" st) 138 (modify-syntax-entry ?\n ">" st)