projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Give a better error message in the "go offline" case.
[gnus]
/
lisp
/
binhex.el
diff --git
a/lisp/binhex.el
b/lisp/binhex.el
index
120821f
..
42d2f35
100644
(file)
--- a/
lisp/binhex.el
+++ b/
lisp/binhex.el
@@
-1,15
+1,17
@@
;;; binhex.el --- elisp native binhex decode
;;; binhex.el --- elisp native binhex decode
-;; Copyright (c) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
;; Keywords: binhex news
;; This file is part of GNU Emacs.
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
;; Keywords: binhex news
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software
;
you can redistribute it and/or modify
+;; GNU Emacs is free software
:
you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation
; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation
, either version 3 of the License, or
+;;
(at your option)
any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-17,16
+19,12
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Code:
;;; Commentary:
;;; Code:
-(autoload 'executable-find "executable")
-
(eval-when-compile (require 'cl))
(eval-and-compile
(eval-when-compile (require 'cl))
(eval-and-compile
@@
-35,22
+33,28
@@
'char-int
'identity)))
'char-int
'identity)))
+(defgroup binhex nil
+ "Decoding of BinHex (binary-to-hexadecimal) data."
+ :group 'mail
+ :group 'news)
+
(defcustom binhex-decoder-program "hexbin"
(defcustom binhex-decoder-program "hexbin"
- "*Non-nil value should be a string that names a
uu
decoder.
+ "*Non-nil value should be a string that names a
binhex
decoder.
The program should expect to read binhex data on its standard
input and write the converted data to its standard output."
:type 'string
The program should expect to read binhex data on its standard
input and write the converted data to its standard output."
:type 'string
- :group '
gnus-extract
)
+ :group '
binhex
)
(defcustom binhex-decoder-switches '("-d")
(defcustom binhex-decoder-switches '("-d")
- "*List of command line flags passed to the command
named by binhex-decoder-program
."
- :group '
gnus-extract
+ "*List of command line flags passed to the command
`binhex-decoder-program'
."
+ :group '
binhex
:type '(repeat string))
:type '(repeat string))
-(defcustom binhex-use-external
+(defcustom binhex-use-external
(executable-find binhex-decoder-program)
"*Use external binhex program."
(executable-find binhex-decoder-program)
"*Use external binhex program."
- :group 'gnus-extract
+ :version "22.1"
+ :group 'binhex
:type 'boolean)
(defconst binhex-alphabet-decoding-alist
:type 'boolean)
(defconst binhex-alphabet-decoding-alist
@@
-81,13
+85,16
@@
input and write the converted data to its standard output."
((boundp 'temporary-file-directory) temporary-file-directory)
("/tmp/")))
((boundp 'temporary-file-directory) temporary-file-directory)
("/tmp/")))
-(if (featurep 'xemacs)
- (defalias 'binhex-insert-char 'insert-char)
- (defun binhex-insert-char (char &optional count ignored buffer)
- (if (or (null buffer) (eq buffer (current-buffer)))
- (insert-char char count)
- (with-current-buffer buffer
- (insert-char char count)))))
+(eval-and-compile
+ (defalias 'binhex-insert-char
+ (if (featurep 'xemacs)
+ 'insert-char
+ (lambda (char &optional count ignored buffer)
+ "Insert COUNT copies of CHARACTER into BUFFER."
+ (if (or (null buffer) (eq buffer (current-buffer)))
+ (insert-char char count)
+ (with-current-buffer buffer
+ (insert-char char count)))))))
(defvar binhex-crc-table
[0 4129 8258 12387 16516 20645 24774 28903
(defvar binhex-crc-table
[0 4129 8258 12387 16516 20645 24774 28903
@@
-213,8
+220,9
@@
If HEADER-ONLY is non-nil only decode header and return filename."
(save-excursion
(goto-char start)
(when (re-search-forward binhex-begin-line end t)
(save-excursion
(goto-char start)
(when (re-search-forward binhex-begin-line end t)
- (let (default-enable-multibyte-characters)
- (setq work-buffer (generate-new-buffer " *binhex-work*")))
+ (setq work-buffer (generate-new-buffer " *binhex-work*"))
+ (unless (featurep 'xemacs)
+ (with-current-buffer work-buffer (set-buffer-multibyte nil)))
(beginning-of-line)
(setq bits 0 counter 0)
(while tmp
(beginning-of-line)
(setq bits 0 counter 0)
(while tmp
@@
-240,14
+248,13
@@
If HEADER-ONLY is non-nil only decode header and return filename."
(setq file-name-length (char-after (point-min))
data-fork-start (+ (point-min)
file-name-length 22))))
(setq file-name-length (char-after (point-min))
data-fork-start (+ (point-min)
file-name-length 22))))
- (if (and (null header)
- (with-current-buffer work-buffer
- (>= (buffer-size) data-fork-start)))
- (progn
- (binhex-verify-crc work-buffer
- 1 data-fork-start)
- (setq header (binhex-header work-buffer))
- (if header-only (setq tmp nil counter 0))))
+ (when (and (null header)
+ (with-current-buffer work-buffer
+ (>= (buffer-size) data-fork-start)))
+ (binhex-verify-crc work-buffer
+ (point-min) data-fork-start)
+ (setq header (binhex-header work-buffer))
+ (when header-only (setq tmp nil counter 0)))
(setq tmp (and tmp (not (eq inputpos end)))))
(cond
((= counter 3)
(setq tmp (and tmp (not (eq inputpos end)))))
(cond
((= counter 3)
@@
-277,7
+284,7
@@
If HEADER-ONLY is non-nil only decode header and return filename."
(interactive "r")
(let ((cbuf (current-buffer)) firstline work-buffer status
(file-name (expand-file-name
(interactive "r")
(let ((cbuf (current-buffer)) firstline work-buffer status
(file-name (expand-file-name
- (concat (binhex-decode-region-internal start end t)
+ (concat (binhex-decode-region-internal start end t)
".data")
binhex-temporary-file-directory)))
(save-excursion
".data")
binhex-temporary-file-directory)))
(save-excursion
@@
-315,7
+322,7
@@
If HEADER-ONLY is non-nil only decode header and return filename."
(defun binhex-decode-region (start end)
"Binhex decode region between START and END."
(interactive "r")
(defun binhex-decode-region (start end)
"Binhex decode region between START and END."
(interactive "r")
- (if binhex-use-external
+ (if binhex-use-external
(binhex-decode-region-external start end)
(binhex-decode-region-internal start end)))
(binhex-decode-region-external start end)
(binhex-decode-region-internal start end)))