autoload cookies for defcustoms

autoload cookies for defcustoms

[Drew Adams]

Just curious. Is there a policy, for the Lisp code distributed with Emacs, about
using autoload cookies for defcustoms? If so, what is it?

Looking through the code, it seems that most defcustoms are not autoloaded, but
some are. And in the same library some might be and others not.

Some use `purecopy' for their values, so I guess it makes sense to autoload
those. But it's not clear which came first, the cookie or the decision to use
`purecopy'. 

If, in some library, only the options that use `purecopy' are autoloaded,
doesn't that give a misleading impression to users of `C-h v'? They see only the
`purecopy' ones (before loading), which aren't necessarily the most important to
know about.

IOW, are there two conflicting criteria for autoloading an option: (1) its
importance or frequency of use or the need for users to know about it before
loading vs (2) the purely technical (implementation) criterion of its use of
`purecopy'. Shouldn't the only criterion be use- and user-centered (i.e., #1)?

Some options that do not use `purecopy' are nevertheless autoloaded. And some
that do use `purecopy' do not have an autoload cookie - e.g.,
`epa-file-name-regexp', `automount-dir-prefix', `directory-free-space-program',
`search-whitespace-regexp', `jka-compr-load-suffixes', `rmail-file-name',
`site-run-file', `initial-scratch-message', `vc-directory-exclusion-list',
`adaptive-fill-regexp', `adaptive-fill-first-line-regexp'. (Is that wrong, or
are all of those libraries always preloaded?)

If there is no general policy, and this is decided individually for each
defcustom, then just what considerations affect the judgment? And why is there
such variability among libraries?

The same question could apply to command definitions, but there there doesn't
seem to be such a difference among libraries for them. Most commands seem to
have autoload cookies (just as most options do not), and I'm guessing that those
commands that do not are considered to be less often used.

Re: autoload cookies for defcustoms

[Lennart Borgman]

On Sat, Jan 23, 2010 at 7:31 PM, Drew Adams <drew.adams@oracle.com> wrote:
> Just curious. Is there a policy, for the Lisp code distributed with Emacs, about
> using autoload cookies for defcustoms? If so, what is it?


We had a discussion about that in November:

  http://lists.gnu.org/archive/html/emacs-devel/2009-11/msg00504.html

The conclusion there was that all defcustoms (~7000) can't be
autoloaded but that we can probably set it up so that completion of
options knows all option names (and maybe apropos can know about them
too).

But we did not finish that. I think I have some more things to test
there, but anyone who want to join is of course wellcome.


> Looking through the code, it seems that most defcustoms are not autoloaded, but
> some are. And in the same library some might be and others not.
>
> Some use `purecopy' for their values, so I guess it makes sense to autoload
> those. But it's not clear which came first, the cookie or the decision to use
> `purecopy'.
>
> If, in some library, only the options that use `purecopy' are autoloaded,
> doesn't that give a misleading impression to users of `C-h v'? They see only the
> `purecopy' ones (before loading), which aren't necessarily the most important to
> know about.
>
> IOW, are there two conflicting criteria for autoloading an option: (1) its
> importance or frequency of use or the need for users to know about it before
> loading vs (2) the purely technical (implementation) criterion of its use of
> `purecopy'. Shouldn't the only criterion be use- and user-centered (i.e., #1)?
>
> Some options that do not use `purecopy' are nevertheless autoloaded. And some
> that do use `purecopy' do not have an autoload cookie - e.g.,
> `epa-file-name-regexp', `automount-dir-prefix', `directory-free-space-program',
> `search-whitespace-regexp', `jka-compr-load-suffixes', `rmail-file-name',
> `site-run-file', `initial-scratch-message', `vc-directory-exclusion-list',
> `adaptive-fill-regexp', `adaptive-fill-first-line-regexp'. (Is that wrong, or
> are all of those libraries always preloaded?)
>
> If there is no general policy, and this is decided individually for each
> defcustom, then just what considerations affect the judgment? And why is there
> such variability among libraries?
>
> The same question could apply to command definitions, but there there doesn't
> seem to be such a difference among libraries for them. Most commands seem to
> have autoload cookies (just as most options do not), and I'm guessing that those
> commands that do not are considered to be less often used.
>
>
>
>

RE: autoload cookies for defcustoms

[Drew Adams]

> > Is there a policy, for the Lisp code distributed with
> > Emacs, about using autoload cookies for defcustoms?
> > If so, what is it?
> 
> We had a discussion about that in November:
>   http://lists.gnu.org/archive/html/emacs-devel/2009-11/msg00504.html
> 
> The conclusion there was that all defcustoms (~7000) can't be
> autoloaded but that we can probably set it up so that completion of
> options knows all option names (and maybe apropos can know about them
> too).

Yes, but even though that is somewhat related, it does not address the questions
I raised. In particular (but not only): what is the current policy about when to
add an autoload cookie?

> But we did not finish that. I think I have some more things to test
> there, but anyone who want to join is of course wellcome.

That is a different topic. My questions are about the current autoload-cookie
policy.

Re: autoload cookies for defcustoms

[Stefan Monnier]

> Just curious.  Is there a policy, for the Lisp code distributed with
> Emacs, about using autoload cookies for defcustoms? If so, what is it?

AFAIK the policy is: "don't do it".
It all too often introduces all kinds of nasty problems.
More to the point, I welcome patches that remove tham.


        Stefan

RE: autoload cookies for defcustoms

[Drew Adams]

> > Just curious.  Is there a policy, for the Lisp code distributed with
> > Emacs, about using autoload cookies for defcustoms? If so, 
> > what is it?
> 
> AFAIK the policy is: "don't do it".
> It all too often introduces all kinds of nasty problems.
> More to the point, I welcome patches that remove tham.

OK.

And what about those that use `purecopy'? Why privilege autoloading of certain
options just because they have strings as values or parts of their values?
That's very implementation-centric, as opposed to privileging options that are
somehow considered "important" for users to know about.

Of course, if users can at least see all option names (all from the distributed
libraries) as completion candidates, that will go a long way toward making them
known to users before loading. That will be a welcome improvement.

Re: autoload cookies for defcustoms

[Stefan Monnier]

>> > Just curious.  Is there a policy, for the Lisp code distributed with
>> > Emacs, about using autoload cookies for defcustoms? If so, 
>> > what is it?
>> AFAIK the policy is: "don't do it".
>> It all too often introduces all kinds of nasty problems.
>> More to the point, I welcome patches that remove tham.
> OK.
> And what about those that use `purecopy'?

AFAIK, `purecopy' has nothing to do with it, except that *if*
a defcustom is preloaded (either because it's in a preloaded file or
because it has an autoload cookie), then it may be desirable to purecopy
parts of its default value.  But it should never be a reason to decide
whether to autoload or not.

> That's very implementation-centric, as opposed to privileging options
> that are somehow considered "important" for users to know about.

Autoloading of some defcustoms should not be used just because some
option is "important".  It should only be used when it's *necessary* for
technical reasons.

> Of course, if users can at least see all option names (all from the
> distributed libraries) as completion candidates, that will go a long
> way toward making them known to users before loading.  That will be
> a welcome improvement.

Yes, that's an improvement that's planned to address the problem that
is sometimes solved by abusing autoloading.


        Stefan

RE: autoload cookies for defcustoms

[Drew Adams]

> AFAIK, `purecopy' has nothing to do with it, except that *if*
> a defcustom is preloaded (either because it's in a preloaded file or
> because it has an autoload cookie), then it may be desirable 
> to purecopy parts of its default value.  But it should never be a
> reason to decide whether to autoload or not.

Very good to hear.

However, looking at the options that actually use `purecopy' and have autoload
cookies, I have doubts that that guideline has been respected. It _seems_ that
`purecopy' has been added here and there and _consequently_ an autoload cookie
was then added.

Re: autoload cookies for defcustoms

[Stefan Monnier]

> However, looking at the options that actually use `purecopy' and have
> autoload cookies, I have doubts that that guideline has been
> respected. It _seems_ that `purecopy' has been added here and there
> and _consequently_ an autoload cookie was then added.

If that's the case, it was ill-advised.  Please report those cases.


        Stefan

RE: autoload cookies for defcustoms

[Drew Adams]

> > However, looking at the options that actually use `purecopy' and have
> > autoload cookies, I have doubts that that guideline has been
> > respected. It _seems_ that `purecopy' has been added here and there
> > and _consequently_ an autoload cookie was then added.
> 
> If that's the case, it was ill-advised.  Please report those cases.

Just grep. I didn't note the details after I did that.

Re: autoload cookies for defcustoms

[Juanma Barranquero]

On Mon, Jan 25, 2010 at 21:36, Drew Adams <drew.adams@oracle.com> wrote:

> It _seems_ that
> `purecopy' has been added here and there and _consequently_ an autoload cookie
> was then added.

What makes you think that? Many (most?) purecopy calls in defcustoms
were recently added by Dan. Have you looked at the history to
determine that the autoload was added afterwards, or it is just a
hunch?

    Juanma

Re: autoload cookies for defcustoms

[Wojciech Meyer]

[-- Attachment #1: Type: text/plain, Size: 369 bytes --]

Stefan Monnier <monnier@iro.umontreal.ca> writes:
> More to the point, I welcome patches that remove tham.

Yet another patch. (hope they are still welcome, as I am bombarding the
list this weekend!).

(I put `autoload' cookie inside a comment, if somebody just want to kill
the line instead, and use possibly vcs to track it later then let me know)

Thanks.
Wojciech


