[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/arc-mode.el
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/arc-mode.el |
Date: |
Thu, 30 Jun 2005 17:52:17 -0400 |
Index: emacs/lisp/arc-mode.el
diff -c emacs/lisp/arc-mode.el:1.61 emacs/lisp/arc-mode.el:1.62
*** emacs/lisp/arc-mode.el:1.61 Thu May 26 12:11:10 2005
--- emacs/lisp/arc-mode.el Thu Jun 30 21:52:17 2005
***************
*** 218,228 ****
;; Zip archive configuration
(defcustom archive-zip-extract
! (if (locate-file "unzip" nil 'file-executable-p)
! '("unzip" "-qq" "-c")
! (if (locate-file "pkunzip" nil 'file-executable-p)
! '("pkunzip" "-e" "-o-")
! '("unzip" "-qq" "-c")))
"*Program and its options to run in order to extract a zip file member.
Extraction should happen to standard output. Archive and member name will
be added. If `archive-zip-use-pkzip' is non-nil then this program is
--- 218,227 ----
;; Zip archive configuration
(defcustom archive-zip-extract
! (if (and (not (executable-find "unzip"))
! (executable-find "pkunzip"))
! '("pkunzip" "-e" "-o-")
! '("unzip" "-qq" "-c"))
"*Program and its options to run in order to extract a zip file member.
Extraction should happen to standard output. Archive and member name will
be added. If `archive-zip-use-pkzip' is non-nil then this program is
***************
*** 239,249 ****
;; names.
(defcustom archive-zip-expunge
! (if (locate-file "zip" nil 'file-executable-p)
! '("zip" "-d" "-q")
! (if (locate-file "pkzip" nil 'file-executable-p)
! '("pkzip" "-d")
! '("zip" "-d" "-q")))
"*Program and its options to run in order to delete zip file members.
Archive and member names will be added."
:type '(list (string :tag "Program")
--- 238,247 ----
;; names.
(defcustom archive-zip-expunge
! (if (and (not (executable-find "zip"))
! (executable-find "pkzip"))
! '("pkzip" "-d")
! '("zip" "-d" "-q"))
"*Program and its options to run in order to delete zip file members.
Archive and member names will be added."
:type '(list (string :tag "Program")
***************
*** 253,263 ****
:group 'archive-zip)
(defcustom archive-zip-update
! (if (locate-file "zip" nil 'file-executable-p)
! '("zip" "-q")
! (if (locate-file "pkzip" nil 'file-executable-p)
! '("pkzip" "-u" "-P")
! '("zip" "-q")))
"*Program and its options to run in order to update a zip file member.
Options should ensure that specified directory will be put into the zip
file. Archive and member name will be added."
--- 251,260 ----
:group 'archive-zip)
(defcustom archive-zip-update
! (if (and (not (executable-find "zip"))
! (executable-find "pkzip"))
! '("pkzip" "-u" "-P")
! '("zip" "-q"))
"*Program and its options to run in order to update a zip file member.
Options should ensure that specified directory will be put into the zip
file. Archive and member name will be added."
***************
*** 268,278 ****
:group 'archive-zip)
(defcustom archive-zip-update-case
! (if (locate-file "zip" nil 'file-executable-p)
! '("zip" "-q" "-k")
! (if (locate-file "pkzip" nil 'file-executable-p)
! '("pkzip" "-u" "-P")
! '("zip" "-q" "-k")))
"*Program and its options to run in order to update a case fiddled zip
member.
Options should ensure that specified directory will be put into the zip file.
Archive and member name will be added."
--- 265,274 ----
:group 'archive-zip)
(defcustom archive-zip-update-case
! (if (and (not (executable-find "zip"))
! (executable-find "pkzip"))
! '("pkzip" "-u" "-P")
! '("zip" "-q" "-k"))
"*Program and its options to run in order to update a case fiddled zip
member.
Options should ensure that specified directory will be put into the zip file.
Archive and member name will be added."
***************
*** 715,721 ****
when parsing the archive."
(widen)
(set-buffer-multibyte nil)
! (let (buffer-read-only)
(or shut-up
(message "Parsing archive file..."))
(buffer-disable-undo (current-buffer))
--- 711,717 ----
when parsing the archive."
(widen)
(set-buffer-multibyte nil)
! (let ((inhibit-read-only t))
(or shut-up
(message "Parsing archive file..."))
(buffer-disable-undo (current-buffer))
***************
*** 733,743 ****
"Recreate the contents listing of an archive."
(let ((modified (buffer-modified-p))
(no (archive-get-lineno))
! buffer-read-only)
(widen)
(delete-region (point-min) archive-proper-file-start)
(archive-summarize t)
! (set-buffer-modified-p modified)
(goto-char archive-file-list-start)
(archive-next-line no)))
--- 729,739 ----
"Recreate the contents listing of an archive."
(let ((modified (buffer-modified-p))
(no (archive-get-lineno))
! (inhibit-read-only t))
(widen)
(delete-region (point-min) archive-proper-file-start)
(archive-summarize t)
! (restore-buffer-modified-p modified)
(goto-char archive-file-list-start)
(archive-next-line no)))
***************
*** 832,838 ****
(modified (buffer-modified-p))
(coding-system-for-read 'no-conversion)
(lno (archive-get-lineno))
! buffer-read-only)
(if unchanged nil
(setq archive-files nil)
(erase-buffer)
--- 828,834 ----
(modified (buffer-modified-p))
(coding-system-for-read 'no-conversion)
(lno (archive-get-lineno))
! (inhibit-read-only t))
(if unchanged nil
(setq archive-files nil)
(erase-buffer)
***************
*** 932,939 ****
(setq archive (archive-maybe-copy archive))
(setq buffer (get-buffer-create bufname))
(setq just-created t)
! (save-excursion
! (set-buffer buffer)
(setq buffer-file-name
(expand-file-name (concat arcname ":" iname)))
(setq buffer-file-truename
--- 928,934 ----
(setq archive (archive-maybe-copy archive))
(setq buffer (get-buffer-create bufname))
(setq just-created t)
! (with-current-buffer buffer
(setq buffer-file-name
(expand-file-name (concat arcname ":" iname)))
(setq buffer-file-truename
***************
*** 1056,1066 ****
(read-buffer "Buffer containing archive: "
;; Find first archive buffer and suggest that
(let ((bufs (buffer-list)))
! (while (and bufs (not (eq (save-excursion
! (set-buffer (car bufs))
! major-mode)
! 'archive-mode)))
! (setq bufs (cdr bufs)))
(if bufs
(car bufs)
(error "There are no archive buffers")))
--- 1051,1060 ----
(read-buffer "Buffer containing archive: "
;; Find first archive buffer and suggest that
(let ((bufs (buffer-list)))
! (while (and bufs
! (not (with-current-buffer (car bufs)
! (derived-mode-p 'archive-mode))))
! (setq bufs (cdr bufs)))
(if bufs
(car bufs)
(error "There are no archive buffers")))
***************
*** 1069,1076 ****
(if buffer-file-name
(file-name-nondirectory buffer-file-name)
""))))
! (save-excursion
! (set-buffer arcbuf)
(or (eq major-mode 'archive-mode)
(error "Buffer is not an archive buffer"))
(if archive-read-only
--- 1063,1069 ----
(if buffer-file-name
(file-name-nondirectory buffer-file-name)
""))))
! (with-current-buffer arcbuf
(or (eq major-mode 'archive-mode)
(error "Buffer is not an archive buffer"))
(if archive-read-only
***************
*** 1079,1090 ****
(error "An archive buffer cannot be added to itself"))
(if (string= name "")
(error "Archive members may not be given empty names"))
! (let ((func (save-excursion (set-buffer arcbuf)
! (archive-name "add-new-member")))
(membuf (current-buffer)))
(if (fboundp func)
! (save-excursion
! (set-buffer arcbuf)
(funcall func buffer-file-name membuf name))
(error "Adding a new member is not supported for this archive type"))))
;; -------------------------------------------------------------------------
--- 1072,1082 ----
(error "An archive buffer cannot be added to itself"))
(if (string= name "")
(error "Archive members may not be given empty names"))
! (let ((func (with-current-buffer arcbuf
! (archive-name "add-new-member")))
(membuf (current-buffer)))
(if (fboundp func)
! (with-current-buffer arcbuf
(funcall func buffer-file-name membuf name))
(error "Adding a new member is not supported for this archive type"))))
;; -------------------------------------------------------------------------
***************
*** 1095,1104 ****
(save-restriction
(message "Updating archive...")
(widen)
! (let ((writer (save-excursion (set-buffer archive-superior-buffer)
! (archive-name "write-file-member")))
! (archive (save-excursion (set-buffer archive-superior-buffer)
! (archive-maybe-copy (buffer-file-name)))))
(if (fboundp writer)
(funcall writer archive archive-subfile-mode)
(archive-*-write-file-member archive
--- 1087,1096 ----
(save-restriction
(message "Updating archive...")
(widen)
! (let ((writer (with-current-buffer archive-superior-buffer
! (archive-name "write-file-member")))
! (archive (with-current-buffer archive-superior-buffer
! (archive-maybe-copy (buffer-file-name)))))
(if (fboundp writer)
(funcall writer archive archive-subfile-mode)
(archive-*-write-file-member archive
***************
*** 1167,1173 ****
(beginning-of-line)
(let ((sign (if (>= p 0) +1 -1))
(modified (buffer-modified-p))
! buffer-read-only)
(while (not (zerop p))
(if (archive-get-descr t)
(progn
--- 1159,1165 ----
(beginning-of-line)
(let ((sign (if (>= p 0) +1 -1))
(modified (buffer-modified-p))
! (inhibit-read-only t))
(while (not (zerop p))
(if (archive-get-descr t)
(progn
***************
*** 1175,1181 ****
(insert type)))
(forward-line sign)
(setq p (- p sign)))
! (set-buffer-modified-p modified))
(archive-next-line 0))
(defun archive-unflag (p)
--- 1167,1173 ----
(insert type)))
(forward-line sign)
(setq p (- p sign)))
! (restore-buffer-modified-p modified))
(archive-next-line 0))
(defun archive-unflag (p)
***************
*** 1194,1207 ****
"Remove all marks."
(interactive)
(let ((modified (buffer-modified-p))
! buffer-read-only)
(save-excursion
(goto-char archive-file-list-start)
(while (< (point) archive-file-list-end)
(or (= (following-char) ? )
(progn (delete-char 1) (insert ? )))
(forward-line 1)))
! (set-buffer-modified-p modified)))
(defun archive-mark (p)
"In archive mode, mark this member for group operations.
--- 1186,1199 ----
"Remove all marks."
(interactive)
(let ((modified (buffer-modified-p))
! (inhibit-read-only t))
(save-excursion
(goto-char archive-file-list-start)
(while (< (point) archive-file-list-end)
(or (= (following-char) ? )
(progn (delete-char 1) (insert ? )))
(forward-line 1)))
! (restore-buffer-modified-p modified)))
(defun archive-mark (p)
"In archive mode, mark this member for group operations.
***************
*** 1339,1345 ****
"Undo in an archive buffer.
This doesn't recover lost files, it just undoes changes in the buffer itself."
(interactive)
! (let (buffer-read-only)
(undo)))
;; -------------------------------------------------------------------------
;; Section: Arc Archives
--- 1331,1337 ----
"Undo in an archive buffer.
This doesn't recover lost files, it just undoes changes in the buffer itself."
(interactive)
! (let ((inhibit-read-only t))
(undo)))
;; -------------------------------------------------------------------------
;; Section: Arc Archives
***************
*** 1398,1404 ****
(error "File names in arc files are limited to 12 characters"))
(let ((name (concat newname (substring "\0\0\0\0\0\0\0\0\0\0\0\0\0"
(length newname))))
! buffer-read-only)
(save-restriction
(save-excursion
(widen)
--- 1390,1396 ----
(error "File names in arc files are limited to 12 characters"))
(let ((name (concat newname (substring "\0\0\0\0\0\0\0\0\0\0\0\0\0"
(length newname))))
! (inhibit-read-only t))
(save-restriction
(save-excursion
(widen)
***************
*** 1570,1576 ****
(oldfnlen (char-after (+ p 21)))
(newfnlen (length newname))
(newhsize (+ oldhsize newfnlen (- oldfnlen)))
! buffer-read-only)
(if (> newhsize 255)
(error "The file name is too long"))
(goto-char (+ p 21))
--- 1562,1568 ----
(oldfnlen (char-after (+ p 21)))
(newfnlen (length newname))
(newhsize (+ oldhsize newfnlen (- oldfnlen)))
! (inhibit-read-only t))
(if (> newhsize 255)
(error "The file name is too long"))
(goto-char (+ p 21))
***************
*** 1585,1598 ****
(save-excursion
(widen)
(set-buffer-multibyte nil)
! (while files
! (let* ((fil (car files))
! (p (+ archive-proper-file-start (aref fil 4)))
(hsize (char-after p))
(fnlen (char-after (+ p 21)))
(p2 (+ p 22 fnlen))
(creator (if (>= (- hsize fnlen) 24) (char-after (+ p2 2)) 0))
! buffer-read-only)
(if (= creator ?U)
(progn
(or (numberp newval)
--- 1577,1589 ----
(save-excursion
(widen)
(set-buffer-multibyte nil)
! (dolist (fil files)
! (let* ((p (+ archive-proper-file-start (aref fil 4)))
(hsize (char-after p))
(fnlen (char-after (+ p 21)))
(p2 (+ p 22 fnlen))
(creator (if (>= (- hsize fnlen) 24) (char-after (+ p2 2)) 0))
! (inhibit-read-only t))
(if (= creator ?U)
(progn
(or (numberp newval)
***************
*** 1604,1611 ****
(delete-char 1)
(insert (archive-lzh-resum (1+ p) hsize)))
(message "Member %s does not have %s field"
! (aref fil 1) errtxt)))
! (setq files (cdr files))))))
(defun archive-lzh-chown-entry (newuid files)
(archive-lzh-ogm newuid files "an uid" 10))
--- 1595,1601 ----
(delete-char 1)
(insert (archive-lzh-resum (1+ p) hsize)))
(message "Member %s does not have %s field"
! (aref fil 1) errtxt)))))))
(defun archive-lzh-chown-entry (newuid files)
(archive-lzh-ogm newuid files "an uid" 10))
***************
*** 1709,1721 ****
(save-excursion
(widen)
(set-buffer-multibyte nil)
! (while files
! (let* ((fil (car files))
! (p (+ archive-proper-file-start (car (aref fil 4))))
(creator (char-after (+ p 5)))
(oldmode (aref fil 3))
(newval (archive-calc-mode oldmode newmode t))
! buffer-read-only)
(cond ((memq creator '(2 3)) ; Unix + VMS
(goto-char (+ p 40))
(delete-char 2)
--- 1699,1710 ----
(save-excursion
(widen)
(set-buffer-multibyte nil)
! (dolist (fil files)
! (let* ((p (+ archive-proper-file-start (car (aref fil 4))))
(creator (char-after (+ p 5)))
(oldmode (aref fil 3))
(newval (archive-calc-mode oldmode newmode t))
! (inhibit-read-only t))
(cond ((memq creator '(2 3)) ; Unix + VMS
(goto-char (+ p 40))
(delete-char 2)
***************
*** 1726,1732 ****
(logand (logxor 1 (lsh newval -7)) 1)))
(delete-char 1))
(t (message "Don't know how to change mode for this member"))))
! (setq files (cdr files))))))
;; -------------------------------------------------------------------------
;; Section: Zoo Archives
--- 1715,1721 ----
(logand (logxor 1 (lsh newval -7)) 1)))
(delete-char 1))
(t (message "Don't know how to change mode for this member"))))
! ))))
;; -------------------------------------------------------------------------
;; Section: Zoo Archives
- [Emacs-diffs] Changes to emacs/lisp/arc-mode.el,
Stefan Monnier <=