emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r115090: * lisp/arc-mode.el (archive-7z-extract, arc


From: Glenn Morris
Subject: [Emacs-diffs] trunk r115090: * lisp/arc-mode.el (archive-7z-extract, archive-7z-expunge)
Date: Wed, 13 Nov 2013 20:40:15 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 115090
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-11-13 15:40:12 -0500
message:
  * lisp/arc-mode.el (archive-7z-extract, archive-7z-expunge)
  (archive-7z-update): Avoid custom type mismatches.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/arc-mode.el               arcmode.el-20091113204419-o5vbwnq5f7feedwu-877
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-11-13 20:06:37 +0000
+++ b/lisp/ChangeLog    2013-11-13 20:40:12 +0000
@@ -1,5 +1,8 @@
 2013-11-13  Glenn Morris  <address@hidden>
 
+       * arc-mode.el (archive-7z-extract, archive-7z-expunge)
+       (archive-7z-update): Avoid custom type mismatches.
+
        * vc/vc.el (vc-diff-knows-L): Remove; unused since 2007-10-10.
 
 2013-11-13  Michael Albinus  <address@hidden>

=== modified file 'lisp/arc-mode.el'
--- a/lisp/arc-mode.el  2013-09-11 03:31:56 +0000
+++ b/lisp/arc-mode.el  2013-11-13 20:40:12 +0000
@@ -1,7 +1,6 @@
 ;;; arc-mode.el --- simple editing of archives
 
-;; Copyright (C) 1995, 1997-1998, 2001-2013 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1995, 1997-1998, 2001-2013 Free Software Foundation, Inc.
 
 ;; Author: Morten Welinder <address@hidden>
 ;; Keywords: files archives msdog editing major-mode
@@ -326,7 +325,7 @@
 ;; 7z archive configuration
 
 (defcustom archive-7z-extract
-  `(,archive-7z-program "x" "-so")
+  `(,(or archive-7z-program "7z") "x" "-so")
   "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."
@@ -338,7 +337,7 @@
   :group 'archive-7z)
 
 (defcustom archive-7z-expunge
-  `(,archive-7z-program "d")
+  `(,(or archive-7z-program "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"
@@ -349,7 +348,7 @@
   :group 'archive-7z)
 
 (defcustom archive-7z-update
-  `(,archive-7z-program "u")
+  `(,(or archive-7z-program "7z") "u")
   "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."


reply via email to

[Prev in Thread] Current Thread [Next in Thread]