From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: phillip.lord@russet.org.uk (Phillip Lord) Newsgroups: gmane.emacs.bugs Subject: bug#25360: File mode specification errors during building Date: Fri, 13 Jan 2017 14:08:55 +0000 Message-ID: <87inpj1288.fsf@russet.org.uk> References: <8760lndxlz.fsf@russet.org.uk> <83bmvfdk2r.fsf@gnu.org> <8737gqsqqr.fsf@russet.org.uk> <83ziiyda4y.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1484316705 5018 195.159.176.226 (13 Jan 2017 14:11:45 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 13 Jan 2017 14:11:45 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.91 (gnu/linux) Cc: 25360@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Jan 13 15:11:40 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cS2Ze-0007fw-Ty for geb-bug-gnu-emacs@m.gmane.org; Fri, 13 Jan 2017 15:11:23 +0100 Original-Received: from localhost ([::1]:41448 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cS2Zj-0005lz-GX for geb-bug-gnu-emacs@m.gmane.org; Fri, 13 Jan 2017 09:11:27 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52601) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cS2YP-0004aj-Ss for bug-gnu-emacs@gnu.org; Fri, 13 Jan 2017 09:10:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cS2YM-0004DE-J5 for bug-gnu-emacs@gnu.org; Fri, 13 Jan 2017 09:10:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:36785) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cS2YM-0004Cg-F1 for bug-gnu-emacs@gnu.org; Fri, 13 Jan 2017 09:10:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cS2YM-0004Cz-7y for bug-gnu-emacs@gnu.org; Fri, 13 Jan 2017 09:10:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: phillip.lord@russet.org.uk (Phillip Lord) Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 13 Jan 2017 14:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25360 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 25360-submit@debbugs.gnu.org id=B25360.148431654516099 (code B ref 25360); Fri, 13 Jan 2017 14:10:02 +0000 Original-Received: (at 25360) by debbugs.gnu.org; 13 Jan 2017 14:09:05 +0000 Original-Received: from localhost ([127.0.0.1]:52184 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cS2XR-0004Bb-5X for submit@debbugs.gnu.org; Fri, 13 Jan 2017 09:09:05 -0500 Original-Received: from mailgw.mycpanelcloud.co.uk ([185.116.214.205]:37922) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cS2XP-0004B7-PF for 25360@debbugs.gnu.org; Fri, 13 Jan 2017 09:09:04 -0500 Original-Received: from localhost (localhost [127.0.0.1]) by mailgw.mycpanelcloud.co.uk (Postfix) with ESMTP id C38D1C4F9F for <25360@debbugs.gnu.org>; Fri, 13 Jan 2017 14:08:35 +0000 (GMT) X-Virus-Scanned: by SpamTitan at mycpanelcloud.co.uk Original-Received: from mailgw.mycpanelcloud.co.uk (localhost [127.0.0.1]) by mailgw.mycpanelcloud.co.uk (Postfix) with ESMTP id DF0A1C4FAC for <25360@debbugs.gnu.org>; Fri, 13 Jan 2017 14:08:33 +0000 (GMT) Original-Received: from cloud103.planethippo.com (cloud103.planethippo.com [31.216.48.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mailgw.mycpanelcloud.co.uk (Postfix) with ESMTPS id D259AC4FA4 for <25360@debbugs.gnu.org>; Fri, 13 Jan 2017 14:08:33 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=russet.org.uk; s=default; h=Content-Type:MIME-Version:Message-ID: In-Reply-To:Date:References:Subject:Cc:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=AdcTDYBTF8Ikj6p1tNCcx/K9rWgD4aYsNJRUB80wXu4=; b=1uAHxMr0DLpRxWgNqzXvAOjkE i9892nmb94l9jIqY8U0XU8YOd7TlXxRzueU6w9yjEbflhq5wLG7Xth+6GVwE+ExZ2sARmevw0GrWv h8VZtiSy0Ln1XP429iAi17YhxGjGXTfAmEpsI6u4qV6xsb9IYK+M3LWh0iYpAKN3uckstt2yqeusZ F7jEJOYuOKpFqNMjIQvwUMxHRAQeRAyw6/9EikZZ2o+A2Kh2NLU7D8QHij6NSDkfAmK9/js9PD2GU uxVqafVJsNd14wy8qp4jCoJVz8sR3vagoe6CNm4XrZviDPJcZ6sDqXLeKytsDlt7TxuZ3gE7LL/2q pMV3Ii3kQ==; Original-Received: from janus-nat-128-240-225-37.ncl.ac.uk ([128.240.225.37]:61453 helo=russet.org.uk) by cloud103.planethippo.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.87) (envelope-from ) id 1cS2XI-003t1Z-22; Fri, 13 Jan 2017 14:08:56 +0000 In-Reply-To: <83ziiyda4y.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 10 Jan 2017 20:48:13 +0200") X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cloud103.planethippo.com X-AntiAbuse: Original Domain - debbugs.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - russet.org.uk X-Get-Message-Sender-Via: cloud103.planethippo.com: authenticated_id: phillip.lord@russet.org.uk X-Authenticated-Sender: cloud103.planethippo.com: phillip.lord@russet.org.uk X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:128069 Archived-At: --=-=-= Content-Type: text/plain Eli Zaretskii writes: >> From: phillip.lord@russet.org.uk (Phillip Lord) >> Cc: rgm@gnu.org, 25360@debbugs.gnu.org >> Date: Tue, 10 Jan 2017 18:40:28 +0000 >> >> One error is caused when bootstrap-emacs loads CTLau.html, when it's >> running this code in leim. >> >> misc_convert = $(AM_V_GEN)${RUN_EMACS} \ >> -l titdic-cnv -f batch-miscdic-convert -dir ${leimdir}/quail >> >> ## CTLau.el, CTLau-b5.el. >> ${leimdir}/quail/CT%.el: ${srcdir}/MISC-DIC/CT%.html >> ${misc_convert} $< >> >> As far as I can tell it is happening because emacs tries to put >> CTLau.html into html-mode. AFAICT, batch-miscdic-convert uses no >> features of html-mode. > > Ok, and how does image-type-auto-detected-p enter this picture? > >> Still, I'll plug at it a little more. > > Thanks. So, the cause of the problem is this. bootstrap-emacs (nor emacs) does not actually load loaddefs.el; it's just dumped with the binary. I was recording autoloads until loaddefs.el was generated, but actually, I need to record them till loaddefs.el is used, that is when emacs is dumped. The attached patch seems to address. Can you confirm, then I will apply to master. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Record-autoloads-till-emacs-dump.patch >From 74539c444487094e45a0dd1b4cdb4553eb9cdfe1 Mon Sep 17 00:00:00 2001 From: Phillip Lord Date: Fri, 13 Jan 2017 13:57:51 +0000 Subject: [PATCH] Record autoloads till emacs dump * admin/ldefs-clean.el (ldefs-clean-up): Record autoloads till emacs dump * lisp/ldefs-boot-auto.el (batch-byte-compile): Update Previously, autoloads were collected till loaddefs.el was generated as part of the build. However, bootstrap-emacs does not load loaddefs (rather it is dumped), hence we must record autoloads until the full emacs binary is dumped. --- admin/ldefs-clean.el | 3 ++- lisp/ldefs-boot-auto.el | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/admin/ldefs-clean.el b/admin/ldefs-clean.el index 6eabe57..808b537 100644 --- a/admin/ldefs-clean.el +++ b/admin/ldefs-clean.el @@ -39,7 +39,8 @@ ldefs-clean-up (goto-char (point-max)) ;; We only need the autoloads up till loaddefs.el is ;; generated. After this, ldefs-boot.el is not needed - (search-backward " GEN loaddefs.el") + (search-backward "-l loadup dump") + (beginning-of-line) (delete-region (point) (point-max)) (keep-lines "(autoload" (point-min) (point-max)) (sort-lines nil (point-min) (point-max)) diff --git a/lisp/ldefs-boot-auto.el b/lisp/ldefs-boot-auto.el index 914fec8..020c670 100644 --- a/lisp/ldefs-boot-auto.el +++ b/lisp/ldefs-boot-auto.el @@ -6,6 +6,8 @@ (autoload 'add-change-log-entry "add-log" nil nil nil) (autoload 'add-log-current-defun "add-log" nil nil nil) (autoload 'batch-byte-compile "bytecomp" nil nil nil) +(autoload 'batch-update-autoloads "autoload" nil nil nil) +(autoload 'bounds-of-thing-at-point "thingatpt" nil nil nil) (autoload 'browse-url "browse-url" nil nil nil) (autoload 'buffer-face-mode "face-remap" nil nil nil) (autoload 'byte-compile "bytecomp" nil nil nil) @@ -24,11 +26,16 @@ (autoload 'compilation-mode "compile" nil nil nil) (autoload 'compilation-shell-minor-mode "compile" nil nil nil) (autoload 'compilation-start "compile" nil nil nil) +(autoload 'completing-read-multiple "crm" nil nil nil) +(autoload 'conf-mode "conf-mode" nil nil nil) +(autoload 'create-glyph "disp-table" nil nil nil) (autoload 'create-image "image" nil nil nil) +(autoload 'cursor-sensor-mode "cursor-sensor" nil nil nil) (autoload 'custom-save-all "cus-edit" nil nil nil) (autoload 'customize-face "cus-edit" nil nil nil) (autoload 'customize-group "cus-edit" nil nil nil) (autoload 'customize-option "cus-edit" nil nil nil) +(autoload 'customize-push-and-save "cus-edit" nil nil nil) (autoload 'customize-set-variable "cus-edit" nil nil nil) (autoload 'debug "debug" nil nil nil) (autoload 'define-ccl-program "ccl" nil nil t) @@ -36,6 +43,8 @@ (autoload 'define-minor-mode "easy-mmode" nil nil t) (autoload 'delete-extract-rectangle "rect" nil nil nil) (autoload 'describe-char "descr-text" nil nil nil) +(autoload 'describe-coding-system "mule-diag" nil nil nil) +(autoload 'describe-display-table "disp-table" nil nil nil) (autoload 'describe-function "help-fns" nil nil nil) (autoload 'describe-function-1 "help-fns" nil nil nil) (autoload 'describe-package "package" nil nil nil) @@ -43,11 +52,21 @@ (autoload 'desktop-save "desktop" nil nil nil) (autoload 'diff-mode "diff-mode" nil nil nil) (autoload 'dired "dired" nil nil nil) +(autoload 'dired-copy-file "dired-aux" nil nil nil) +(autoload 'dired-goto-subdir "dired-aux" nil nil nil) +(autoload 'dired-hide-subdir "dired-aux" nil nil nil) +(autoload 'dired-insert-subdir "dired-aux" nil nil nil) +(autoload 'dired-kill-subdir "dired-aux" nil nil nil) +(autoload 'dired-mark-subdir-files "dired-aux" nil nil nil) (autoload 'dired-mode "dired" nil nil nil) (autoload 'dired-noselect "dired" nil nil nil) +(autoload 'dired-query "dired-aux" nil nil nil) +(autoload 'dired-rename-file "dired-aux" nil nil nil) (autoload 'display-call-tree "bytecomp" nil nil nil) +(autoload 'display-table-slot "disp-table" nil nil nil) (autoload 'display-warning "warnings" nil nil nil) (autoload 'easy-menu-create-menu "easymenu" nil nil nil) +(autoload 'edebug-basic-spec "edebug" nil nil nil) (autoload 'ediff-patch-file "ediff" nil nil nil) (autoload 'edit-kbd-macro "edmacro" nil nil nil) (autoload 'extract-rectangle "rect" nil nil nil) @@ -67,8 +86,10 @@ (autoload 'help-with-tutorial "tutorial" nil nil nil) (autoload 'help-xref-button "help-mode" nil nil nil) (autoload 'hi-lock-face-buffer "hi-lock" nil nil nil) +(autoload 'html-mode "sgml-mode" nil nil nil) (autoload 'image-type-available-p "image" nil nil nil) (autoload 'info "info" nil nil nil) +(autoload 'info-complete-symbol "info-look" nil nil nil) (autoload 'info-emacs-manual "info" nil nil nil) (autoload 'insert-image "image" nil nil nil) (autoload 'insert-rectangle "rect" nil nil nil) @@ -83,21 +104,27 @@ (autoload 'multi-isearch-buffers-regexp "misearch" nil nil nil) (autoload 'multi-isearch-files "misearch" nil nil nil) (autoload 'multi-isearch-files-regexp "misearch" nil nil nil) +(autoload 'nxml-mode "nxml-mode" nil nil nil) (autoload 'open-network-stream "network-stream" nil nil nil) (autoload 'package-initialize "package" nil nil nil) (autoload 'parse-time-string "parse-time" nil nil nil) (autoload 'pp "pp" nil nil nil) (autoload 'pp-buffer "pp" nil nil nil) +(autoload 'print-buffer "lpr" nil nil nil) +(autoload 'quail-defrule-internal "quail" nil nil nil) (autoload 'read-kbd-macro "edmacro" nil nil nil) (autoload 'regexp-opt "regexp-opt" nil nil nil) (autoload 'rx "rx" nil nil t) (autoload 'seconds-to-string "time-date" nil nil nil) (autoload 'seconds-to-time "time-date" nil nil nil) +(autoload 'server-save-buffers-kill-terminal "server" nil nil nil) (autoload 'server-start "server" nil nil nil) (autoload 'set-nested-alist "mule-util" nil nil nil) +(autoload 'skeleton-insert "skeleton" nil nil nil) (autoload 'smerge-mode "smerge-mode" nil nil nil) (autoload 'smerge-start-session "smerge-mode" nil nil nil) (autoload 'standard-display-8bit "disp-table" nil nil nil) +(autoload 'standard-display-default "disp-table" nil nil nil) (autoload 'tags-query-replace "etags" nil nil nil) (autoload 'tags-search "etags" nil nil nil) (autoload 'text-scale-increase "face-remap" nil nil nil) @@ -106,6 +133,12 @@ (autoload 'timezone-make-date-arpa-standard "timezone" nil nil nil) (autoload 'tmm-menubar "tmm" nil nil nil) (autoload 'truncate-string-to-width "mule-util" nil nil nil) +(autoload 'ucs-normalize-HFS-NFC-region "ucs-normalize" nil nil nil) +(autoload 'ucs-normalize-HFS-NFD-region "ucs-normalize" nil nil nil) +(autoload 'ucs-normalize-NFC-region "ucs-normalize" nil nil nil) +(autoload 'ucs-normalize-NFD-region "ucs-normalize" nil nil nil) +(autoload 'ucs-normalize-NFKC-region "ucs-normalize" nil nil nil) +(autoload 'ucs-normalize-NFKD-region "ucs-normalize" nil nil nil) (autoload 'url-handler-mode "url-handlers" nil nil nil) (autoload 'variable-at-point "help-fns" nil nil nil) (autoload 'vc-register "vc" nil nil nil) @@ -114,6 +147,7 @@ (autoload 'view-buffer "view" nil nil nil) (autoload 'view-buffer-other-window "view" nil nil nil) (autoload 'view-file "view" nil nil nil) +(autoload 'view-mode "view" nil nil nil) (autoload 'view-mode-enter "view" nil nil nil) (autoload 'visit-tags-table "etags" nil nil nil) (autoload 'warn "warnings" nil nil nil) -- 2.7.4 --=-=-=--