[-- Attachment #2: defcustom-auto-load-remove.txt --]
[-- Type: text/plain, Size: 83916 bytes --]

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: wojciech.meyer@gmail.com-20100829093707-\
#   hh1lj9ysl2ccdbzp
# target_branch: http://bzr.savannah.gnu.org/r/emacs/trunk
# testament_sha1: 55dc9d7c263e76d389610c71869a641530190714
# timestamp: 2010-08-29 10:37:42 +0100
# source_branch: ../autoload/
# base_revision_id: cyd@stupidchicken.com-20100829013145-\
#   vbi9k94pz30lkh2w
# 
# Begin patch
=== modified file 'lisp/avoid.el'
--- lisp/avoid.el	2010-01-13 08:35:10 +0000
+++ lisp/avoid.el	2010-08-29 09:37:07 +0000
@@ -75,7 +75,7 @@
   :prefix "mouse-avoidance-"
   :group 'mouse)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom mouse-avoidance-mode nil
   "Activate mouse avoidance mode.
 See function `mouse-avoidance-mode' for possible values.

=== modified file 'lisp/calc/calc.el'
--- lisp/calc/calc.el	2010-08-08 03:04:57 +0000
+++ lisp/calc/calc.el	2010-08-29 09:37:07 +0000
@@ -229,7 +229,7 @@
   :group  'applications)
 
 ;; Do not autoload, so it is evaluated at run-time rather than at dump time.
-;; ;;;###autoload
+;; `defcustom' should not be autoloaded ;; ;;;###autoload
 (defcustom calc-settings-file
   (locate-user-emacs-file "calc.el" ".calc.el")
   "File in which to record permanent settings."

=== modified file 'lisp/calendar/holidays.el'
--- lisp/calendar/holidays.el	2010-01-13 08:35:10 +0000
+++ lisp/calendar/holidays.el	2010-08-29 09:37:07 +0000
@@ -41,7 +41,7 @@
 ;; are used to using them to set calendar-holidays without having to
 ;; explicitly load this file.
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom holiday-general-holidays
   (mapcar 'purecopy
   '((holiday-fixed 1 1 "New Year's Day")
@@ -71,7 +71,7 @@
 (define-obsolete-variable-alias 'general-holidays
   'holiday-general-holidays "23.1")
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom holiday-oriental-holidays
   (mapcar 'purecopy
   '((holiday-chinese-new-year)
@@ -96,7 +96,7 @@
 (define-obsolete-variable-alias 'oriental-holidays
   'holiday-oriental-holidays "23.1")
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom holiday-local-holidays nil
   "Local holidays.
 See the documentation for `calendar-holidays' for details."
@@ -107,7 +107,7 @@
 ;;;###autoload
 (define-obsolete-variable-alias 'local-holidays 'holiday-local-holidays "23.1")
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom holiday-other-holidays nil
   "User defined holidays.
 See the documentation for `calendar-holidays' for details."
@@ -217,7 +217,7 @@
 (put 'hebrew-holidays-4 'risky-local-variable t)
 (make-obsolete-variable 'hebrew-holidays-4 'hebrew-holidays "23.1")
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom holiday-hebrew-holidays
   (mapcar 'purecopy
   '((holiday-hebrew-passover)
@@ -238,7 +238,7 @@
 (define-obsolete-variable-alias 'hebrew-holidays
   'holiday-hebrew-holidays "23.1")
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom holiday-christian-holidays
   (mapcar 'purecopy
   '((holiday-easter-etc)    ; respects calendar-christian-all-holidays-flag
@@ -260,7 +260,7 @@
 (define-obsolete-variable-alias 'christian-holidays
   'holiday-christian-holidays "23.1")
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom holiday-islamic-holidays
   (mapcar 'purecopy
   '((holiday-islamic-new-year)
@@ -284,7 +284,7 @@
 (define-obsolete-variable-alias 'islamic-holidays
   'holiday-islamic-holidays "23.1")
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom holiday-bahai-holidays
   (mapcar 'purecopy
   '((holiday-bahai-new-year)
@@ -307,7 +307,7 @@
 ;;;###autoload
 (define-obsolete-variable-alias 'bahai-holidays 'holiday-bahai-holidays "23.1")
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom holiday-solar-holidays
   (mapcar 'purecopy
   '((solar-equinoxes-solstices)

=== modified file 'lisp/cedet/semantic.el'
--- lisp/cedet/semantic.el	2010-04-29 15:32:11 +0000
+++ lisp/cedet/semantic.el	2010-08-29 09:37:07 +0000
@@ -1031,7 +1031,7 @@
     global-semantic-mru-bookmark-mode)
   "List of auxiliary minor modes in the Semantic package.")
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom semantic-default-submodes
   '(global-semantic-idle-scheduler-mode global-semanticdb-minor-mode)
   "List of auxiliary Semantic minor modes enabled by `semantic-mode'.

=== modified file 'lisp/cedet/semantic/db-find.el'
--- lisp/cedet/semantic/db-find.el	2010-04-03 00:42:10 +0000
+++ lisp/cedet/semantic/db-find.el	2010-08-29 09:37:07 +0000
@@ -139,7 +139,7 @@
   "Customization values for semanticdb find throttle.
 See `semanticdb-find-throttle' for details.")
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom semanticdb-find-default-throttle
   '(local project unloaded system recursive)
   "The default throttle for `semanticdb-find' routines.

=== modified file 'lisp/cedet/semantic/imenu.el'
--- lisp/cedet/semantic/imenu.el	2010-04-02 02:25:19 +0000
+++ lisp/cedet/semantic/imenu.el	2010-08-29 09:37:07 +0000
@@ -55,7 +55,7 @@
   :group 'imenu
   )
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom semantic-imenu-summary-function 'semantic-format-tag-abbreviate
   "*Function to use when creating items in Imenu.
 Some useful functions are found in `semantic-format-tag-functions'."
@@ -63,7 +63,7 @@
   :type semantic-format-tag-custom-list)
 (make-variable-buffer-local 'semantic-imenu-summary-function)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom semantic-imenu-bucketize-file t
   "*Non-nil if tags in a file are to be grouped into buckets."
   :group 'semantic-imenu
@@ -84,7 +84,7 @@
   :type 'boolean)
 (make-variable-buffer-local 'semantic-imenu-buckets-to-submenu)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom semantic-imenu-expand-type-members t
   "*Non-nil if types should have submenus with members in them."
   :group 'semantic-imenu

=== modified file 'lisp/cedet/semantic/senator.el'
--- lisp/cedet/semantic/senator.el	2010-01-13 08:35:10 +0000
+++ lisp/cedet/semantic/senator.el	2010-08-29 09:37:07 +0000
@@ -54,7 +54,7 @@
   "Semantic Navigator."
   :group 'semantic)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom senator-step-at-tag-classes nil
   "List of tag classes recognized by Senator's navigation commands.
 A tag class is a symbol, such as `variable', `function', or `type'.
@@ -66,7 +66,7 @@
 ;;;###autoload
 (make-variable-buffer-local 'senator-step-at-tag-classes)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom senator-step-at-start-end-tag-classes nil
   "List of tag classes at which Senator's navigation commands should stop.
 A tag class is a symbol, such as `variable', `function', or `type'.

=== modified file 'lisp/cus-edit.el'
--- lisp/cus-edit.el	2010-08-21 14:46:43 +0000
+++ lisp/cus-edit.el	2010-08-29 09:37:07 +0000
@@ -651,7 +651,7 @@
 
 ;;; Sorting.
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom custom-browse-sort-alphabetically nil
   "If non-nil, sort customization group alphabetically in `custom-browse'."
   :type 'boolean
@@ -671,7 +671,7 @@
   :type 'boolean
   :group 'custom-browse)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom custom-buffer-sort-alphabetically t
   "Whether to sort customization groups alphabetically in Custom buffer."
   :type 'boolean
@@ -687,7 +687,7 @@
 		 (const :tag "none" nil))
   :group 'custom-buffer)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom custom-menu-sort-alphabetically nil
   "If non-nil, sort each customization group alphabetically in menus."
   :type 'boolean
@@ -4216,7 +4216,7 @@
 \f
 ;;; Reading and writing the custom file.
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom custom-file nil
   "File used for storing customization information.
 The default is nil, which means to use your init file

=== modified file 'lisp/desktop.el'
--- lisp/desktop.el	2010-06-09 22:08:50 +0000
+++ lisp/desktop.el	2010-08-29 09:37:07 +0000
@@ -312,7 +312,7 @@
   :type '(repeat string)
   :group 'desktop)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom desktop-locals-to-save
   '(desktop-locals-to-save  ; Itself!  Think it over.
     truncate-lines

=== modified file 'lisp/dired.el'
--- lisp/dired.el	2010-07-27 02:10:05 +0000
+++ lisp/dired.el	2010-08-29 09:37:07 +0000
@@ -49,7 +49,7 @@
   :group 'dired)
 
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom dired-listing-switches (purecopy "-al")
   "Switches passed to `ls' for Dired.  MUST contain the `l' option.
 May contain all other options that don't contradict `-l';
@@ -104,7 +104,7 @@
   :type 'boolean
   :group 'dired-mark)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom dired-trivial-filenames (purecopy "^\\.\\.?$\\|^#")
   "Regexp of files to skip when finding first file of a directory.
 A value of nil means move to the subdir line.
@@ -752,7 +752,7 @@
 	 buffer-read-only
 	 (dired-directory-changed-p dirname))))
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom dired-auto-revert-buffer nil
   "Automatically revert dired buffer on revisiting.
 If t, revisiting an existing dired buffer automatically reverts it.

=== modified file 'lisp/dnd.el'
--- lisp/dnd.el	2010-06-22 07:10:16 +0000
+++ lisp/dnd.el	2010-08-29 09:37:07 +0000
@@ -34,7 +34,7 @@
 ;;; Customizable variables
 
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom dnd-protocol-alist
   `((,(purecopy "^file:///")  . dnd-open-local-file)	; XDND format.
     (,(purecopy "^file://")   . dnd-open-file)		; URL with host

=== modified file 'lisp/emacs-lisp/advice.el'
--- lisp/emacs-lisp/advice.el	2010-06-09 01:18:31 +0000
+++ lisp/emacs-lisp/advice.el	2010-08-29 09:37:07 +0000
@@ -1832,7 +1832,7 @@
 
 (defconst ad-version "2.14")
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom ad-redefinition-action 'warn
   "Defines what to do with redefinitions during Advice de/activation.
 Redefinition occurs if a previously activated function that already has an
@@ -1847,7 +1847,7 @@
 		 (other :tag "error" error))
   :group 'advice)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom ad-default-compilation-action 'maybe
   "Defines whether to compile advised definitions during activation.
 A value of `always' will result in unconditional compilation, `never' will

=== modified file 'lisp/emacs-lisp/edebug.el'
--- lisp/emacs-lisp/edebug.el	2010-06-18 14:05:43 +0000
+++ lisp/emacs-lisp/edebug.el	2010-08-29 09:37:07 +0000
@@ -77,7 +77,7 @@
 ;; because the byte compiler binds them; as a result, if edebug
 ;; is first loaded for a require in a compilation, they will be left unbound.
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom edebug-all-defs nil
   "If non-nil, evaluating defining forms instruments for Edebug.
 This applies to `eval-defun', `eval-region', `eval-buffer', and
@@ -95,7 +95,7 @@
 ;; because the byte compiler binds them; as a result, if edebug
 ;; is first loaded for a require in a compilation, they will be left unbound.
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom edebug-all-forms nil
   "Non-nil means evaluation of all forms will instrument for Edebug.
 This doesn't apply to loading or evaluations in the minibuffer.

=== modified file 'lisp/emacs-lisp/eldoc.el'
--- lisp/emacs-lisp/eldoc.el	2010-06-01 13:47:14 +0000
+++ lisp/emacs-lisp/eldoc.el	2010-08-29 09:37:07 +0000
@@ -63,7 +63,7 @@
   :type 'number
   :group 'eldoc)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom eldoc-minor-mode-string (purecopy " ElDoc")
   "String to display in mode line when ElDoc Mode is enabled; nil for none."
   :type '(choice string (const :tag "None" nil))

=== modified file 'lisp/emacs-lisp/package.el'
--- lisp/emacs-lisp/package.el	2010-08-26 03:31:34 +0000
+++ lisp/emacs-lisp/package.el	2010-08-29 09:37:07 +0000
@@ -178,7 +178,7 @@
   :group 'applications
   :version "24.1")
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom package-enable-at-startup t
   "Whether to activate installed packages when Emacs starts.
 If non-nil, packages are activated after reading the init file

=== modified file 'lisp/emacs-lisp/trace.el'
--- lisp/emacs-lisp/trace.el	2010-03-22 16:50:29 +0000
+++ lisp/emacs-lisp/trace.el	2010-08-29 09:37:07 +0000
@@ -159,7 +159,7 @@
   :prefix "trace-"
   :group 'lisp)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom trace-buffer (purecopy "*trace-output*")
   "Trace output will by default go to that buffer."
   :type 'string

=== modified file 'lisp/emulation/crisp.el'
--- lisp/emulation/crisp.el	2010-01-13 08:35:10 +0000
+++ lisp/emulation/crisp.el	2010-08-29 09:37:07 +0000
@@ -179,7 +179,7 @@
   :type 'string
   :group 'crisp)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom crisp-mode nil
   "Track status of CRiSP emulation mode.
 A value of nil means CRiSP mode is not enabled.  A value of t

=== modified file 'lisp/emulation/keypad.el'
--- lisp/emulation/keypad.el	2010-01-13 08:35:10 +0000
+++ lisp/emulation/keypad.el	2010-08-29 09:37:07 +0000
@@ -97,7 +97,7 @@
 
 ;;; Customization
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom keypad-setup nil
   "Specifies the keypad setup for unshifted keypad keys when NumLock is off.
 When selecting the plain numeric keypad setup, the character returned by the
@@ -120,7 +120,7 @@
   :require 'keypad
   :group 'keyboard)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom keypad-numlock-setup nil
   "Specifies the keypad setup for unshifted keypad keys when NumLock is on.
 When selecting the plain numeric keypad setup, the character returned by the
@@ -143,7 +143,7 @@
   :require 'keypad
   :group 'keyboard)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom keypad-shifted-setup nil
   "Specifies the keypad setup for shifted keypad keys when NumLock is off.
 When selecting the plain numeric keypad setup, the character returned by the
@@ -166,7 +166,7 @@
   :require 'keypad
   :group 'keyboard)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom keypad-numlock-shifted-setup nil
   "Specifies the keypad setup for shifted keypad keys when NumLock is off.
 When selecting the plain numeric keypad setup, the character returned by the

=== modified file 'lisp/find-dired.el'
--- lisp/find-dired.el	2010-03-28 19:31:27 +0000
+++ lisp/find-dired.el	2010-08-29 09:37:07 +0000
@@ -36,7 +36,7 @@
 
 ;; find's -ls corresponds to these switches.
 ;; Note -b, at least GNU find quotes spaces etc. in filenames
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom find-ls-option
   (if (eq system-type 'berkeley-unix) (purecopy '("-ls" . "-gilsb"))
     (purecopy '("-exec ls -ld {} \\;" . "-ld")))
@@ -48,7 +48,7 @@
 	       (string :tag "Ls Switches"))
   :group 'find-dired)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom find-ls-subdir-switches (purecopy "-al")
   "`ls' switches for inserting subdirectories in `*Find*' buffers.
 This should contain the \"-l\" switch.
@@ -58,7 +58,7 @@
   :group 'find-dired
   :version "22.1")
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom find-grep-options
   (purecopy (if (or (eq system-type 'berkeley-unix)
 	  (string-match "solaris2" system-configuration)

=== modified file 'lisp/help-at-pt.el'
--- lisp/help-at-pt.el	2010-01-13 08:35:10 +0000
+++ lisp/help-at-pt.el	2010-08-29 09:37:07 +0000
@@ -144,7 +144,7 @@
 	  (run-with-idle-timer
 	   help-at-pt-timer-delay t #'help-at-pt-maybe-display))))
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom help-at-pt-display-when-idle 'never
   "Automatically show local help on point-over.
 If the value is t, the string obtained from any `kbd-help' or

=== modified file 'lisp/help-macro.el'
--- lisp/help-macro.el	2010-01-13 08:35:10 +0000
+++ lisp/help-macro.el	2010-08-29 09:37:07 +0000
@@ -69,7 +69,7 @@
 
 (require 'backquote)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom three-step-help nil
   "Non-nil means give more info about Help command in three steps.
 The three steps are simple prompt, prompt with all options, and

=== modified file 'lisp/hippie-exp.el'
--- lisp/hippie-exp.el	2010-01-13 08:35:10 +0000
+++ lisp/hippie-exp.el	2010-08-29 09:37:07 +0000
@@ -200,7 +200,7 @@
 
 (defvar he-search-window ())
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom hippie-expand-try-functions-list
   '(try-complete-file-name-partially
     try-complete-file-name
@@ -218,31 +218,31 @@
   :type '(repeat function)
   :group 'hippie-expand)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom hippie-expand-verbose t
   "Non-nil makes `hippie-expand' output which function it is trying."
   :type 'boolean
   :group 'hippie-expand)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom hippie-expand-dabbrev-skip-space nil
   "Non-nil means tolerate trailing spaces in the abbreviation to expand."
   :group 'hippie-expand
   :type 'boolean)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom hippie-expand-dabbrev-as-symbol t
   "Non-nil means expand as symbols, i.e. syntax `_' is considered a letter."
   :group 'hippie-expand
   :type 'boolean)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom hippie-expand-no-restriction t
   "Non-nil means that narrowed buffers are widened during search."
   :group 'hippie-expand
   :type 'boolean)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom hippie-expand-max-buffers ()
   "The maximum number of buffers (apart from the current) searched.
 If nil, all buffers are searched."
@@ -250,7 +250,7 @@
 		 integer)
   :group 'hippie-expand)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom hippie-expand-ignore-buffers (list (purecopy "^ \\*.*\\*$") 'dired-mode)
   "A list specifying which buffers not to search (if not current).
 Can contain both regexps matching buffer names (as strings) and major modes
@@ -258,7 +258,7 @@
   :type '(repeat (choice regexp (symbol :tag "Major Mode")))
   :group 'hippie-expand)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom hippie-expand-only-buffers ()
   "A list specifying the only buffers to search (in addition to current).
 Can contain both regexps matching buffer names (as strings) and major modes

=== modified file 'lisp/ido.el'
--- lisp/ido.el	2010-08-23 10:21:01 +0000
+++ lisp/ido.el	2010-08-29 09:37:07 +0000
@@ -339,7 +339,7 @@
   :link '(emacs-commentary-link :tag "Commentary" "ido.el")
   :link '(emacs-library-link :tag "Lisp File" "ido.el"))
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom ido-mode nil
   "Determines for which functional group \(buffer and files) ido behavior
 should be enabled.  The following values are possible:

=== modified file 'lisp/image-file.el'
--- lisp/image-file.el	2010-01-13 08:35:10 +0000
+++ lisp/image-file.el	2010-08-29 09:37:07 +0000
@@ -35,7 +35,7 @@
 (require 'image)
 
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom image-file-name-extensions
   (purecopy '("png" "jpeg" "jpg" "gif" "tiff" "tif" "xbm" "xpm" "pbm" "pgm" "ppm" "pnm" "svg"))
   "A list of image-file filename extensions.
@@ -55,7 +55,7 @@
   :initialize 'custom-initialize-default
   :group 'image)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom image-file-name-regexps nil
   "List of regexps matching image-file filenames.
 Filenames matching one of these regexps are considered image files,

=== modified file 'lisp/imenu.el'
--- lisp/imenu.el	2010-01-13 08:35:10 +0000
+++ lisp/imenu.el	2010-08-29 09:37:07 +0000
@@ -135,7 +135,7 @@
   :type 'hook
   :group 'imenu)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom imenu-sort-function nil
   "The function to use for sorting the index mouse-menu.
 

=== modified file 'lisp/informat.el'
--- lisp/informat.el	2010-01-13 08:35:10 +0000
+++ lisp/informat.el	2010-08-29 09:37:07 +0000
@@ -152,7 +152,7 @@
        "Tagifying %s done"  (file-name-nondirectory (buffer-file-name)))))
 
 \f
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom Info-split-threshold 262144
   "The number of characters by which `Info-split' splits an info file."
   :type 'integer

=== modified file 'lisp/international/latexenc.el'
--- lisp/international/latexenc.el	2010-01-13 08:35:10 +0000
+++ lisp/international/latexenc.el	2010-08-29 09:37:07 +0000
@@ -49,7 +49,7 @@
 
 ;;; Code:
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom latex-inputenc-coding-alist
   (purecopy
   '(("ansinew" . windows-1252) ; MS Windows ANSI encoding, extension of Latin-1

=== modified file 'lisp/international/latin1-disp.el'
--- lisp/international/latin1-disp.el	2010-01-13 08:35:10 +0000
+++ lisp/international/latin1-disp.el	2010-08-29 09:37:07 +0000
@@ -69,7 +69,7 @@
   :group 'latin1-display
   :type 'string)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom latin1-display nil
   "Set up Latin-1/ASCII display for ISO8859 character sets.
 This is done for each character set in the list `latin1-display-sets',
@@ -739,7 +739,7 @@
 
   (sit-for 0))
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom latin1-display-ucs-per-lynx nil
   "Set up Latin-1/ASCII display for Unicode characters.
 This uses the transliterations of the Lynx browser.  The display isn't

=== modified file 'lisp/linum.el'
--- lisp/linum.el	2010-01-13 08:35:10 +0000
+++ lisp/linum.el	2010-08-29 09:37:07 +0000
@@ -43,7 +43,7 @@
   "Show line numbers in the left margin."
   :group 'convenience)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom linum-format 'dynamic
   "Format used to display line numbers.
 Either a format string like \"%7d\", `dynamic' to adapt the width

=== modified file 'lisp/locate.el'
--- lisp/locate.el	2010-05-20 22:55:11 +0000
+++ lisp/locate.el	2010-08-29 09:37:07 +0000
@@ -183,7 +183,7 @@
   :type '(choice (const :tag "None" nil) face)
   :group 'locate)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom locate-ls-subdir-switches (purecopy "-al")
   "`ls' switches for inserting subdirectories in `*Locate*' buffers.
 This should contain the \"-l\" switch, but not the \"-F\" or \"-b\" switches."

=== modified file 'lisp/lpr.el'
--- lisp/lpr.el	2010-05-25 02:11:08 +0000
+++ lisp/lpr.el	2010-08-29 09:37:07 +0000
@@ -43,7 +43,7 @@
   :group 'wp)
 
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom printer-name
   (and (eq system-type 'ms-dos) "PRN")
   "The name of a local printer to which data is sent for printing.
@@ -66,7 +66,7 @@
 		 (file :tag "Name"))
   :group 'lpr)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom lpr-switches nil
   "List of strings to pass as extra options for the printer program.
 It is recommended to set `printer-name' instead of including an explicit
@@ -95,7 +95,7 @@
 		 (string :tag "Printer Switch"))
   :group 'lpr)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom lpr-command
  (purecopy
   (cond

=== modified file 'lisp/ls-lisp.el'
--- lisp/ls-lisp.el	2010-05-29 07:55:40 +0000
+++ lisp/ls-lisp.el	2010-08-29 09:37:07 +0000
@@ -137,7 +137,7 @@
   :group 'ls-lisp)
 
 ;;; Autoloaded because it is let-bound in `recover-session', `mail-recover-1'.
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom ls-lisp-support-shell-wildcards t
   "Non-nil means ls-lisp treats file patterns as shell wildcards.
 Otherwise they are treated as Emacs regexps (for backward compatibility)."

=== modified file 'lisp/mail/mail-hist.el'
--- lisp/mail/mail-hist.el	2010-01-13 08:35:10 +0000
+++ lisp/mail/mail-hist.el	2010-08-29 09:37:07 +0000
@@ -83,7 +83,7 @@
   :type 'integer
   :group 'mail-hist)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom mail-hist-keep-history t
   "*Non-nil means keep a history for headers and text of outgoing mail."
   :type 'boolean

=== modified file 'lisp/mail/mail-utils.el'
--- lisp/mail/mail-utils.el	2010-02-04 05:05:37 +0000
+++ lisp/mail/mail-utils.el	2010-08-29 09:37:07 +0000
@@ -32,7 +32,7 @@
 ;;; been initialized.
 (require 'lisp-mode)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom mail-use-rfc822 nil
   "If non-nil, use a full, hairy RFC822 parser on mail addresses.
 Otherwise, (the default) use a smaller, somewhat faster, and

=== modified file 'lisp/mail/mailalias.el'
--- lisp/mail/mailalias.el	2010-01-13 08:35:10 +0000
+++ lisp/mail/mailalias.el	2010-08-29 09:37:07 +0000
@@ -74,7 +74,7 @@
   :group 'mailalias)
 (put 'mail-complete-alist 'risky-local-variable t)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom mail-complete-style 'angles
   "Specifies how \\[mail-complete] formats the full name when it completes.
 If `nil', they contain just the return address like:

=== modified file 'lisp/mail/rmail.el'
--- lisp/mail/rmail.el	2010-08-22 20:02:16 +0000
+++ lisp/mail/rmail.el	2010-08-29 09:37:07 +0000
@@ -264,7 +264,7 @@
 ;; If so, this can be moved there.
 (rmail-movemail-variant-p)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom rmail-user-mail-address-regexp nil
   "Regexp matching user mail addresses.
 If non-nil, this variable is used to identify the correspondent
@@ -282,7 +282,7 @@
   :group 'rmail-retrieve
   :version "21.1")
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom rmail-dont-reply-to-names nil
   "A regexp specifying addresses to prune from a reply message.
 If this is nil, it is set the first time you compose a reply, to
@@ -304,7 +304,7 @@
 used for large mailing lists to broadcast announcements.")
 ;; Is it really useful to set this site-wide?
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom rmail-ignored-headers
   (purecopy
   (concat "^via:\\|^mail-from:\\|^origin:\\|^references:\\|^sender:"
@@ -350,7 +350,7 @@
   :type '(choice (const nil) (regexp))
   :group 'rmail-headers)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom rmail-displayed-headers nil
   "Regexp to match Header fields that Rmail should display.
 If nil, display all header fields except those matched by
@@ -358,14 +358,14 @@
   :type '(choice regexp (const :tag "All"))
   :group 'rmail-headers)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom rmail-retry-ignored-headers (purecopy "^x-authentication-warning:\\|^x-detected-operating-system:\\|^x-spam[-a-z]*:\\|content-type:\\|content-transfer-encoding:\\|mime-version:")
   "Headers that should be stripped when retrying a failed message."
   :type '(choice regexp (const nil :tag "None"))
   :group 'rmail-headers
   :version "23.2")	   ; added x-detected-operating-system, x-spam
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom rmail-highlighted-headers (purecopy "^From:\\|^Subject:")
   "Regexp to match Header fields that Rmail should normally highlight.
 A value of nil means don't highlight.  Uses the face `rmail-highlight'."
@@ -406,7 +406,7 @@
   :type 'boolean
   :group 'rmail-files)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom rmail-primary-inbox-list nil
   "List of files that are inboxes for your primary mail file `rmail-file-name'.
 If this is nil, uses the environment variable MAIL.  If that is
@@ -430,12 +430,12 @@
   :type 'boolean
   :group 'rmail-reply)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom rmail-secondary-file-directory (purecopy "~/")
   "Directory for additional secondary Rmail files."
   :type 'directory
   :group 'rmail-files)
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom rmail-secondary-file-regexp (purecopy "\\.xmail$")
   "Regexp for which files are secondary Rmail files."
   :type 'regexp
@@ -459,7 +459,7 @@
 (defvar rmail-get-new-mail-hook nil
   "List of functions to call when Rmail has retrieved new mail.")
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom rmail-show-message-hook nil
   "List of functions to call when Rmail displays a message."
   :type 'hook

=== modified file 'lisp/mail/sendmail.el'
--- lisp/mail/sendmail.el	2010-03-28 03:52:17 +0000
+++ lisp/mail/sendmail.el	2010-08-29 09:37:07 +0000
@@ -57,7 +57,7 @@
   :group 'mail
   :type 'file)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom mail-from-style 'default
   "Specifies how \"From:\" fields look.
 
@@ -78,7 +78,7 @@
   :version "20.3"
   :group 'sendmail)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom mail-specify-envelope-from nil
   "If non-nil, specify the envelope-from address when sending mail.
 The value used to specify it is whatever is found in
@@ -105,7 +105,7 @@
 		 (const :tag "Use `user-mail-address'" nil))
   :group 'sendmail)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom mail-self-blind nil
   "Non-nil means insert BCC to self in messages to be sent.
 This is done when the message is initialized,
@@ -113,7 +113,7 @@
   :type 'boolean
   :group 'sendmail)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom mail-interactive t
   ;; We used to use a default of nil rather than t, but nowadays it is very
   ;; common for sendmail to be misconfigured, so one cannot rely on the
@@ -151,7 +151,7 @@
 	 'sendmail-send-it)))
 
 ;; Useful to set in site-init.el
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom send-mail-function
   (if (and window-system (memq system-type '(darwin windows-nt)))
       'mailclient-send-it
@@ -172,7 +172,7 @@
 
 ;;;###autoload(custom-initialize-delay 'send-mail-function nil)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom mail-header-separator (purecopy "--text follows this line--")
   "Line used to separate headers from text in messages being composed."
   :type 'string
@@ -187,7 +187,7 @@
 ;; and other things.  So I turned it off.  --rms.
 ;;(put 'mail-header-separator 'read-only t)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom mail-archive-file-name nil
   "Name of file to write all outgoing messages in, or nil for none.
 This is normally an mbox file, but for backwards compatibility may also
@@ -195,7 +195,7 @@
   :type '(choice file (const nil))
   :group 'sendmail)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom mail-default-reply-to nil
   "Address to insert as default Reply-to field of outgoing messages.
 If nil, it will be initialized from the REPLYTO environment variable
@@ -203,7 +203,7 @@
   :type '(choice (const nil) string)
   :group 'sendmail)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom mail-alias-file nil
   "If non-nil, the name of a file to use instead of `/usr/lib/aliases'.
 This file defines aliases to be expanded by the mailer; this is a different
@@ -212,7 +212,7 @@
   :type '(choice (const nil) file)
   :group 'sendmail)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom mail-personal-alias-file (purecopy "~/.mailrc")
   "If non-nil, the name of the user's personal mail alias file.
 This file typically should be in same format as the `.mailrc' file used by
@@ -221,7 +221,7 @@
   :type '(choice (const nil) file)
   :group 'sendmail)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom mail-setup-hook nil
   "Normal hook, run each time a new outgoing message is initialized."
   :type 'hook
@@ -240,14 +240,14 @@
 (defvar mail-alias-modtime nil
   "The modification time of your mail alias file when it was last examined.")
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom mail-yank-prefix "> "
   "Prefix insert on lines of yanked message being replied to.
 If this is nil, use indentation, as specified by `mail-indentation-spaces'."
   :type '(choice (const nil) string)
   :group 'sendmail)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom mail-indentation-spaces 3
   "Number of spaces to insert at the beginning of each cited line.
 Used by `mail-yank-original' via `mail-indent-citation'."
@@ -264,7 +264,7 @@
 This is a normal hook, misnamed for historical reasons.
 It is semi-obsolete and mail agents should no longer use it.")
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom mail-citation-hook nil
   "Hook for modifying a citation just inserted in the mail buffer.
 Each hook function can find the citation between (point) and (mark t),
@@ -283,7 +283,7 @@
 This enables the hook functions to see the whole message header
 regardless of what part of it (if any) is included in the cited text.")
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom mail-citation-prefix-regexp
   (purecopy "\\([ \t]*\\(\\w\\|[_.]\\)+>+\\|[ \t]*[]>|}]\\)+")
   "Regular expression to match a citation prefix plus whitespace.
@@ -393,7 +393,7 @@
 removed from alias expansions."
   nil)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom mail-signature t
   "Text inserted at end of mail buffer when a message is initialized.
 If t, it means to insert the contents of the file `mail-signature-file'.
@@ -409,13 +409,13 @@
   :group 'sendmail)
 (put 'mail-signature 'risky-local-variable t)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom mail-signature-file (purecopy "~/.signature")
   "File containing the text inserted at end of mail buffer."
   :type 'file
   :group 'sendmail)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom mail-default-directory (purecopy "~/")
   "Value of `default-directory' for Mail mode buffers.
 This directory is used for auto-save files of Mail mode buffers.
@@ -432,7 +432,7 @@
 (put 'mail-reply-action 'permanent-local t)
 (put 'mail-send-actions 'permanent-local t)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom mail-default-headers nil
   "A string containing header lines, to be inserted in outgoing messages.
 It can contain newlines, and should end in one.  It is inserted
@@ -441,7 +441,7 @@
   :group 'sendmail)
 
 ;; FIXME no need for autoload
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom mail-bury-selects-summary t
   "If non-nil, try to show Rmail summary buffer after returning from mail.
 The functions \\[mail-send-on-exit] or \\[mail-dont-send] select
@@ -451,7 +451,7 @@
   :group 'sendmail)
 
 ;; FIXME no need for autoload
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom mail-send-nonascii 'mime
   "Specify whether to allow sending non-ASCII characters in mail.
 If t, that means do allow it.  nil means don't allow it.
@@ -824,7 +824,7 @@
   :options '(flyspell-mode-off)
   :group 'sendmail)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom mail-mailing-lists nil
 "List of mailing list addresses the user is subscribed to.
 The variable is used to trigger insertion of the \"Mail-Followup-To\"

=== modified file 'lisp/net/browse-url.el'
--- lisp/net/browse-url.el	2010-08-17 08:01:10 +0000
+++ lisp/net/browse-url.el	2010-08-29 09:37:07 +0000
@@ -218,7 +218,7 @@
   :group 'external
   :group 'comm)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom browse-url-browser-function
   (cond
    ((memq system-type '(windows-nt ms-dos cygwin))

=== modified file 'lisp/net/tramp.el'
--- lisp/net/tramp.el	2010-08-26 07:33:16 +0000
+++ lisp/net/tramp.el	2010-08-29 09:37:07 +0000
@@ -180,7 +180,7 @@
   :version "22.1")
 
 ;; Maybe we need once a real Tramp mode, with key bindings etc.
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom tramp-mode t
   "*Whether Tramp is enabled.
 If it is set to nil, all remote file names are used literally."
@@ -1256,7 +1256,7 @@
 ;; the other places.
 
 ;; Currently, we have the choice between 'ftp, 'sep, and 'url.
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom tramp-syntax
   (if (featurep 'xemacs) 'sep 'ftp)
   "Tramp filename syntax to be used.

=== modified file 'lisp/newcomment.el'
--- lisp/newcomment.el	2010-08-17 19:38:30 +0000
+++ lisp/newcomment.el	2010-08-29 09:37:07 +0000
@@ -92,7 +92,7 @@
   :type '(choice (const nil) integer)
   :group 'comment)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom comment-column 32
   "Column to indent right-margin comments to.
 Each mode may establish a different default value for this variable; you
@@ -206,7 +206,7 @@
 If INDENT is `multi-char', that means indent multi-character
   comment starters, but not one-character comment starters.")
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom comment-style 'indent
   "Style to be used for `comment-region'.
 See `comment-styles' for a list of available styles."
@@ -217,7 +217,7 @@
   :version "23.1"
   :group 'comment)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom comment-padding (purecopy " ")
   "Padding string that `comment-region' puts between comment chars and text.
 Can also be an integer which will be automatically turned into a string
@@ -228,7 +228,7 @@
   :type '(choice string integer (const nil))
   :group 'comment)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom comment-multi-line nil
   "Non-nil means `comment-indent-new-line' continues comments.
 That is, it inserts no new terminator or starter.
@@ -1191,7 +1191,7 @@
               (insert (comment-padleft comment-end add)))
             (indent-according-to-mode)))))))
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom comment-auto-fill-only-comments nil
   "Non-nil means to only auto-fill inside comments.
 This has no effect in modes that do not define a comment syntax."

=== modified file 'lisp/password-cache.el'
--- lisp/password-cache.el	2010-05-19 12:52:27 +0000
+++ lisp/password-cache.el	2010-08-29 09:37:07 +0000
@@ -53,13 +53,13 @@
 
 ;; Options are autoloaded since they are used by eg mml-sec.el.
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom password-cache t
   "Whether to cache passwords."
   :group 'password
   :type 'boolean)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom password-cache-expiry 16
   "How many seconds passwords are cached, or nil to disable expiring.
 Whether passwords are cached at all is controlled by `password-cache'."

=== modified file 'lisp/progmodes/compile.el'
--- lisp/progmodes/compile.el	2010-08-15 00:04:53 +0000
+++ lisp/progmodes/compile.el	2010-08-29 09:37:07 +0000
@@ -86,13 +86,13 @@
   :group 'processes)
 
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom compilation-mode-hook nil
   "List of hook functions run by `compilation-mode' (see `run-mode-hooks')."
   :type 'hook
   :group 'compilation)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom compilation-start-hook nil
   "List of hook functions run by `compilation-start' on the compilation process.
 \(See `run-hook-with-args').
@@ -103,7 +103,7 @@
   :type 'hook
   :group 'compilation)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom compilation-window-height nil
   "Number of lines in a compilation window.  If nil, use Emacs default."
   :type '(choice (const :tag "Default" nil)
@@ -587,7 +587,7 @@
   :type 'boolean
   :group 'compilation)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom compilation-ask-about-save t
   "Non-nil means \\[compile] asks which buffers to save before compiling.
 Otherwise, it saves all modified buffers without asking."
@@ -609,7 +609,7 @@
   :group 'compilation
   :version "24.1")
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom compilation-search-path '(nil)
   "List of directories to search for source files named in error messages.
 Elements should be directory names, not file names of directories.
@@ -618,7 +618,7 @@
 			 (string :tag "Directory")))
   :group 'compilation)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom compile-command (purecopy "make -k ")
   "Last shell command used to do a compilation; default for next compilation.
 
@@ -636,7 +636,7 @@
   :group 'compilation)
 ;;;###autoload(put 'compile-command 'safe-local-variable (lambda (a) (and (stringp a) (or (not (boundp 'compilation-read-command)) compilation-read-command))))
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom compilation-disable-input nil
   "If non-nil, send end-of-file as compilation process input.
 This only affects platforms that support asynchronous processes (see

=== modified file 'lisp/progmodes/etags.el'
--- lisp/progmodes/etags.el	2010-08-14 23:01:42 +0000
+++ lisp/progmodes/etags.el	2010-08-29 09:37:07 +0000
@@ -45,7 +45,7 @@
 (defgroup etags nil "Tags tables."
   :group 'tools)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom tags-case-fold-search 'default
   "*Whether tags operations should be case-sensitive.
 A value of t means case-insensitive, a value of nil means case-sensitive.
@@ -67,7 +67,7 @@
   :group 'etags
   :type '(repeat file))
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom tags-compression-info-list (purecopy '("" ".Z" ".bz2" ".gz" ".tgz"))
   "*List of extensions tried by etags when jka-compr is used.
 An empty string means search the non-compressed file.
@@ -87,7 +87,7 @@
 ;; jka-compr-compression-info-list.
 
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom tags-add-tables 'ask-user
   "*Control whether to add a new tags table to the current list.
 t means do; nil means don't (always start a new list).
@@ -103,6 +103,15 @@
   :group 'etags
   :type 'boolean)
 
+(defcustom tags-major-mode-sensitive 'default
+  "*Control whether major mode determines allowed file extensions during 
+tags search."
+  :group 'etags
+  :type '(choice (const :tag "Major mode file types only" t)
+		 (const :tag "All files " nil)
+		 (other :tag "Use default" default))
+  :version "21.1")
+
 (defvar tags-table-computed-list nil
   "List of tags tables to search, computed from `tags-table-list'.
 This includes tables implicitly included by other tables.  The list is not
@@ -128,7 +137,7 @@
   "List of sets of tags table which have been used together in the past.
 Each element is a list of strings which are file names.")
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom find-tag-hook nil
   "*Hook to be run by \\[find-tag] after finding a tag.  See `run-hooks'.
 The value in the buffer in which \\[find-tag] is done is used,
@@ -136,7 +145,7 @@
   :group 'etags
   :type 'hook)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom find-tag-default-function nil
   "*A function of no arguments used by \\[find-tag] to pick a default tag.
 If nil, and the symbol that is the value of `major-mode'
@@ -879,7 +888,8 @@
   ;; Save the current buffer's value of `find-tag-hook' before
   ;; selecting the tags table buffer.  For the same reason, save value
   ;; of `tags-file-name' in case it has a buffer-local value.
-  (let ((local-find-tag-hook find-tag-hook))
+  (let ((local-find-tag-hook find-tag-hook)
+	(current-major-mode major-mode))
     (if (eq '- next-p)
 	;; Pop back to a previous location.
 	(if (ring-empty-p tags-location-ring)
@@ -919,7 +929,7 @@
                  find-tag-regexp-next-line-after-failure-p
                find-tag-next-line-after-failure-p)
              (if regexp-p "matching" "containing")
-             (or (not next-p) (not last-tag)))
+             (or (not next-p) (not last-tag)) current-major-mode)
 	  (set-marker marker (point))
 	  (run-hooks 'local-find-tag-hook)
 	  (ring-insert tags-location-ring marker)
@@ -1061,6 +1071,26 @@
     (goto-char (marker-position marker))
     (set-marker marker nil nil)))
 \f
+
+(defun tags-file-name-qualified-p (file-name current-major-mode)
+  "Is file name qualified? Return always t if `tags-major-mode-sensitive' 
+is nil. Otherwise return if the file matches major-mode file name regexp."
+  (if (or 
+       (null tags-major-mode-sensitive) 
+       (eq tags-major-mode-sensitive 'default))
+      t
+    (let ((al auto-mode-alist)
+	  (found nil))
+      (while (and (not found) al)
+	(let* ((x (car al))
+	       (file-name-regex (car x))
+	       (major-mode-sym (cdr x)))
+	(setq al (cdr al))
+	(setq found (and
+		     (eq current-major-mode major-mode-sym)
+		     (string-match file-name-regex file-name)))))
+      found)))
+
 (defvar tag-lines-already-matched nil
   "Matches remembered between calls.") ; Doc string: calls to what?
 
@@ -1069,7 +1099,8 @@
 			  order
 			  next-line-after-failure-p
 			  matching
-			  first-search)
+			  first-search
+			  current-major-mode)
   "Internal tag-finding function.
 PATTERN is a string to pass to arg SEARCH-FORWARD-FUNC, and to any
 member of the function list ORDER.  If ORDER is nil, use saved state
@@ -1129,7 +1160,8 @@
 	  (while order
 	    (while (funcall search-forward-func pattern nil t)
 	      ;; Naive match found.  Qualify the match.
-	      (and (funcall (car order) pattern)
+	      (and (tags-file-name-qualified-p (file-of-tag) current-major-mode)
+		   (funcall (car order) pattern)
 		   ;; Make sure it is not a previous qualified match.
 		   (not (member (set-marker match-marker (save-excursion
 							   (beginning-of-line)

=== modified file 'lisp/progmodes/gdb-mi.el'
--- lisp/progmodes/gdb-mi.el	2010-07-29 13:13:11 +0000
+++ lisp/progmodes/gdb-mi.el	2010-08-29 09:37:07 +0000
@@ -456,7 +456,7 @@
 Most recent commands are listed first.  This list stores only the last
 `gdb-debug-log-max' values.  This variable is used to debug GDB-MI.")
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom gdb-enable-debug nil
   "Non-nil means record the process input and output in `gdb-debug-log'."
   :type 'boolean

=== modified file 'lisp/progmodes/grep.el'
--- lisp/progmodes/grep.el	2010-05-21 20:43:04 +0000
+++ lisp/progmodes/grep.el	2010-08-29 09:37:07 +0000
@@ -60,7 +60,7 @@
       (setcar (cdr (assq symbol defaults)) value)))
   (set-default symbol value))
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom grep-window-height nil
   "*Number of lines in a grep window.  If nil, use `compilation-window-height'."
   :type '(choice (const :tag "Default" nil)
@@ -112,7 +112,7 @@
   :version "22.1"
   :group 'grep)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom grep-command nil
   "The default grep command for \\[grep].
 If the grep program used supports an option to always include file names
@@ -160,7 +160,7 @@
   :set 'grep-apply-setting
   :group 'grep)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom grep-find-command nil
   "The default find command for \\[grep-find].
 In interactive usage, the actual value of this variable is set up
@@ -235,7 +235,7 @@
   :version "22.1"
   :group 'grep)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom grep-setup-hook nil
   "List of hook functions run by `grep-process-setup' (see `run-hooks')."
   :type 'hook

=== modified file 'lisp/progmodes/inf-lisp.el'
--- lisp/progmodes/inf-lisp.el	2010-01-13 08:35:10 +0000
+++ lisp/progmodes/inf-lisp.el	2010-08-29 09:37:07 +0000
@@ -70,7 +70,7 @@
   :group 'lisp
   :version "22.1")
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom inferior-lisp-filter-regexp
   (purecopy "\\`\\s *\\(:\\(\\w\\|\\s_\\)\\)?\\s *\\'")
   "*What not to save on inferior Lisp's input history.
@@ -140,13 +140,13 @@
   (define-key inferior-lisp-mode-map "\C-cv"
     'lisp-show-variable-documentation))
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom inferior-lisp-program (purecopy "lisp")
   "*Program name for invoking an inferior Lisp in Inferior Lisp mode."
   :type 'string
   :group 'inferior-lisp)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom inferior-lisp-load-command (purecopy "(load \"%s\")\n")
   "*Format-string for building a Lisp expression to load a file.
 This format string should use `%s' to substitute a file name
@@ -158,7 +158,7 @@
   :type 'string
   :group 'inferior-lisp)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom inferior-lisp-prompt (purecopy "^[^> \n]*>+:? *")
   "Regexp to recognize prompts in the Inferior Lisp mode.
 Defaults to \"^[^> \\n]*>+:? *\", which works pretty good for Lucid, kcl,

=== modified file 'lisp/progmodes/sql.el'
--- lisp/progmodes/sql.el	2010-08-10 23:04:32 +0000
+++ lisp/progmodes/sql.el	2010-08-29 09:37:07 +0000
@@ -551,7 +551,7 @@
 (defvar sql-indirect-features
   '(:font-lock :sqli-program :sqli-options :sqli-login))
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom sql-connection-alist nil
   "An alist of connection parameters for interacting with a SQL
   product.
@@ -600,7 +600,7 @@
   :version "24.1"
   :group 'SQL)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom sql-product 'ansi
   "Select the SQL database product used so that buffers can be
 highlighted properly when you open them."

=== modified file 'lisp/ps-bdf.el'
--- lisp/ps-bdf.el	2010-01-13 08:35:10 +0000
+++ lisp/ps-bdf.el	2010-08-29 09:37:07 +0000
@@ -41,7 +41,7 @@
 (eval-and-compile
   (require 'ps-mule))
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom bdf-directory-list
   (if (memq system-type '(ms-dos windows-nt))
       (list (expand-file-name "fonts/bdf" installation-directory))

=== modified file 'lisp/ps-mule.el'
--- lisp/ps-mule.el	2010-01-13 08:35:10 +0000
+++ lisp/ps-mule.el	2010-08-29 09:37:07 +0000
@@ -92,7 +92,7 @@
   (require 'ps-print))
 
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom ps-multibyte-buffer nil
   "Specifies the multi-byte buffer handling.
 

=== modified file 'lisp/ps-print.el'
--- lisp/ps-print.el	2010-03-12 17:47:22 +0000
+++ lisp/ps-print.el	2010-08-29 09:37:07 +0000
@@ -1830,7 +1830,7 @@
 ;; B4         10.125 inch x 14.33  inch
 ;; B5          7.16  inch x 10.125 inch
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom ps-page-dimensions-database
  (purecopy
   (list (list 'a4    (/ (* 72 21.0) 2.54)  (/ (* 72 29.7) 2.54) "A4")
@@ -1880,7 +1880,7 @@
   :version "20"
   :group 'ps-print-page)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom ps-paper-type 'letter
   "Specify the size of paper to format for.
 Should be one of the paper types defined in `ps-page-dimensions-database', for
@@ -2965,7 +2965,7 @@
 ;; Printing color requires x-color-values.
 ;; XEmacs change: Need autoload for the "Options->Printing->Color Printing"
 ;;                widget to work.
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom ps-print-color-p
   (or (fboundp 'x-color-values)		; Emacs
       (fboundp 'color-instance-rgb-components))

=== modified file 'lisp/shell.el'
--- lisp/shell.el	2010-06-11 13:28:41 +0000
+++ lisp/shell.el	2010-08-29 09:37:07 +0000
@@ -114,7 +114,7 @@
   "Faces in shell buffers."
   :group 'shell)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom shell-dumb-shell-regexp (purecopy "cmd\\(proxy\\)?\\.exe")
   "Regexp to match shells that don't save their command history, and
 don't handle the backslash as a quote character.  For shells that

=== modified file 'lisp/textmodes/ispell.el'
--- lisp/textmodes/ispell.el	2010-07-07 10:30:57 +0000
+++ lisp/textmodes/ispell.el	2010-08-29 09:37:07 +0000
@@ -481,7 +481,7 @@
   :type 'boolean
   :group 'ispell)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom ispell-personal-dictionary nil
   "*File name of your personal spelling dictionary, or nil.
 If nil, the default personal dictionary, (\"~/.ispell_DICTNAME\" for ispell or

=== modified file 'lisp/textmodes/table.el'
--- lisp/textmodes/table.el	2010-05-25 02:11:08 +0000
+++ lisp/textmodes/table.el	2010-08-29 09:37:07 +0000
@@ -796,7 +796,7 @@
   :type 'integer
   :group 'table)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom table-cell-map-hook nil
   "*Normal hooks run when finishing construction of `table-cell-map'.
 User can modify `table-cell-map' by adding custom functions here."
@@ -820,19 +820,19 @@
   :type 'boolean
   :group 'table)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom table-load-hook nil
   "*List of functions to be called after the table is first loaded."
   :type 'hook
   :group 'table-hooks)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom table-point-entered-cell-hook nil
   "*List of functions to be called after point entered a table cell."
   :type 'hook
   :group 'table-hooks)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom table-point-left-cell-hook nil
   "*List of functions to be called after point left a table cell."
   :type 'hook

=== modified file 'lisp/textmodes/tex-mode.el'
--- lisp/textmodes/tex-mode.el	2010-05-13 21:52:20 +0000
+++ lisp/textmodes/tex-mode.el	2010-08-29 09:37:07 +0000
@@ -56,14 +56,14 @@
   :prefix "tex-"
   :group 'tex)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom tex-shell-file-name nil
   "*If non-nil, the shell file name to run in the subshell used to run TeX."
   :type '(choice (const :tag "None" nil)
 		 string)
   :group 'tex-run)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom tex-directory (purecopy ".")
   "*Directory in which temporary files are written.
 You can make this `/tmp' if your TEXINPUTS has no relative directories in it
@@ -72,7 +72,7 @@
   :type 'directory
   :group 'tex-file)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom tex-first-line-header-regexp nil
   "Regexp for matching a first line which `tex-region' should include.
 If this is non-nil, it should be a regular expression string;
@@ -82,7 +82,7 @@
                  regexp)
   :group 'tex-file)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom tex-main-file nil
   "*The main TeX source file which includes this buffer's file.
 The command `tex-file' runs TeX on the file specified by `tex-main-file'
@@ -91,13 +91,13 @@
                  file)
   :group 'tex-file)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom tex-offer-save t
   "*If non-nil, ask about saving modified buffers before \\[tex-file] is run."
   :type 'boolean
   :group 'tex-file)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom tex-run-command (purecopy "tex")
   "*Command used to run TeX subjob.
 TeX Mode sets `tex-command' to this string.
@@ -105,7 +105,7 @@
   :type 'string
   :group 'tex-run)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom latex-run-command (purecopy "latex")
   "*Command used to run LaTeX subjob.
 LaTeX Mode sets `tex-command' to this string.
@@ -113,7 +113,7 @@
   :type 'string
   :group 'tex-run)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom slitex-run-command (purecopy "slitex")
   "*Command used to run SliTeX subjob.
 SliTeX Mode sets `tex-command' to this string.
@@ -121,7 +121,7 @@
   :type 'string
   :group 'tex-run)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom tex-start-options (purecopy "")
   "*TeX options to use when starting TeX.
 These immediately precede the commands in `tex-start-commands'
@@ -131,7 +131,7 @@
   :group 'tex-run
   :version "22.1")
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom tex-start-commands (purecopy "\\nonstopmode\\input")
   "*TeX commands to use when starting TeX.
 They are shell-quoted and precede the input file name, with a separating space.
@@ -155,14 +155,14 @@
     "verbatim"		"verbatim*"	"verse"		"math")
   "Standard LaTeX block names.")
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom latex-block-names nil
   "*User defined LaTeX block names.
 Combined with `latex-standard-block-names' for minibuffer completion."
   :type '(repeat string)
   :group 'tex-run)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom tex-bibtex-command (purecopy "bibtex")
   "*Command used by `tex-bibtex-file' to gather bibliographic data.
 If this string contains an asterisk (`*'), that is replaced by the file name;
@@ -170,7 +170,7 @@
   :type 'string
   :group 'tex-run)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom tex-dvi-print-command (purecopy "lpr -d")
   "*Command used by \\[tex-print] to print a .dvi file.
 If this string contains an asterisk (`*'), that is replaced by the file name;
@@ -178,7 +178,7 @@
   :type 'string
   :group 'tex-view)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom tex-alt-dvi-print-command (purecopy "lpr -d")
   "*Command used by \\[tex-print] with a prefix arg to print a .dvi file.
 If this string contains an asterisk (`*'), that is replaced by the file name;
@@ -197,7 +197,7 @@
 		 (sexp :tag "Expression"))
   :group 'tex-view)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom tex-dvi-view-command
   `(cond
     ((eq window-system 'x) ,(purecopy "xdvi"))
@@ -212,14 +212,14 @@
   :type '(choice (const nil) string sexp)
   :group 'tex-view)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom tex-show-queue-command (purecopy "lpq")
   "*Command used by \\[tex-show-print-queue] to show the print queue.
 Should show the queue(s) that \\[tex-print] puts jobs on."
   :type 'string
   :group 'tex-view)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom tex-default-mode 'latex-mode
   "*Mode to enter for a new file that might be either TeX or LaTeX.
 This variable is used when it can't be determined whether the file
@@ -228,14 +228,14 @@
   :type 'function
   :group 'tex)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom tex-open-quote (purecopy "``")
   "*String inserted by typing \\[tex-insert-quote] to open a quotation."
   :type 'string
   :options '("``" "\"<" "\"`" "<<" "«")
   :group 'tex)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom tex-close-quote (purecopy "''")
   "*String inserted by typing \\[tex-insert-quote] to close a quotation."
   :type 'string

=== modified file 'lisp/textmodes/texinfo.el'
--- lisp/textmodes/texinfo.el	2010-01-13 08:35:10 +0000
+++ lisp/textmodes/texinfo.el	2010-08-29 09:37:07 +0000
@@ -41,13 +41,13 @@
   :link '(custom-group-link :tag "Font Lock Faces group" font-lock-faces)
   :group 'docs)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom texinfo-open-quote (purecopy "``")
   "String inserted by typing \\[texinfo-insert-quote] to open a quotation."
   :type 'string
   :group 'texinfo)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom texinfo-close-quote (purecopy "''")
   "String inserted by typing \\[texinfo-insert-quote] to close a quotation."
   :type 'string

=== modified file 'lisp/time.el'
--- lisp/time.el	2010-07-27 02:10:05 +0000
+++ lisp/time.el	2010-08-29 09:37:07 +0000
@@ -85,7 +85,7 @@
   :type 'number
   :group 'display-time)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom display-time-day-and-date nil "\
 Non-nil means \\[display-time] should display day and date as well as time."
   :type 'boolean

=== modified file 'lisp/type-break.el'
--- lisp/type-break.el	2010-05-03 02:29:46 +0000
+++ lisp/type-break.el	2010-08-29 09:37:07 +0000
@@ -71,7 +71,7 @@
   :prefix "type-break"
   :group 'keyboard)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom type-break-mode nil
   "Toggle typing break mode.
 See the docstring for the `type-break-mode' command for more information.
@@ -84,13 +84,13 @@
   :group 'type-break
   :require 'type-break)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom type-break-interval (* 60 60)
   "Number of seconds between scheduled typing breaks."
   :type 'integer
   :group 'type-break)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom type-break-good-rest-interval (/ type-break-interval 6)
   "Number of seconds of idle time considered to be an adequate typing rest.
 
@@ -103,7 +103,7 @@
   :type 'integer
   :group 'type-break)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom type-break-good-break-interval nil
   "Number of seconds considered to be an adequate explicit typing rest.
 
@@ -114,7 +114,7 @@
   :type 'integer
   :group 'type-break)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom type-break-keystroke-threshold
   ;; Assuming typing speed is 35wpm (on the average, do you really
   ;; type more than that in a minute?  I spend a lot of time reading mail

=== modified file 'lisp/url/url-util.el'
--- lisp/url/url-util.el	2010-05-19 15:23:53 +0000
+++ lisp/url/url-util.el	2010-08-29 09:37:07 +0000
@@ -41,7 +41,7 @@
 (modify-syntax-entry ?{ "(" url-parse-args-syntax-table)
 (modify-syntax-entry ?} ")" url-parse-args-syntax-table)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom url-debug nil
   "*What types of debug messages from the URL library to show.
 Debug messages are logged to the *URL-DEBUG* buffer.

=== modified file 'lisp/vc/add-log.el'
--- lisp/vc/add-log.el	2010-08-21 14:09:46 +0000
+++ lisp/vc/add-log.el	2010-08-29 09:37:07 +0000
@@ -62,7 +62,7 @@
   :group 'change-log)
 
 ;; Many modes set this variable, so avoid warnings.
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom add-log-current-defun-function nil
   "If non-nil, function to guess name of surrounding function.
 It is used by `add-log-current-defun' in preference to built-in rules.
@@ -70,7 +70,7 @@
   :type '(choice (const nil) function)
   :group 'change-log)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom add-log-full-name nil
   "Full name of user, for inclusion in ChangeLog daily headers.
 This defaults to the value returned by the function `user-full-name'."
@@ -78,7 +78,7 @@
 		 string)
   :group 'change-log)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom add-log-mailing-address nil
   "Email addresses of user, for inclusion in ChangeLog headers.
 This defaults to the value of `user-mail-address'.  In addition to

=== modified file 'lisp/vc/diff.el'
--- lisp/vc/diff.el	2010-06-11 19:09:57 +0000
+++ lisp/vc/diff.el	2010-08-29 09:37:07 +0000
@@ -35,13 +35,13 @@
   "Comparing files with `diff'."
   :group 'tools)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom diff-switches (purecopy "-c")
   "A string or list of strings specifying switches to be passed to diff."
   :type '(choice string (repeat string))
   :group 'diff)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom diff-command (purecopy "diff")
   "The command to use to run diff."
   :type 'string

=== modified file 'lisp/vc/pcvs.el'
--- lisp/vc/pcvs.el	2010-06-11 19:09:57 +0000
+++ lisp/vc/pcvs.el	2010-08-29 09:37:07 +0000
@@ -2332,14 +2332,14 @@
 ;; Hook to allow calling PCL-CVS by visiting the /CVS subdirectory
 ;;
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom cvs-dired-action 'cvs-quickdir
   "The action to be performed when opening a CVS directory.
 Sensible values are `cvs-examine', `cvs-status' and `cvs-quickdir'."
   :group 'pcl-cvs
   :type '(choice (const cvs-examine) (const cvs-status) (const cvs-quickdir)))
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom cvs-dired-use-hook '(4)
   "Whether or not opening a CVS directory should run PCL-CVS.
 A value of nil means never do it.

=== modified file 'lisp/vc/vc-rcs.el'
--- lisp/vc/vc-rcs.el	2010-06-11 18:51:00 +0000
+++ lisp/vc/vc-rcs.el	2010-08-29 09:37:07 +0000
@@ -89,7 +89,7 @@
   :type '(choice (const :tag "Work out" nil) (const yes) (const no))
   :group 'vc)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom vc-rcs-master-templates
   (purecopy '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s"))
   "Where to look for RCS master files.

=== modified file 'lisp/vc/vc-sccs.el'
--- lisp/vc/vc-sccs.el	2010-06-11 18:51:00 +0000
+++ lisp/vc/vc-sccs.el	2010-08-29 09:37:07 +0000
@@ -75,7 +75,7 @@
   :type '(repeat string)
   :group 'vc)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom vc-sccs-master-templates
   (purecopy '("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir))
   "Where to look for SCCS master files.

=== modified file 'lisp/vc/vc.el'
--- lisp/vc/vc.el	2010-07-16 15:42:15 +0000
+++ lisp/vc/vc.el	2010-08-29 09:37:07 +0000
@@ -740,7 +740,7 @@
   :group 'vc
   :version "22.1")
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom vc-checkout-hook nil
   "Normal hook (list of functions) run after checking out a file.
 See `run-hooks'."
@@ -748,7 +748,7 @@
   :group 'vc
   :version "21.1")
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom vc-checkin-hook nil
   "Normal hook (list of functions) run after commit or file checkin.
 See also `log-edit-done-hook'."
@@ -756,7 +756,7 @@
   :options '(log-edit-comment-to-change-log)
   :group 'vc)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom vc-before-checkin-hook nil
   "Normal hook (list of functions) run before a commit or a file checkin.
 See `run-hooks'."

=== modified file 'lisp/view.el'
--- lisp/view.el	2010-05-03 02:29:46 +0000
+++ lisp/view.el	2010-08-29 09:37:07 +0000
@@ -74,7 +74,7 @@
   :type 'boolean
   :group 'view)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom view-remove-frame-by-deleting t
   "Determine how View mode removes a frame no longer needed.
 If nil, make an icon of the frame.  If non-nil, delete the frame."

=== modified file 'lisp/winner.el'
--- lisp/winner.el	2010-01-13 08:35:10 +0000
+++ lisp/winner.el	2010-08-29 09:37:07 +0000
@@ -67,7 +67,7 @@
   "Restoring window configurations."
   :group 'windows)
 
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom winner-mode nil
   "Toggle Winner mode.
 Setting this variable directly does not take effect;

=== modified file 'lisp/woman.el'
--- lisp/woman.el	2010-08-22 20:02:16 +0000
+++ lisp/woman.el	2010-08-29 09:37:07 +0000
@@ -604,7 +604,7 @@
     (nreverse manpath)))
 
 ;; Autoload so set-locale-environment can operate on it.
-;;;###autoload
+;; `defcustom' should not be autoloaded ;;;###autoload
 (defcustom woman-locale nil
   "String specifying a manual page locale, or nil.
 If a manual page is available in the specified locale

# Begin bundle
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
MdKJSOBgP/xdyRThQkGEKQpg

Re: autoload cookies for defcustoms

[Glenn Morris]

Wojciech Meyer wrote:

> -;;;###autoload
> +;; `defcustom' should not be autoloaded ;;;###autoload
>  (defcustom holiday-general-holidays

The remaining calendar autoloaded defcustoms are generally autoloaded
for a reason, and I imagine the same is true in many other cases. Did
you just do a blanket replace, or did you check every case?

Re: autoload cookies for defcustoms

[Wojciech Meyer]

Glenn Morris <rgm@gnu.org> writes:

> Wojciech Meyer wrote:
>
>> -;;;###autoload
>> +;; `defcustom' should not be autoloaded ;;;###autoload
>>  (defcustom holiday-general-holidays
>
> The remaining calendar autoloaded defcustoms are generally autoloaded
> for a reason, and I imagine the same is true in many other cases. Did
> you just do a blanket replace, or did you check every case?

Did a blanket replace. (however in the example you showed me I see some
toplevel code evaluated). It is up to maintainers what to do with the
patch, it just shows `defcustoms' with `autoload'. I might refine it if
somebody comes up with rules to follow.

This approach was due to:

> > Just curious.  Is there a policy, for the Lisp code distributed with
> > Emacs, about using autoload cookies for defcustoms? If so, what is it?

> AFAIK the policy is: "don't do it".
> It all too often introduces all kinds of nasty problems.
> More to the point, I welcome patches that remove tham.


>         Stefan

Cheers;
Wojciech

Re: autoload cookies for defcustoms

[Stefan Monnier]

> Did a blanket replace. (however in the example you showed me I see some
> toplevel code evaluated). It is up to maintainers what to do with the
> patch, it just shows `defcustoms' with `autoload'. I might refine it if
> somebody comes up with rules to follow.

The reason we haven't removed tham is because there is no mechanical
rule to follow: it depends on whether the change is likely to bump into
code (in Elisp packages or in .emacs configs) that expects them to be
predefined :-(
The difficulty of removing them is the main reason why I hate them.


        Stefan

Re: autoload cookies for defcustoms

[Glenn Morris]

Wojciech Meyer wrote:

> toplevel code evaluated). It is up to maintainers what to do with the
> patch, it just shows `defcustoms' with `autoload'. I might refine it if
> somebody comes up with rules to follow.

You can't really come up with a rule. The problem is often historical.
People get used to using these variables in their .emacs without
loading the associated packages. Removing the autoloads breaks their
.emacs. And there's no compatible way to get from here to there (eg
you cannot mark an autoload obsolete, not that anyone would notice
anyway).

Some examples of such problems are

http://lists.gnu.org/archive/html/emacs-devel/2008-03/msg00956.html
http://debbugs.gnu.org/cgi/bugreport.cgi?bug=2150

Re: autoload cookies for defcustoms

[Wojciech Meyer]

Glenn Morris <rgm@gnu.org> writes:

> Wojciech Meyer wrote:
>
>> toplevel code evaluated). It is up to maintainers what to do with the
>> patch, it just shows `defcustoms' with `autoload'. I might refine it if
>> somebody comes up with rules to follow.
>
> You can't really come up with a rule. The problem is often historical.
> People get used to using these variables in their .emacs without
> loading the associated packages. Removing the autoloads breaks their
> .emacs. And there's no compatible way to get from here to there (eg
> you cannot mark an autoload obsolete, not that anyone would notice
> anyway).
>

> Some examples of such problems are
>
> 
> http://lists.gnu.org/archive/html/emacs-devel/2008-03/msg00956.html
> http://debbugs.gnu.org/cgi/bugreport.cgi?bug=2150

Thanks for pointing this out.

Yes, I can see the problem, but wouldn't be that solved using some kind
of dependency tracker and `require'?

Cheers;
Wojciech

Re: autoload cookies for defcustoms

[Andy Wingo]

On Mon 30 Aug 2010 16:20, Glenn Morris <rgm@gnu.org> writes:

> And there's no compatible way to get from here to there (eg you cannot
> mark an autoload obsolete, not that anyone would notice anyway).

Why not? Assuming you could, you could mark all autoloads as obsolete,
this would present a warning to users on startup, and a couple years
later you could remove the autoloads.

Andy
-- 
http://wingolog.org/

Re: autoload cookies for defcustoms

[Stefan Monnier]

>> And there's no compatible way to get from here to there (eg you cannot
>> mark an autoload obsolete, not that anyone would notice anyway).
> Why not? Assuming you could, you could mark all autoloads as obsolete,
> this would present a warning to users on startup, and a couple years
> later you could remove the autoloads.

The question is: how could we detect the situation where a warning
is needed?


        Stefan