(let ((epg-file-operation (get operation 'epg-file)))
(if epg-file-operation
(apply epg-file-operation args)
- (epg-file-invoke-default-handler operation args))))
+ (epg-file-run-real-handler operation args))))
-(defun epg-file-invoke-default-handler (operation args)
+(defun epg-file-run-real-handler (operation args)
(let ((inhibit-file-name-handlers
- (cons 'epg-file-handler
- (and (eq inhibit-file-name-operation operation)
- inhibit-file-name-handlers)))
- (inhibit-file-name-operation operation))
+ (cons 'epg-file-handler
+ (and (eq inhibit-file-name-operation operation)
+ inhibit-file-name-handlers)))
+ (inhibit-file-name-operation operation))
(apply operation args)))
+(defvar buffer-file-type)
+(defvar last-coding-system-used)
(defun epg-file-write-region (start end filename &optional append visit
lockname mustbenew)
(let* ((visit-file (if (stringp visit)
(expand-file-name filename)))
;; XXX: Obtain the value returned by choose_write_coding_system
(coding-system (condition-case nil
- (epg-file-invoke-default-handler
- #'write-region
- (list start end "/"))
- (file-error last-coding-system-used)))
+ (epg-file-run-real-handler
+ 'write-region (list start end "/"))
+ (file-error (if (boundp 'last-coding-system-used)
+ last-coding-system-used
+ buffer-file-coding-system))))
;; start and end are normally buffer positions
;; specifying the part of the buffer to write.
;; If start is nil, that means to use the entire buffer contents.
(buffer-substring start end)))
coding-system)))
(with-temp-buffer
- (set-buffer-multibyte nil)
+ (if (fboundp 'set-buffer-multibyte)
+ (set-buffer-multibyte nil))
;; Optional fourth argument append if non-nil means
;; append to existing file contents (if any). If it is an integer,
;; seek to that offset in the file before writing.
(context (epg-make-context))
cipher)
(when (setq cipher (epg-encrypt-string context (buffer-string) nil))
- (if (memq system-type '(ms-dos windows-nt))
+ (if (and (memq system-type '(ms-dos windows-nt))
+ (boundp 'buffer-file-type))
(setq buffer-file-type t))
- (epg-file-invoke-default-handler
- #'write-region
+ (epg-file-run-real-handler
+ 'write-region
(list cipher nil filename nil 'not-visit lockname mustbenew)))))
;; Optional fifth argument visit, if t or a string, means
;; set the last-save-file-modtime of buffer to this file's modtime
(when (or (eq visit t) (stringp visit))
(setq buffer-file-name filename)
(set-visited-file-modtime))
- (when (stringp visit)
- (setq buffer-file-name visit))
+ (if (stringp visit)
+ (setq buffer-file-name visit))
(when (or (eq visit t) (eq visit nil) (stringp visit))
(message "Wrote %s" visit-file))
- (setq last-coding-system-used coding-system)
+ (if (boundp 'last-coding-system-used)
+ (setq last-coding-system-used coding-system))
nil))
(defun epg-file-insert-file-contents (filename &optional visit beg end replace)
(barf-if-buffer-read-only)
-
- ;; If visit is non-nil, beg and end must be nil.
- (if (and visit (or beg end))
- (error "Attempt to visit less than an entire file"))
-
- (let ((expanded-filename (expand-file-name filename))
+ (setq filename (expand-file-name filename))
+ (let ((filename (expand-file-name filename))
(length 0))
- (if (file-exists-p expanded-filename)
- (let* ((local-copy (epg-file-invoke-default-handler
- 'file-local-copy
- (list expanded-filename)))
- (local-file (or local-copy expanded-filename))
- (coding-system-for-read 'binary)
- (context (epg-make-context))
- string)
+ (if (file-exists-p filename)
+ (let ((local-file
+ (let ((inhibit-file-name-operation
+ (when (eq inhibit-file-name-operation
+ 'insert-file-contents)
+ 'file-local-copy)))
+ (file-local-copy filename)))
+ (coding-system-for-read 'binary)
+ (context (epg-make-context))
+ string)
(unwind-protect
(progn
- (setq string (epg-decrypt-file context local-file)
+ (setq string (epg-decrypt-file context (or local-file
+ filename))
length (length string))
(if replace
(goto-char (point-min)))
(insert (decode-coding-string string 'undecided)))
(if replace
(delete-region (point) (point-max))))))
- (when (and local-copy (file-exists-p local-copy))
- (delete-file local-copy)))))
+ (when (and local-file (file-exists-p local-file))
+ (delete-file local-file)))))
;; If second argument visit is non-nil, the buffer's visited filename
;; and last save file modtime are set, and it is marked unmodified.
(when visit
(unlock-buffer)
- (setq buffer-file-name expanded-filename)
+ (setq buffer-file-name filename)
(set-visited-file-modtime))
;; If visiting and the file does not exist, visiting is completed
;; before the error is signaled.
- (if (and visit (not (file-exists-p expanded-filename)))
+ (if (and visit (not (file-exists-p filename)))
(signal 'file-error (list "Opening input file" filename)))
;; Returns list of absolute file name and number of characters inserted.
- (list expanded-filename length)))
-
-(put 'epg-file-handler 'safe-magic t)
-(let (epg-file-operations)
- (mapc
- (lambda (operation)
- (let ((epg-file-operation (intern (format "epg-file-%s" operation))))
- (setq epg-file-operation (cons operation epg-file-operations))
- (put operation 'epg-file epg-file-operation)))
- '(access-file add-name-to-file byte-compiler-base-file-name copy-file
- delete-directory delete-file diff-latest-backup-file directory-file-name
- directory-files directory-files-and-attributes dired-call-process
- dired-compress-file dired-uncache expand-file-name
- file-accessible-directory-p file-attributes file-directory-p
- file-executable-p file-exists-p file-local-copy file-remote-p file-modes
- file-name-all-completions file-name-as-directory file-name-completion
- file-name-directory file-name-nondirectory file-name-sans-versions
- file-newer-than-file-p file-ownership-preserved-p file-readable-p
- file-regular-p file-symlink-p file-truename file-writable-p
- find-backup-file-name find-file-noselect get-file-buffer
- insert-directory insert-file-contents load make-directory
- make-directory-internal make-symbolic-link rename-file set-file-modes
- set-visited-file-modtime shell-command substitute-in-file-name
- unhandled-file-name-directory vc-registered verify-visited-file-modtime
- write-region))
- (put 'epg-file-handler 'operations epg-file-operations))
+ (list filename length)))
+
+(put 'write-region 'epg-file 'epg-file-write-region)
+(put 'insert-file-contents 'epg-file 'epg-file-insert-file-contents)
(unless (assoc epg-file-name-regexp file-name-handler-alist)
(setq file-name-handler-alist
projects / elisp / epg.git / blobdiff