diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-11-16 19:47:16 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-11-16 19:47:16 -0800 |
| commit | 4c0eb0d3db97c4f13612a6952bf1e7a88d63cb86 (patch) | |
| tree | 077b5553c284c431b1c44501d09ced6f2c332252 | |
| parent | bf6442c3451483de277d1b76832854ad4022963d (diff) | |
| download | emacs-4c0eb0d3db97c4f13612a6952bf1e7a88d63cb86.tar.gz emacs-4c0eb0d3db97c4f13612a6952bf1e7a88d63cb86.tar.bz2 emacs-4c0eb0d3db97c4f13612a6952bf1e7a88d63cb86.zip | |
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.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/autoload.el | 10 |
2 files changed, 10 insertions, 5 deletions
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 <rgm@gnu.org> + + * 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 <ulm@gentoo.org> * 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 <roland@gnu.org> ;; 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 |