X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epg-file.el;h=fc2123fda4f55641d8fdab1893599f3e1b3086d5;hb=c3ac2d6d6c872f7cb42fd87bcdf5894d7c34b5ca;hp=f7790ed1212d744ccbd1ae243302af9ac1c701ea;hpb=fd7f3c8821d346a008af1ada3128a88ad5be7bdf;p=elisp%2Fepg.git diff --git a/epg-file.el b/epg-file.el index f7790ed..fc2123f 100644 --- a/epg-file.el +++ b/epg-file.el @@ -10,16 +10,18 @@ with GnuPG." (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) @@ -27,10 +29,10 @@ with GnuPG." (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)))) ;; 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. @@ -45,7 +47,8 @@ with GnuPG." (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. @@ -65,10 +68,11 @@ with GnuPG." (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 @@ -85,29 +89,29 @@ with GnuPG." (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))) @@ -115,111 +119,35 @@ with GnuPG." (let ((buffer-file-name (if visit nil buffer-file-name))) (save-restriction (narrow-to-region (point) (point)) - (insert string) - (epg-file-decode-coding-inserted-region - (point-min) (point-max) - expanded-filename - visit beg end replace)) + (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))) + (list filename length))) -(if (fboundp 'decode-coding-inserted-region) - (defalias 'epg-file-decode-coding-inserted-region 'decode-coding-inserted-region) - (defun epg-file-decode-coding-inserted-region (from to filename - &optional visit beg end replace) - "Decode the region between FROM and TO as if it is read from file FILENAME. -The idea is that the text between FROM and TO was just inserted somehow. -Optional arguments VISIT, BEG, END, and REPLACE are the same as those -of the function `insert-file-contents'. -Part of the job of this function is setting `buffer-undo-list' appropriately." - (save-excursion - (save-restriction - (let ((coding coding-system-for-read) - undo-list-saved) - (if visit - ;; Temporarily turn off undo recording, if we're decoding the - ;; text of a visited file. - (setq buffer-undo-list t) - ;; Otherwise, if we can recognize the undo elt for the insertion, - ;; remove it and get ready to replace it later. - ;; In the mean time, turn off undo recording. - (let ((last (car-safe buffer-undo-list))) - (if (and (consp last) (eq (car last) from) (eq (cdr last) to)) - (setq undo-list-saved (cdr buffer-undo-list) - buffer-undo-list t)))) - (narrow-to-region from to) - (goto-char (point-min)) - (or coding - (setq coding (funcall set-auto-coding-function - filename (- (point-max) (point-min))))) - (or coding - (setq coding (car (find-operation-coding-system - 'insert-file-contents - filename visit beg end replace)))) - (if (coding-system-p coding) - (or enable-multibyte-characters - (setq coding - (coding-system-change-text-conversion coding 'raw-text))) - (setq coding nil)) - (if coding - (decode-coding-region (point-min) (point-max) coding) - (setq last-coding-system-used coding)) - ;; If we're decoding the text of a visited file, - ;; the undo list should start out empty. - (if visit - (setq buffer-undo-list nil) - ;; If we decided to replace the undo entry for the insertion, - ;; do so now. - (if undo-list-saved - (setq buffer-undo-list - (cons (cons from (point-max)) undo-list-saved))))))))) - -(put 'epg-file-handler 'safe-magic t) -(let (epg-file-operations) - (mapc - (lambda (operation) - (let ((epg-file-operation (intern (format "epg-file-%s" operation)))) - (when (fboundp epg-file-operation) - (push 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)) +(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) - (push (cons epg-file-name-regexp 'epg-file-handler) - file-name-handler-alist)) + (setq file-name-handler-alist + (cons (cons epg-file-name-regexp 'epg-file-handler) + file-name-handler-alist))) (unless (assoc epg-file-name-regexp auto-mode-alist) - (push (list epg-file-name-regexp nil 'strip-suffix) - auto-mode-alist)) + (setq auto-mode-alist + (cons (list epg-file-name-regexp nil 'strip-suffix) + auto-mode-alist)))