summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog21
-rw-r--r--lisp/abbrev.el2
-rw-r--r--lisp/button.el7
-rw-r--r--lisp/cus-face.el5
-rw-r--r--lisp/ediff-hook.el123
-rw-r--r--lisp/emacs-lisp/backquote.el2
-rw-r--r--lisp/emacs-lisp/timer.el11
-rw-r--r--lisp/facemenu.el33
-rw-r--r--lisp/faces.el6
-rw-r--r--lisp/menu-bar.el1
-rw-r--r--lisp/simple.el7
-rw-r--r--lisp/subr.el1
-rw-r--r--lisp/textmodes/fill.el2
-rw-r--r--lisp/textmodes/paragraphs.el18
14 files changed, 41 insertions, 198 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 93e8f80ff19..e34f2774b45 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,24 @@
+2008-03-14 Dan Nicolaescu <dann@ics.uci.edu>
+
+ * faces.el (xw-defined-colors):
+ * simple.el (widget-convert, shell-mode): Declare as functions
+ instead of autoloading.
+
+ * abbrev.el:
+ * button.el:
+ * cus-face.el:
+ * ediff-hook.el:
+ * emacs-lisp/backquote.el:
+ * emacs-lisp/timer.el:
+ * facemenu.el:
+ * faces.el:
+ * menu-bar.el:
+ * simple.el:
+ * subr.el:
+ * textmodes/fill.el:
+ * textmodes/paragraphs.el: Remove autoloads, redundant when the
+ files are preloaded.
+
2008-03-14 Stefan Monnier <monnier@iro.umontreal.ca>
* desktop.el (desktop-create-buffer): Don't catch errors if
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 5cdd2d0aa8f..1f0b28cfb97 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -70,7 +70,7 @@ Interactively, use the command `abbrev-mode'
to enable or disable Abbrev mode in the current buffer."
:type 'boolean
:group 'abbrev-mode)
-;;;###autoload(put 'abbrev-mode 'safe-local-variable 'booleanp)
+(put 'abbrev-mode 'safe-local-variable 'booleanp)
(defvar edit-abbrevs-map
diff --git a/lisp/button.el b/lisp/button.el
index df954871985..5d20ae7900a 100644
--- a/lisp/button.el
+++ b/lisp/button.el
@@ -61,7 +61,6 @@
"Default face used for buttons."
:group 'basic-faces)
-;;;###autoload
(defvar button-map
(let ((map (make-sparse-keymap)))
;; The following definition needs to avoid using escape sequences that
@@ -71,7 +70,6 @@
map)
"Keymap used by buttons.")
-;;;###autoload
(defvar button-buffer-map
(let ((map (make-sparse-keymap)))
(define-key map [?\t] 'forward-button)
@@ -116,7 +114,6 @@ Buttons inherit them by setting their `category' property to that symbol."
(or (get type 'button-category-symbol)
(error "Unknown button type `%s'" type)))
-;;;###autoload
(defun define-button-type (name &rest properties)
"Define a `button type' called NAME (a symbol).
The remaining arguments form a sequence of PROPERTY VALUE pairs,
@@ -247,7 +244,6 @@ the normal action is used instead."
;; Creating overlay buttons
-;;;###autoload
(defun make-button (beg end &rest properties)
"Make a button from BEG to END in the current buffer.
The remaining arguments form a sequence of PROPERTY VALUE pairs,
@@ -269,7 +265,6 @@ Also see `make-text-button', `insert-button'."
;; OVERLAY is the button, so return it
overlay))
-;;;###autoload
(defun insert-button (label &rest properties)
"Insert a button with the label LABEL.
The remaining arguments form a sequence of PROPERTY VALUE pairs,
@@ -287,7 +282,6 @@ Also see `insert-text-button', `make-button'."
;; Creating text-property buttons
-;;;###autoload
(defun make-text-button (beg end &rest properties)
"Make a button from BEG to END in the current buffer.
The remaining arguments form a sequence of PROPERTY VALUE pairs,
@@ -326,7 +320,6 @@ Also see `insert-text-button'."
;; Return something that can be used to get at the button.
beg)
-;;;###autoload
(defun insert-text-button (label &rest properties)
"Insert a button with the label LABEL.
The remaining arguments form a sequence of PROPERTY VALUE pairs,
diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index c9cba5858ac..6f5b5c42d5a 100644
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -33,7 +33,6 @@
;;; Declaring a face.
-;;;###autoload
(defun custom-declare-face (face spec doc &rest args)
"Like `defface', but FACE is evaluated as a normal argument."
(unless (get face 'face-defface-spec)
@@ -63,7 +62,6 @@
;;; Face attributes.
-;;;###autoload
(defconst custom-face-attributes
'((:family
(string :tag "Font Family"
@@ -269,7 +267,6 @@ If FRAME is nil, use the global defaults for FACE."
;;; Initializing.
-;;;###autoload
(defun custom-set-faces (&rest args)
"Initialize faces according to user preferences.
This associates the settings with the `user' theme.
@@ -357,7 +354,6 @@ FACE's list property `theme-face' \(using `custom-push-theme')."
;; XEmacs compability function. In XEmacs, when you reset a Custom
;; Theme, you have to specify the theme to reset it to. We just apply
;; the next theme.
-;;;###autoload
(defun custom-theme-reset-faces (theme &rest args)
"Reset the specs in THEME of some faces to their specs in other themes.
Each of the arguments ARGS has this form:
@@ -369,7 +365,6 @@ This means reset FACE. The argument IGNORED is ignored."
(dolist (arg args)
(custom-push-theme 'theme-face (car arg) theme 'reset)))
-;;;###autoload
(defun custom-reset-faces (&rest args)
"Reset the specs of some faces to their specs in specified themes.
This creates settings in the `user' theme.
diff --git a/lisp/ediff-hook.el b/lisp/ediff-hook.el
index 12d9936c1a9..c891407bee4 100644
--- a/lisp/ediff-hook.el
+++ b/lisp/ediff-hook.el
@@ -51,7 +51,7 @@
;; emacs, but it is needed in XEmacs
;;;###autoload
(if (featurep 'xemacs)
- ;; xemacs form
+ (progn
(defun ediff-xemacs-init-menus ()
(when (featurep 'menubar)
(add-submenu
@@ -65,13 +65,6 @@
(add-menu-button
'("Tools") "-------" "OO-Browser...")
)))
-
-
-;; This autoload is useless in Emacs because ediff-hook.el is dumped with
-;; emacs, but it is needed in XEmacs
-;;;###autoload
-(if (featurep 'xemacs)
- (progn
(defvar ediff-menu
'("Compare"
["Two Files..." ediff-files t]
@@ -233,121 +226,7 @@
(define-key menu-bar-ediff-misc-menu [ediff-doc]
'("Ediff Manual" . ediff-documentation)))
-;; arrange for autoloads
-(if purify-flag
- () ; if dumping, autoloads are set up in loaddefs.el
- ;; if the user decides to load this file, set up autoloads
- ;; compare files and buffers
- (autoload 'ediff "ediff" "Compare two files." t)
- (autoload 'ediff-files "ediff" "Compare two files." t)
- (autoload 'ediff-buffers "ediff" "Compare two buffers." t)
- (autoload 'ebuffers "ediff" "Compare two buffers." t)
- (autoload 'ediff3 "ediff" "Compare three files." t)
- (autoload 'ediff-files3 "ediff" "Compare three files." t)
- (autoload 'ediff-buffers3 "ediff" "Compare three buffers." t)
- (autoload 'ebuffers3 "ediff" "Compare three buffers." t)
-
- (autoload 'erevision "ediff" "Compare versions of a file." t)
- (autoload 'ediff-revision "ediff" "Compare versions of a file." t)
-
- ;; compare regions and windows
- (autoload 'ediff-windows-wordwise
- "ediff" "Compare two windows word-by-word." t)
- (autoload 'ediff-regions-wordwise
- "ediff" "Compare two regions word-by-word." t)
- (autoload 'ediff-windows-linewise
- "ediff" "Compare two windows line-by-line." t)
- (autoload 'ediff-regions-linewise
- "ediff" "Compare two regions line-by-line." t)
-
- ;; patch
- (autoload 'ediff-patch-file "ediff" "Patch a file." t)
- (autoload 'epatch "ediff" "Patch a file." t)
- (autoload 'ediff-patch-buffer "ediff" "Patch a buffer.")
- (autoload 'epatch-buffer "ediff" "Patch a buffer." t)
-
- ;; merge
- (autoload 'ediff-merge "ediff" "Merge two files." t)
- (autoload 'ediff-merge-files "ediff" "Merge two files." t)
- (autoload 'ediff-merge-files-with-ancestor
- "ediff" "Merge two files using a third file as an ancestor." t)
- (autoload 'ediff-merge-buffers "ediff" "Merge two buffers." t)
- (autoload 'ediff-merge-buffers-with-ancestor
- "ediff" "Merge two buffers using a third buffer as an ancestor." t)
-
- (autoload 'ediff-merge-revisions "ediff" "Merge two versions of a file." t)
- (autoload 'ediff-merge-revisions-with-ancestor
- "ediff" "Merge two versions of a file." t)
-
- ;; compare directories
- (autoload 'edirs "ediff" "Compare files in two directories." t)
- (autoload 'ediff-directories "ediff" "Compare files in two directories." t)
- (autoload 'edirs3 "ediff" "Compare files in three directories." t)
- (autoload
- 'ediff-directories3 "ediff" "Compare files in three directories." t)
-
- (autoload 'edir-revisions
- "ediff" "Compare two versions of a file." t)
- (autoload 'ediff-directory-revisions
- "ediff" "Compare two versions of a file." t)
-
- ;; merge directories
- (autoload 'edirs-merge "ediff" "Merge files in two directories." t)
- (autoload 'ediff-merge-directories
- "ediff" "Merge files in two directories." t)
- (autoload 'edirs-merge-with-ancestor
- "ediff"
- "Merge files in two directories using files in a third dir as ancestors."
- t)
- (autoload 'ediff-merge-directories-with-ancestor
- "ediff"
- "Merge files in two directories using files in a third dir as ancestors."
- t)
-
- (autoload 'edir-merge-revisions
- "ediff" "Merge versions of files in a directory." t)
- (autoload 'ediff-merge-directory-revisions
- "ediff" "Merge versions of files in a directory." t)
- (autoload 'ediff-merge-directory-revisions-with-ancestor
- "ediff"
- "Merge versions of files in a directory using other versions as ancestors."
- t)
- (autoload 'edir-merge-revisions-with-ancestor
- "ediff"
- "Merge versions of files in a directory using other versions as ancestors."
- t)
-
- ;; misc
- (autoload 'ediff-show-registry
- "ediff-mult"
- "Display the registry of active Ediff sessions."
- t)
- (autoload 'eregistry
- "ediff-mult"
- "Display the registry of active Ediff sessions."
- t)
- (autoload 'ediff-documentation
- "ediff"
- "Display Ediff's manual."
- t)
- (autoload 'ediff-version
- "ediff"
- "Show Ediff's version and last modification date."
- t)
- (autoload 'ediff-toggle-multiframe
- "ediff-util"
- "Toggle the use of separate frame for Ediff control buffer."
- t)
- (autoload 'ediff-toggle-use-toolbar
- "ediff-util"
- "Toggle the use of Ediff toolbar."
- t)
-
- ) ; if purify-flag
-
-
(provide 'ediff-hook)
-
;;; arch-tag: 512f8656-8a4b-4789-af5d-5c6144498df3
;;; ediff-hook.el ends here
diff --git a/lisp/emacs-lisp/backquote.el b/lisp/emacs-lisp/backquote.el
index e0988fe5e90..68ef78aed5c 100644
--- a/lisp/emacs-lisp/backquote.el
+++ b/lisp/emacs-lisp/backquote.el
@@ -91,7 +91,6 @@ For example (backquote-list* 'a 'b 'c) => (a b . c)"
(defconst backquote-splice-symbol '\,@
"Symbol used to represent a splice inside a backquote.")
-;;;###autoload
(defmacro backquote (structure)
"Argument STRUCTURE describes a template to build.
@@ -110,7 +109,6 @@ Vectors work just like lists. Nested backquotes are permitted."
;; GNU Emacs has no reader macros
-;;;###autoload
(defalias '\` (symbol-function 'backquote))
;; backquote-process returns a dotted-pair of a tag (0, 1, or 2) and
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index b2f54990ceb..6ca68824d95 100644
--- a/lisp/emacs-lisp/timer.el
+++ b/lisp/emacs-lisp/timer.el
@@ -251,9 +251,8 @@ of allocating a new one."
nil)
(error "Invalid or uninitialized timer")))
-;;;###autoload
(defalias 'disable-timeout 'cancel-timer)
-;;;###autoload
+
(defun cancel-timer (timer)
"Remove TIMER from the list of active timers."
(or (timerp timer)
@@ -274,7 +273,6 @@ that was removed from the timer list."
(setq timer-idle-list (delq timer timer-idle-list)))
(or cell1 cell2)))
-;;;###autoload
(defun cancel-function-timers (function)
"Cancel all timers which would run FUNCTION.
This affects ordinary timers such as are scheduled by `run-at-time',
@@ -359,7 +357,6 @@ This function is called, by name, directly by the C code."
(declare-function diary-entry-time "diary-lib" (s))
-;;;###autoload
(defun run-at-time (time repeat function &rest args)
"Perform an action at time TIME.
Repeat the action every REPEAT seconds, if REPEAT is non-nil.
@@ -421,7 +418,6 @@ This function returns a timer object which you can use in `cancel-timer'."
(timer-activate timer)
timer))
-;;;###autoload
(defun run-with-timer (secs repeat function &rest args)
"Perform an action after a delay of SECS seconds.
Repeat the action every REPEAT seconds, if REPEAT is non-nil.
@@ -432,14 +428,12 @@ This function returns a timer object which you can use in `cancel-timer'."
(interactive "sRun after delay (seconds): \nNRepeat interval: \naFunction: ")
(apply 'run-at-time secs repeat function args))
-;;;###autoload
(defun add-timeout (secs function object &optional repeat)
"Add a timer to run SECS seconds from now, to call FUNCTION on OBJECT.
If REPEAT is non-nil, repeat the timer every REPEAT seconds.
This function is for compatibility; see also `run-with-timer'."
(run-with-timer secs repeat function object))
-;;;###autoload
(defun run-with-idle-timer (secs repeat function &rest args)
"Perform an action the next time Emacs is idle for SECS seconds.
The action is to call FUNCTION with arguments ARGS.
@@ -466,12 +460,11 @@ This function returns a timer object which you can use in `cancel-timer'."
"This is the timer function used for the timer made by `with-timeout'."
(throw tag 'timeout))
-;;;###autoload (put 'with-timeout 'lisp-indent-function 1)
+(put 'with-timeout 'lisp-indent-function 1)
(defvar with-timeout-timers nil
"List of all timers used by currently pending `with-timeout' calls.")
-;;;###autoload
(defmacro with-timeout (list &rest body)
"Run BODY, but if it doesn't finish in SECONDS seconds, give up.
If we give up, we run the TIMEOUT-FORMS and return the value of the last one.
diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index 63ad704c8c4..55d12acc957 100644
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -91,10 +91,6 @@
(require 'help)
(require 'button))
-;;; Provide some binding for startup:
-;;;###autoload (define-key global-map "\M-o" 'facemenu-keymap)
-;;;###autoload (autoload 'facemenu-keymap "facemenu" "Keymap for face-changing commands." t 'keymap)
-
;; Global bindings:
(define-key global-map [C-down-mouse-2] 'facemenu-menu)
(define-key global-map "\M-o" 'facemenu-keymap)
@@ -167,33 +163,27 @@ it will remove any faces not explicitly in the list."
:group 'facemenu
:version "22.1")
-;;;###autoload
(defvar facemenu-face-menu
(let ((map (make-sparse-keymap "Face")))
(define-key map "o" (cons "Other..." 'facemenu-set-face))
map)
"Menu keymap for faces.")
-;;;###autoload
(defalias 'facemenu-face-menu facemenu-face-menu)
(put 'facemenu-face-menu 'menu-enable '(facemenu-enable-faces-p))
-;;;###autoload
(defvar facemenu-foreground-menu
(let ((map (make-sparse-keymap "Foreground Color")))
(define-key map "o" (cons "Other..." 'facemenu-set-foreground))
map)
"Menu keymap for foreground colors.")
-;;;###autoload
(defalias 'facemenu-foreground-menu facemenu-foreground-menu)
(put 'facemenu-foreground-menu 'menu-enable '(facemenu-enable-faces-p))
-;;;###autoload
(defvar facemenu-background-menu
(let ((map (make-sparse-keymap "Background Color")))
(define-key map "o" (cons "Other..." 'facemenu-set-background))
map)
"Menu keymap for background colors.")
-;;;###autoload
(defalias 'facemenu-background-menu facemenu-background-menu)
(put 'facemenu-background-menu 'menu-enable '(facemenu-enable-faces-p))
@@ -201,7 +191,6 @@ it will remove any faces not explicitly in the list."
(defun facemenu-enable-faces-p ()
(not (and font-lock-mode font-lock-defaults)))
-;;;###autoload
(defvar facemenu-special-menu
(let ((map (make-sparse-keymap "Special")))
(define-key map [?s] (cons (purecopy "Remove Special")
@@ -214,10 +203,8 @@ it will remove any faces not explicitly in the list."
'facemenu-set-read-only))
map)
"Menu keymap for non-face text-properties.")
-;;;###autoload
(defalias 'facemenu-special-menu facemenu-special-menu)
-;;;###autoload
(defvar facemenu-justification-menu
(let ((map (make-sparse-keymap "Justification")))
(define-key map [?c] (cons (purecopy "Center") 'set-justification-center))
@@ -227,10 +214,8 @@ it will remove any faces not explicitly in the list."
(define-key map [?u] (cons (purecopy "Unfilled") 'set-justification-none))
map)
"Submenu for text justification commands.")
-;;;###autoload
(defalias 'facemenu-justification-menu facemenu-justification-menu)
-;;;###autoload
(defvar facemenu-indentation-menu
(let ((map (make-sparse-keymap "Indentation")))
(define-key map [decrease-right-margin]
@@ -243,16 +228,12 @@ it will remove any faces not explicitly in the list."
(cons (purecopy "Indent More") 'increase-left-margin))
map)
"Submenu for indentation commands.")
-;;;###autoload
(defalias 'facemenu-indentation-menu facemenu-indentation-menu)
;; This is split up to avoid an overlong line in loaddefs.el.
-;;;###autoload
(defvar facemenu-menu nil
"Facemenu top-level menu keymap.")
-;;;###autoload
(setq facemenu-menu (make-sparse-keymap "Text Properties"))
-;;;###autoload
(let ((map facemenu-menu))
(define-key map [dc] (cons (purecopy "Display Colors") 'list-colors-display))
(define-key map [df] (cons (purecopy "Display Faces") 'list-faces-display))
@@ -263,7 +244,6 @@ it will remove any faces not explicitly in the list."
(define-key map [rm] (cons (purecopy "Remove Face Properties")
'facemenu-remove-face-props))
(define-key map [s1] (list (purecopy "--"))))
-;;;###autoload
(let ((map facemenu-menu))
(define-key map [in] (cons (purecopy "Indentation")
'facemenu-indentation-menu))
@@ -278,7 +258,6 @@ it will remove any faces not explicitly in the list."
'facemenu-foreground-menu))
(define-key map [fc] (cons (purecopy "Face")
'facemenu-face-menu)))
-;;;###autoload
(defalias 'facemenu-menu facemenu-menu)
(defvar facemenu-keymap
@@ -334,7 +313,6 @@ variables."
(facemenu-iterate 'facemenu-add-new-face
(facemenu-complete-face-list facemenu-keybindings)))
-;;;###autoload
(defun facemenu-set-face (face &optional start end)
"Apply FACE to the region or next character typed.
@@ -364,7 +342,6 @@ if `facemenu-listed-faces' says to do that."
(facemenu-add-new-face face)
(facemenu-add-face face start end))
-;;;###autoload
(defun facemenu-set-foreground (color &optional start end)
"Set the foreground COLOR of the region or next character typed.
This command reads the color in the minibuffer.
@@ -387,7 +364,6 @@ typing a character to insert cancels the specification."
(facemenu-add-new-color color 'facemenu-foreground-menu)
start end))
-;;;###autoload
(defun facemenu-set-background (color &optional start end)
"Set the background COLOR of the region or next character typed.
This command reads the color in the minibuffer.
@@ -410,7 +386,6 @@ typing a character to insert cancels the specification."
(facemenu-add-new-color color 'facemenu-background-menu)
start end))
-;;;###autoload
(defun facemenu-set-face-from-menu (face start end)
"Set the FACE of the region or next character typed.
This function is designed to be called from a menu; FACE is determined
@@ -442,7 +417,6 @@ to insert cancels the specification."
face))
start end))
-;;;###autoload
(defun facemenu-set-invisible (start end)
"Make the region invisible.
This sets the `invisible' text property; it can be undone with
@@ -450,7 +424,6 @@ This sets the `invisible' text property; it can be undone with
(interactive "r")
(add-text-properties start end '(invisible t)))
-;;;###autoload
(defun facemenu-set-intangible (start end)
"Make the region intangible: disallow moving into it.
This sets the `intangible' text property; it can be undone with
@@ -458,7 +431,6 @@ This sets the `intangible' text property; it can be undone with
(interactive "r")
(add-text-properties start end '(intangible t)))
-;;;###autoload
(defun facemenu-set-read-only (start end)
"Make the region unmodifiable.
This sets the `read-only' text property; it can be undone with
@@ -466,7 +438,6 @@ This sets the `read-only' text property; it can be undone with
(interactive "r")
(add-text-properties start end '(read-only t)))
-;;;###autoload
(defun facemenu-remove-face-props (start end)
"Remove `face' and `mouse-face' text properties."
(interactive "*r") ; error if buffer is read-only despite the next line.
@@ -474,14 +445,12 @@ This sets the `read-only' text property; it can be undone with
(remove-text-properties
start end '(face nil mouse-face nil))))
-;;;###autoload
(defun facemenu-remove-all (start end)
"Remove all text properties from the region."
(interactive "*r") ; error if buffer is read-only despite the next line.
(let ((inhibit-read-only t))
(set-text-properties start end nil)))
-;;;###autoload
(defun facemenu-remove-special (start end)
"Remove all the \"special\" text properties from the region.
These special properties include `invisible', `intangible' and `read-only'."
@@ -490,7 +459,6 @@ These special properties include `invisible', `intangible' and `read-only'."
(remove-text-properties
start end '(invisible nil intangible nil read-only nil))))
-;;;###autoload
(defun facemenu-read-color (&optional prompt)
"Read a color using the minibuffer."
(let* ((completion-ignore-case t)
@@ -502,7 +470,6 @@ These special properties include `invisible', `intangible' and `read-only'."
nil
col)))
-;;;###autoload
(defun list-colors-display (&optional list buffer-name)
"Display names of defined colors, and show what they look like.
If the optional argument LIST is non-nil, it should be a list of
diff --git a/lisp/faces.el b/lisp/faces.el
index c050b1805ef..08b0bb89021 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -28,9 +28,9 @@
;;; Code:
(eval-when-compile
- (require 'cl)
- ;; Warning suppression -- can't require x-win in batch:
- (autoload 'xw-defined-colors "x-win"))
+ (require 'cl))
+
+(declare-function xw-defined-colors "term/x-win" (&optional frame))
(defvar help-xref-stack-item)
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 46c6b598c6d..6d9e4608186 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1742,7 +1742,6 @@ Buffers menu is regenerated."
;; that would overwrite disabling the tool bar from X resources.
(put 'menu-bar-mode 'standard-value '(t))
-;;;###autoload
(define-minor-mode menu-bar-mode
"Toggle display of a menu bar on each frame.
This command applies to all frames that exist and frames to be
diff --git a/lisp/simple.el b/lisp/simple.el
index 8f6f67ff2fc..c140e719d58 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -31,9 +31,8 @@
;;; Code:
-(eval-when-compile
- (autoload 'widget-convert "wid-edit")
- (autoload 'shell-mode "shell"))
+(declare-function widget-convert "wid-edit" (type &rest args))
+(declare-function shell-mode "shell" ())
(defvar compilation-current-error)
@@ -4392,7 +4391,7 @@ If optional arg REALLY-WORD is non-nil, it finds just a word."
string)
:group 'fill)
(make-variable-buffer-local 'fill-prefix)
-;;;###autoload(put 'fill-prefix 'safe-local-variable 'string-or-null-p)
+(put 'fill-prefix 'safe-local-variable 'string-or-null-p)
(defcustom auto-fill-inhibit-regexp nil
"*Regexp to match lines which should not be auto-filled."
diff --git a/lisp/subr.el b/lisp/subr.el
index 0488b41319d..a591ec737ec 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1441,7 +1441,6 @@ definition only or variable definition only.
(setq files (cdr files)))
file)))
-;;;###autoload
(defun locate-library (library &optional nosuffix path interactive-call)
"Show the precise file name of Emacs library LIBRARY.
This command searches the directories in `load-path' like `\\[load-library]'
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 7f7a98e087a..23b3c1ade9e 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -48,7 +48,7 @@ A value of nil means that any change in indentation starts a new paragraph."
"*Non-nil means put two spaces after a colon when filling."
:type 'boolean
:group 'fill)
-;;;###autoload(put 'colon-double-space 'safe-local-variable 'booleanp)
+(put 'colon-double-space 'safe-local-variable 'booleanp)
(defvar fill-paragraph-function nil
"Mode-specific function to fill a paragraph, or nil if there is none.
diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el
index c2e45b217ef..4b7aa0c3a79 100644
--- a/lisp/textmodes/paragraphs.el
+++ b/lisp/textmodes/paragraphs.el
@@ -98,7 +98,7 @@ If the variable `use-hard-newlines' is non-nil, then only lines following a
hard newline are considered to match."
:group 'paragraphs
:type 'regexp)
-;;;###autoload(put 'paragraph-start 'safe-local-variable 'stringp)
+(put 'paragraph-start 'safe-local-variable 'stringp)
;; paragraph-start requires a hard newline, but paragraph-separate does not:
;; It is assumed that paragraph-separate is distinctive enough to be believed
@@ -116,7 +116,7 @@ ensures that the paragraph functions will work equally within a region of
text indented by a margin setting."
:group 'paragraphs
:type 'regexp)
-;;;###autoload(put 'paragraph-separate 'safe-local-variable 'stringp)
+(put 'paragraph-separate 'safe-local-variable 'stringp)
(defcustom sentence-end-double-space t
"Non-nil means a single space does not end a sentence.
@@ -128,7 +128,7 @@ regexp describing the end of a sentence, when the value of the variable
`sentence-end' is nil. See Info node `(elisp)Standard Regexps'."
:type 'boolean
:group 'fill)
-;;;###autoload(put 'sentence-end-double-space 'safe-local-variable 'booleanp)
+(put 'sentence-end-double-space 'safe-local-variable 'booleanp)
(defcustom sentence-end-without-period nil
"Non-nil means a sentence will end without a period.
@@ -140,7 +140,7 @@ regexp describing the end of a sentence, when the value of the variable
`sentence-end' is nil. See Info node `(elisp)Standard Regexps'."
:type 'boolean
:group 'fill)
-;;;###autoload(put 'sentence-end-without-period 'safe-local-variable 'booleanp)
+(put 'sentence-end-without-period 'safe-local-variable 'booleanp)
(defcustom sentence-end-without-space
"$B!#!%!)!*$A!##.#?#!$(0!$!%!)!*$(G!$!%!)!*(B"
@@ -151,7 +151,7 @@ regexp describing the end of a sentence, when the value of the variable
`sentence-end' is nil. See Info node `(elisp)Standard Regexps'."
:group 'paragraphs
:type 'string)
-;;;###autoload(put 'sentence-end-without-space 'safe-local-variable 'stringp)
+(put 'sentence-end-without-space 'safe-local-variable 'stringp)
(defcustom sentence-end nil
"Regexp describing the end of a sentence.
@@ -163,14 +163,14 @@ function `sentence-end'. You should always use this function
to obtain the value of this variable."
:group 'paragraphs
:type '(choice regexp (const :tag "Use default value" nil)))
-;;;###autoload(put 'sentence-end 'safe-local-variable 'string-or-null-p)
+(put 'sentence-end 'safe-local-variable 'string-or-null-p)
(defcustom sentence-end-base "[.?!][]\"'$B!I$,1r}(B)}]*"
"Regexp matching the basic end of a sentence, not including following space."
:group 'paragraphs
:type 'string
:version "22.1")
-;;;###autoload(put 'sentence-end-base 'safe-local-variable 'stringp)
+(put 'sentence-end-base 'safe-local-variable 'stringp)
(defun sentence-end ()
"Return the regexp describing the end of a sentence.
@@ -198,14 +198,14 @@ in between. See Info node `(elisp)Standard Regexps'."
"Regexp describing line-beginnings that separate pages."
:group 'paragraphs
:type 'regexp)
-;;;###autoload(put 'page-delimiter 'safe-local-variable 'stringp)
+(put 'page-delimiter 'safe-local-variable 'stringp)
(defcustom paragraph-ignore-fill-prefix nil
"Non-nil means the paragraph commands are not affected by `fill-prefix'.
This is desirable in modes where blank lines are the paragraph delimiters."
:group 'paragraphs
:type 'boolean)
-;;;###autoload(put 'paragraph-ignore-fill-prefix 'safe-local-variable 'booleanp)
+(put 'paragraph-ignore-fill-prefix 'safe-local-variable 'booleanp)
(defun forward-paragraph (&optional arg)
"Move forward to end of paragraph.