Re: [rost@math.ohio-state.edu: Re: GNU Emacs 21.3.50: Patch for cus-dep.el (:version handling)]

Re: [rost@math.ohio-state.edu: Re: GNU Emacs 21.3.50: Patch for cus-dep.el (:version handling)]

[Per Abrahamsen]

Richard Stallman <rms@gnu.org> writes:

> What do you think of these two changes?  Please tell emacs-devel too.

I can't see anything obviously wrong with the first.  The second seems
to be Stefans territory, so I'd rather not use time analysing that,
but Markus desciption sounds convincing.

> From: Markus Rost <rost@math.ohio-state.edu>
> Subject: Re: GNU Emacs 21.3.50:  Patch for cus-dep.el (:version handling)
> To: rms@gnu.org
> Cc: monnier+gnu/emacs@rum.cs.yale.edu, emacs-pretest-bug@gnu.org
> Date: Mon, 11 Nov 2002 16:06:56 -0500 (EST)
>
>    The patch seems reasonable--please install it.
>
> Done.
>
> 	 In general I think that custom related settings should not
>        be put in loaddefs.el, but rather in cus-load.el.
>
>    loaddefs.el contains defcustom forms, no defface forms, and just three
>    defgroup forms.
>
>    Aside from those three defgroup forms (whose autoload cookies should
>    probably be removed--would you like to do that?), what are the
>    custom-related settings you think should be removed from loaddefs.el?
>
> Let me postpone an answer (which may be empty) and rather fix some
> other things before that.
>
> Here are 2 independent changes.
>
> First, `custom-declare-group' contains an obviously unnecessary line
> of code.  It does not hurt much, but should be removed for clarity.
> See the patch below.
>
> For the second patch, let me recall that Stefan had introduced for
> defcustoms and deffaces without an explicit group declaration an
> automatic group declaration which is based on `load-file-name' and
> which uses the result of the function `custom-current-group' as the
> group.
>
> This is currently not respected by `custom-make-dependencies'.  As a
> result there are quite a few random entries in cus-load.el.  The patch
> below for cus-dep.el fixes this.
>
> By the way, here is the current list of custom options without
> explicit or implicit group declaration:
>
> ada-tight-gvd-integration
> button (defface in button.el)
> cvs-mode-commit-hook  
> describe-text-mode-hook
> mouse-wheel-down-button, mouse-wheel-up-button  (a patch for them follows)
> gnus-alter-header-function, nnimap-authinfo-file, nnimap-prune-cache,
> nntp-authinfo-file (all in gnus)
>
> It is easy to find them:  Load admin/cus-test.el and then load many
> libraries with M-x cus-test-load-libs.  Then do
>
> M-x customize-group nil (return)
>
>
> 2002-11-11   Markus Rost  <rost@math.ohio-state.edu>
>
> 	* custom.el (custom-declare-group): Remove unnecessary line of
> 	code.
> 	
> 	* cus-dep.el (custom-make-dependencies): Bind load-file-name.
>
>
> ===Buffer *vc-diff*=========================================
> *** custom.el.~1.57.~	Sat Nov  9 23:19:28 2002
> - --- custom.el	Mon Nov 11 15:46:10 2002
> ***************
> *** 315,321 ****
>     (while members
>       (apply 'custom-add-to-group symbol (car members))
>       (setq members (cdr members)))
> - -   (put symbol 'custom-group (nconc members (get symbol 'custom-group)))
>     (when doc
>       ;; This text doesn't get into DOC.
>       (put symbol 'group-documentation (purecopy doc)))
> - --- 315,320 ----
> ============================================================
>
> ===Buffer *vc-diff*=========================================
> *** cus-dep.el.~1.25.~	Mon Nov 11 11:39:07 2002
> - --- cus-dep.el	Mon Nov 11 12:11:14 2002
> ***************
> *** 54,60 ****
>   	    (insert-file-contents file)
>   	    (goto-char (point-min))
>   	    (string-match "\\`\\(.*\\)\\.el\\'" file)
> ! 	    (let ((name (file-name-nondirectory (match-string 1 file))))
>   	      (if (save-excursion
>   		    (re-search-forward
>   		     (concat "(provide[ \t\n]+\\('\\|(quote[ \t\n]\\)[ \t\n]*"
> - --- 54,61 ----
>   	    (insert-file-contents file)
>   	    (goto-char (point-min))
>   	    (string-match "\\`\\(.*\\)\\.el\\'" file)
> ! 	    (let ((name (file-name-nondirectory (match-string 1 file)))
> ! 		  (load-file-name file))
>   	      (if (save-excursion
>   		    (re-search-forward
>   		     (concat "(provide[ \t\n]+\\('\\|(quote[ \t\n]\\)[ \t\n]*"
> ============================================================
> ----------

Re: [rost@math.ohio-state.edu: Re: GNU Emacs 21.3.50: Patch for cus-dep.el (:version handling)]

[Stefan Monnier]

> I can't see anything obviously wrong with the first.  The second seems
> to be Stefans territory, so I'd rather not use time analysing that,
> but Markus desciption sounds convincing.

Looks fine to me,


	Stefan