[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100215: autoload.el fix for bug#7414.

[Glenn Morris]

------------------------------------------------------------
revno: 100215
committer: Glenn Morris <address@hidden>
branch nick: emacs-23
timestamp: Tue 2010-11-16 19:47:16 -0800
message:
  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.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/autoload.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-11-16 20:09:47 +0000
+++ b/lisp/ChangeLog    2010-11-17 03:47:16 +0000
@@ -1,3 +1,8 @@
+2010-11-17  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * server.el (server-force-stop): Ensure the server is stopped 
(Bug#7409).

=== modified file 'lisp/emacs-lisp/autoload.el'
--- a/lisp/emacs-lisp/autoload.el       2010-01-13 08:35:10 +0000
+++ b/lisp/emacs-lisp/autoload.el       2010-11-17 03:47:16 +0000
@@ -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 <address@hidden>
 ;; Keywords: maint
@@ -525,8 +526,8 @@
            (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 @@
 
 (provide 'autoload)
 
-;; arch-tag: 00244766-98f4-4767-bf42-8a22103441c6
 ;;; autoload.el ends here