From: Glenn Morris <rgm@gnu.org>
Date: Wed, 13 Nov 2013 20:40:12 +0000 (-0500)
Subject: * lisp/arc-mode.el (archive-7z-extract, archive-7z-expunge)
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~841
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ff4b7bd5318011b009f7d97f113260ba9be9efa7;p=emacs.git

* lisp/arc-mode.el (archive-7z-extract, archive-7z-expunge)
(archive-7z-update): Avoid custom type mismatches.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 719efbd68b4..f11ebd4d418 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2013-11-13  Glenn Morris  <rgm@gnu.org>
 
+	* 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  <michael.albinus@gmx.de>
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index c22205d5634..57a030bbf44 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -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 <terra@gnu.org>
 ;; Keywords: files archives msdog editing major-mode
@@ -326,7 +325,7 @@ Archive and member name will be added."
 ;; 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 @@ be added."
   :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 @@ Archive and member names will be added."
   :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."