From 69b55131535a1e35952ab5c1d35695c68814ae61 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 21 Oct 2010 20:32:46 -0700 Subject: Small autoloads fix. * lisp/emacs-lisp/autoload.el (batch-update-autoloads): Update for src/Makefile no longer being pre-processed. --- lisp/emacs-lisp/autoload.el | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'lisp/emacs-lisp/autoload.el') diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index 30c384aff91..532d68245d8 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -778,16 +778,17 @@ Calls `update-directory-autoloads' on the command line arguments." (with-temp-buffer (insert-file-contents mfile) (when (re-search-forward "^shortlisp= " nil t) - (setq lim (line-end-position)) - (while (re-search-forward "\\.\\./lisp/\\([^ ]+\\.el\\)c?\\>" - lim t) + (while (and (not lim) + (re-search-forward "\\.\\./lisp/\\([^ ]+\\.el\\)c?\\>" + nil t)) (push (expand-file-name (match-string 1) ldir) - autoload-excludes)))))))) + autoload-excludes) + (skip-chars-forward " \t") + (if (eolp) (setq lim t))))))))) (let ((args command-line-args-left)) (setq command-line-args-left nil) (apply 'update-directory-autoloads args))) (provide 'autoload) -;; arch-tag: 00244766-98f4-4767-bf42-8a22103441c6 ;;; autoload.el ends here -- cgit v1.2.3 From 4c0eb0d3db97c4f13612a6952bf1e7a88d63cb86 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 16 Nov 2010 19:47:16 -0800 Subject: autoload.el fix for bug#7414. * lisp/emacs-lisp/autoload.el (autoload-find-destination): The function coding-system-eol-type may return non-numeric values. --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/autoload.el | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'lisp/emacs-lisp/autoload.el') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 53c6db7eb0d..d0607f72f7e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-11-17 Glenn Morris + + * emacs-lisp/autoload.el (autoload-find-destination): The function + coding-system-eol-type may return non-numeric values. (Bug#7414) + 2010-11-16 Ulrich Mueller * server.el (server-force-stop): Ensure the server is stopped (Bug#7409). diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index c985aae07b6..5ae984ffdb0 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -1,7 +1,8 @@ ;; autoload.el --- maintain autoloads in loaddefs.el -;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2001, 2002, 2003, -;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2001, 2002, +;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +;; Free Software Foundation, Inc. ;; Author: Roland McGrath ;; Keywords: maint @@ -525,8 +526,8 @@ removes any prior now out-of-date autoload entries." (autoload-ensure-default-file (autoload-generated-file))) ;; This is to make generated-autoload-file have Unix EOLs, so ;; that it is portable to all platforms. - (unless (zerop (coding-system-eol-type buffer-file-coding-system)) - (set-buffer-file-coding-system 'unix)) + (or (eq 0 (coding-system-eol-type buffer-file-coding-system)) + (set-buffer-file-coding-system 'unix)) (or (> (buffer-size) 0) (error "Autoloads file %s does not exist" buffer-file-name)) (or (file-writable-p buffer-file-name) @@ -735,5 +736,4 @@ Calls `update-directory-autoloads' on the command line arguments." (provide 'autoload) -;; arch-tag: 00244766-98f4-4767-bf42-8a22103441c6 ;;; autoload.el ends here -- cgit v1.2.3