X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/77ab81d0545e980c57c0a35510ade29a9e43b4cd..0255a70c8ae22e259e8938ac3840c7b6687edec8:/lisp/dos-fns.el

diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el
index 213d436161..7188ae0bce 100644
--- a/lisp/dos-fns.el
+++ b/lisp/dos-fns.el
@@ -1,7 +1,7 @@
 ;;; dos-fns.el --- MS-Dos specific functions
 
-;; Copyright (C) 1991, 1993, 1995, 1996, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+;; Copyright (C) 1991, 1993, 1995-1996, 2001-2016 Free Software
+;; Foundation, Inc.
 
 ;; Maintainer: Morten Welinder <terra@diku.dk>
 ;; Keywords: internal
@@ -98,7 +98,7 @@ sure to obey the 8.3 limitations."
 			    string))
 	      (aset string i ?_))
 	    ;; If we don't have a period in the first 8 chars, insert one.
-	    ;; This enables to have 3 more characters from the original
+	    ;; This enables having 3 more characters from the original
 	    ;; name in the extension.
 	    (if (> (or (string-match "\\." string) (length string))
 		   8)
@@ -159,7 +159,7 @@ sure to obey the 8.3 limitations."
 	       (string (copy-sequence (file-name-nondirectory filename)))
 	       (strlen (length string))
 	       (lastchar (aref string (1- strlen)))
-	       i firstdot)
+	       firstdot)
 	  (setq firstdot (string-match "\\." string))
 	  (cond
 	   (firstdot
@@ -201,8 +201,8 @@ that are used in Emacs Lisp sources; any other file name will be
 returned unaltered."
   (cond
    ;; See files.el:dir-locals-file.
-   ((string= file-name ".dir-locals.el")
-    "_dir-locals.el")
+   ((string= file-name ".dir-locals")
+    "_dir-locals")
    (t
     file-name)))
 
@@ -233,15 +233,15 @@ returned unaltered."
 
 (add-hook 'before-init-hook 'dos-reevaluate-defcustoms)
 
+(define-obsolete-variable-alias
+  'register-name-alist 'dos-register-name-alist "24.1")
+
 (defvar dos-register-name-alist
   '((ax . 0) (bx . 1) (cx . 2) (dx . 3) (si . 4) (di . 5)
     (cflag . 6) (flags . 7)
     (al . (0 . 0)) (bl . (1 . 0)) (cl . (2 . 0)) (dl . (3 . 0))
     (ah . (0 . 1)) (bh . (1 . 1)) (ch . (2 . 1)) (dh . (3 . 1))))
 
-(define-obsolete-variable-alias
-  'register-name-alist 'dos-register-name-alist "24.1")
-
 (defun dos-make-register ()
   (make-vector 8 0))
 
@@ -313,5 +313,4 @@ that your video hardware might not support 50-line mode."
 
 (provide 'dos-fns)
 
-;; arch-tag: 00b03579-8ebb-4a02-8762-5c5a929774ad
 ;;; dos-fns.el ends here