* profiler.el: Switch to cl-lib.

[bpt/emacs.git] / lisp / arc-mode.el

diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index 48b4c5b..c776a3f 100644 (file)
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -1,6 +1,6 @@
 ;;; arc-mode.el --- simple editing of archives
 
 ;;; arc-mode.el --- simple editing of archives
 

-;; Copyright (C) 1995, 1997-1998, 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997-1998, 2001-2012  Free Software Foundation, Inc.

 
 ;; Author: Morten Welinder <terra@gnu.org>
 ;; Keywords: files archives msdog editing major-mode
 
 ;; Author: Morten Welinder <terra@gnu.org>
 ;; Keywords: files archives msdog editing major-mode


@@ -322,6 +322,7 @@ Archive and member name will be added."
   "Program and its options to run in order to extract a 7z file member.
 Extraction should happen to standard output.  Archive and member name will
 be added."
   "Program and its options to run in order to extract a 7z file member.
 Extraction should happen to standard output.  Archive and member name will
 be added."

+  :version "24.1"

   :type '(list (string :tag "Program")
               (repeat :tag "Options"
                       :inline t
   :type '(list (string :tag "Program")
               (repeat :tag "Options"
                       :inline t


@@ -332,6 +333,7 @@ be added."
   '("7z" "d")
   "Program and its options to run in order to delete 7z file members.
 Archive and member names will be added."
   '("7z" "d")
   "Program and its options to run in order to delete 7z file members.
 Archive and member names will be added."

+  :version "24.1"

   :type '(list (string :tag "Program")
               (repeat :tag "Options"
                       :inline t
   :type '(list (string :tag "Program")
               (repeat :tag "Options"
                       :inline t


@@ -343,6 +345,7 @@ Archive and member names will be added."
   "Program and its options to run in order to update a 7z file member.
 Options should ensure that specified directory will be put into the 7z
 file.  Archive and member name will be added."
   "Program and its options to run in order to update a 7z file member.
 Options should ensure that specified directory will be put into the 7z
 file.  Archive and member name will be added."

+  :version "24.1"

   :type '(list (string :tag "Program")
               (repeat :tag "Options"
                       :inline t
   :type '(list (string :tag "Program")
               (repeat :tag "Options"
                       :inline t


@@ -619,11 +622,12 @@ the mode is invalid.  If ERROR is nil then nil will be returned."
 
 (defun archive-unixdate (low high)
   "Stringify Unix (LOW HIGH) date."
 
 (defun archive-unixdate (low high)
   "Stringify Unix (LOW HIGH) date."

-  (let ((str (current-time-string (cons high low))))
+  (let* ((time (cons high low))
+        (str (current-time-string time)))

     (format "%s-%s-%s"
            (substring str 8 10)
            (substring str 4 7)
     (format "%s-%s-%s"
            (substring str 8 10)
            (substring str 4 7)

-           (substring str 20 24))))
+           (format-time-string "%Y" time))))

 
 (defun archive-unixtime (low high)
   "Stringify Unix (LOW HIGH) time."
 
 (defun archive-unixtime (low high)
   "Stringify Unix (LOW HIGH) time."


@@ -860,13 +864,13 @@ using `make-temp-file', and the generated name is returned."
          dir)))
     (if (or alien (file-exists-p fullname))
        (progn
          dir)))
     (if (or alien (file-exists-p fullname))
        (progn

-         ;; Maked sure all the leading directories in
+         ;; Make sure all the leading directories in

          ;; archive-local-name exist under archive-tmpdir, so that
          ;; the directory structure recorded in the archive is
          ;; reconstructed in the temporary directory.
          (make-directory (file-name-directory tmpfile) t)
          (make-temp-file tmpfile))
          ;; archive-local-name exist under archive-tmpdir, so that
          ;; the directory structure recorded in the archive is
          ;; reconstructed in the temporary directory.
          (make-directory (file-name-directory tmpfile) t)
          (make-temp-file tmpfile))

-      ;; Maked sure all the leading directories in `fullname' exist
+      ;; Make sure all the leading directories in `fullname' exist

       ;; under archive-tmpdir.  This is necessary for nested archives
       ;; (`archive-extract' sets `archive-remote' to t in case
       ;; an archive occurs inside another archive).
       ;; under archive-tmpdir.  This is necessary for nested archives
       ;; (`archive-extract' sets `archive-remote' to t in case
       ;; an archive occurs inside another archive).