5 files changed, 18 insertions, 7 deletions

diff --git a/lisp/bindings.el b/lisp/bindings.el
index 139a4853918..e6ccbac6eab 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -153,7 +153,7 @@ corresponding to the mode line clicked."
     (:propertize ("" (:eval (if (frame-parameter nil 'client) "@" "")))
                  help-echo "emacsclient frame"))
   "Mode-line control for identifying emacsclient frames.")
-;; Autoload all risky properties if this file no longer dumped.
+;;;###autoload
 (put 'mode-line-client 'risky-local-variable t)
 
 (defvar mode-line-mule-info
@@ -196,6 +196,7 @@ mnemonics of the following coding systems:
   ;;  coding system for encoding text to send to buffer process (if any)."
 )
 
+;;;###autoload
 (put 'mode-line-mule-info 'risky-local-variable t)
 (make-variable-buffer-local 'mode-line-mule-info)
 
@@ -212,12 +213,14 @@ Value is used for `mode-line-frame-identification', which see."
 ;; the mode line is actually displayed.
 (defvar mode-line-frame-identification '(:eval (mode-line-frame-control))
   "Mode-line control to describe the current frame.")
+;;;###autoload
 (put 'mode-line-frame-identification 'risky-local-variable t)
 
 (defvar mode-line-process nil "\
 Mode-line control for displaying info on process status.
 Normally nil in most modes, since there is no process to display.")
 
+;;;###autoload
 (put 'mode-line-process 'risky-local-variable t)
 (make-variable-buffer-local 'mode-line-process)
 
@@ -249,6 +252,7 @@ Normally nil in most modes, since there is no process to display.")
          'mouse-face 'mode-line-highlight))
   "Mode-line control for displaying whether current buffer is modified.")
 
+;;;###autoload
 (put 'mode-line-modified 'risky-local-variable t)
 (make-variable-buffer-local 'mode-line-modified)
 
@@ -266,6 +270,7 @@ Normally nil in most modes, since there is no process to display.")
                                              "Current directory is local: ")
                                            default-directory)))))))
   "Mode-line flag to show if default-directory for current buffer is remote.")
+;;;###autoload
 (put 'mode-line-remote 'risky-local-variable t)
 
 (make-variable-buffer-local 'mode-line-remote)
@@ -275,10 +280,12 @@ Normally nil in most modes, since there is no process to display.")
   "Mode-line control for displaying the position in the buffer.
 Normally displays the buffer percentage and, optionally, the
 buffer size, the line number and the column number.")
+;;;###autoload
 (put 'mode-line-position 'risky-local-variable t)
 
 (defvar mode-line-modes nil
   "Mode-line control for displaying major and minor modes.")
+;;;###autoload
 (put 'mode-line-modes 'risky-local-variable t)
 
 (defvar mode-line-mode-menu (make-sparse-keymap "Minor Modes") "\
@@ -458,6 +465,7 @@ Its default value is (\"%12b\") with some text properties added.
 Major modes that edit things other than ordinary files may change this
 \(e.g. Info, Dired,...)")
 
+;;;###autoload
 (put 'mode-line-buffer-identification 'risky-local-variable t)
 (make-variable-buffer-local 'mode-line-buffer-identification)
 
@@ -565,6 +573,7 @@ STRING is included in the mode line if VARIABLE's value is non-nil.
 
 Actually, STRING need not be a string; any possible mode-line element
 is okay.  See `mode-line-format'.")
+;;;###autoload
 (put 'minor-mode-alist 'risky-local-variable t)
 ;; Don't use purecopy here--some people want to change these strings.
 (setq minor-mode-alist
diff --git a/lisp/font-core.el b/lisp/font-core.el
index 7112b6b227c..57d0e28262f 100644
--- a/lisp/font-core.el
+++ b/lisp/font-core.el
@@ -1,7 +1,8 @@
 ;;; font-core.el --- Core interface to font-lock
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-;;   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;;   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: languages, faces
@@ -75,7 +76,7 @@ Other variables include that for syntactic keyword fontification,
 functions, `font-lock-fontify-buffer-function',
 `font-lock-unfontify-buffer-function', `font-lock-fontify-region-function',
 `font-lock-unfontify-region-function', and `font-lock-inhibit-thing-lock'.")
-;; Autoload if this file no longer dumped.
+;;;###autoload
 (put 'font-lock-defaults 'risky-local-variable t)
 (make-variable-buffer-local 'font-lock-defaults)
 
diff --git a/lisp/format.el b/lisp/format.el
index f15026147c7..c04be656b21 100644
--- a/lisp/format.el
+++ b/lisp/format.el
@@ -136,7 +136,7 @@ MODE-FN, if specified, is called when visiting a file with that format.
 
 PRESERVE, if non-nil, means that `format-write-file' should not remove
           this format from `buffer-file-format'.")
-;; Autoload if this file no longer dumped.
+;;;###autoload
 (put 'format-alist 'risky-local-variable t)
 
 ;;; Basic Functions (called from Lisp)
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 7c1d82ad3c6..9d6f6eb4e96 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1342,7 +1342,7 @@ This function is called with no argument.")
 Each element has the form:
    (INPUT-METHOD LANGUAGE-ENV ACTIVATE-FUNC TITLE DESCRIPTION ARGS...)
 See the function `register-input-method' for the meanings of the elements.")
-;; Autoload if this file no longer dumped.
+;;;###autoload
 (put 'input-method-alist 'risky-local-variable t)
 
 (defun register-input-method (input-method lang-env &rest args)
diff --git a/lisp/window.el b/lisp/window.el
index c4dc973f94f..1c77795d098 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -601,8 +601,6 @@ and `same-window-regexps'.  Those variables take precedence over
 this one.
 
 See also `special-display-regexps'."
-  ;; Autoload if this file no longer dumped.
-  :risky t
   :type '(repeat
           (choice :tag "Buffer"
                   :value ""
@@ -624,6 +622,9 @@ See also `special-display-regexps'."
   :group 'windows
   :group 'frames)
 
+;;;###autoload
+(put 'special-display-buffer-names 'risky-local-variable t)
+
 (defcustom special-display-regexps nil
   "List of regexps saying which buffers should be displayed specially.
 Displaying a buffer with `display-buffer' or `pop-to-buffer', if