mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 18:40:39 -08:00
Code Issues Projects Releases Wiki Activity

autoload.el fix for bug#7414.

Browse source 
* lisp/emacs-lisp/autoload.el (autoload-find-destination): The
function coding-system-eol-type may return non-numeric values.
This commit is contained in:
Glenn Morris 2010-11-16 19:47:16 -08:00
parent bf6442c345
commit 4c0eb0d3db
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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> 2010-11-16 Ulrich Mueller <ulm@gentoo.org>
* server.el (server-force-stop): Ensure the server is stopped (Bug#7409). * server.el (server-force-stop): Ensure the server is stopped (Bug#7409).

10
lisp/emacs-lisp/autoload.el
View file

@ -1,7 +1,8 @@
;; autoload.el --- maintain autoloads in loaddefs.el ;; autoload.el --- maintain autoloads in loaddefs.el
;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2001, 2002, 2003, ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2001, 2002,
;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
;; Free Software Foundation, Inc.
;; Author: Roland McGrath <roland@gnu.org> ;; Author: Roland McGrath <roland@gnu.org>
;; Keywords: maint ;; Keywords: maint
@ -525,8 +526,8 @@ removes any prior now out-of-date autoload entries."
(autoload-ensure-default-file (autoload-generated-file))) (autoload-ensure-default-file (autoload-generated-file)))
;; This is to make generated-autoload-file have Unix EOLs, so ;; This is to make generated-autoload-file have Unix EOLs, so
;; that it is portable to all platforms. ;; that it is portable to all platforms.
(unless (zerop (coding-system-eol-type buffer-file-coding-system)) (or (eq 0 (coding-system-eol-type buffer-file-coding-system))
(set-buffer-file-coding-system 'unix)) (set-buffer-file-coding-system 'unix))
(or (> (buffer-size) 0) (or (> (buffer-size) 0)
(error "Autoloads file %s does not exist" buffer-file-name)) (error "Autoloads file %s does not exist" buffer-file-name))
(or (file-writable-p 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) (provide 'autoload)
;; arch-tag: 00244766-98f4-4767-bf42-8a22103441c6
;;; autoload.el ends here ;;; autoload.el ends here