Mercurial > emacs
changeset 94752:73a86a36a458
Renamed lisp/epa-file-hook.el to lisp/epa-hook.el.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Thu, 08 May 2008 11:05:25 +0000 |
| parents | 17901fecbcc6 |
| children | b4b4a4b9fdb5 |
| files | lib-src/ChangeLog lib-src/makefile.w32-in lisp/ChangeLog lisp/epa-file-hook.el lisp/epa-hook.el src/ChangeLog src/Makefile.in |
| diffstat | 7 files changed, 123 insertions(+), 111 deletions(-) [+] |
line wrap: on
line diff
--- a/lib-src/ChangeLog Thu May 08 10:55:33 2008 +0000 +++ b/lib-src/ChangeLog Thu May 08 11:05:25 2008 +0000 @@ -1,3 +1,7 @@ +2008-05-08 Eli Zaretskii <eliz@gnu.org> + + * makefile.w32-in (lisp2): Rename epa-file-hook.elc to epa-hook.elc. + 2008-05-03 Eli Zaretskii <eliz@gnu.org> * makefile.w32-in (lisp2): Add epa-file-hook.elc, to track the
--- a/lib-src/makefile.w32-in Thu May 08 10:55:33 2008 +0000 +++ b/lib-src/makefile.w32-in Thu May 08 11:05:25 2008 +0000 @@ -281,7 +281,7 @@ $(lispsource)jka-cmpr-hook.elc \ $(lispsource)vc-hooks.elc \ $(lispsource)ediff-hook.elc \ - $(lispsource)epa-file-hook.elc \ + $(lispsource)epa-hook.elc \ $(TOOLTIP_SUPPORT) \ $(WINNT_SUPPORT) \ $(WINDOW_SUPPORT) \
--- a/lisp/ChangeLog Thu May 08 10:55:33 2008 +0000 +++ b/lisp/ChangeLog Thu May 08 11:05:25 2008 +0000 @@ -1,5 +1,8 @@ 2008-05-08 Eli Zaretskii <eliz@gnu.org> + * epa-hook.el: Renamed from epa-file-hook.el, to avoid + file-names clashes on 8+3 filesystems. + * org/org-jsinfo.el: Renamed from org-infojs.el, to avoid file-names clashes on 8+3 filesystems.
--- a/lisp/epa-file-hook.el Thu May 08 10:55:33 2008 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,108 +0,0 @@ -;;; epa-file-hook.el --- preloaded code to enable epa-file.el -;; Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc. - -;; Author: Daiki Ueno <ueno@unixuser.org> -;; Keywords: PGP, GnuPG - -;; This file is part of GNU Emacs. - -;; 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 -;; 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 -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. - -;;; Code: - -(defgroup epa-file nil - "The EasyPG Assistant hooks for transparent file encryption" - :version "23.1" - :group 'epa) - -(defun epa-file--file-name-regexp-set (variable value) - (set-default variable value) - (if (fboundp 'epa-file-name-regexp-update) - (epa-file-name-regexp-update))) - -(defcustom epa-file-name-regexp "\\.gpg\\(~\\|\\.~[0-9]+~\\)?\\'" - "Regexp which matches filenames to be encrypted with GnuPG. - -If you set this outside Custom while epa-file is already enabled, you -have to call `epa-file-name-regexp-update' after setting it to -properly update file-name-handler-alist. Setting this through Custom -does that automatically." - :type 'regexp - :group 'epa-file - :set 'epa-file--file-name-regexp-set) - -(defcustom epa-file-inhibit-auto-save t - "If non-nil, disable auto-saving when opening an encrypted file." - :type 'boolean - :group 'epa-file) - -(defvar epa-file-encrypt-to nil - "*Recipient(s) used for encrypting files. -May either be a string or a list of strings.") - -(put 'epa-file-encrypt-to 'safe-local-variable - (lambda (val) - (or (stringp val) - (and (listp val) - (catch 'safe - (mapc (lambda (elt) - (unless (stringp elt) - (throw 'safe nil))) - val) - t))))) - -(put 'epa-file-encrypt-to 'permanent-local t) - -(defvar epa-file-handler - (cons epa-file-name-regexp 'epa-file-handler)) - -(defvar epa-file-auto-mode-alist-entry - (list epa-file-name-regexp nil 'epa-file)) - -(defun epa-file-name-regexp-update () - (interactive) - (unless (equal (car epa-file-handler) epa-file-name-regexp) - (setcar epa-file-handler epa-file-name-regexp))) - -(defun epa-file-find-file-hook () - (if (and buffer-file-name - (string-match epa-file-name-regexp buffer-file-name) - epa-file-inhibit-auto-save) - (auto-save-mode 0)) - (set-buffer-modified-p nil)) - -(define-minor-mode auto-encryption-mode - "Toggle automatic file encryption and decryption. -With prefix argument ARG, turn auto encryption on if positive, else off. -Return the new status of auto encryption (non-nil means on)." - :global t :init-value t :group 'epa-file :version "23.1" - (setq file-name-handler-alist - (delq epa-file-handler file-name-handler-alist)) - (remove-hook 'find-file-hooks 'epa-file-find-file-hook) - (setq auto-mode-alist (delq epa-file-auto-mode-alist-entry - auto-mode-alist)) - (when auto-encryption-mode - (setq file-name-handler-alist - (cons epa-file-handler file-name-handler-alist)) - (add-hook 'find-file-hook 'epa-file-find-file-hook) - (setq auto-mode-alist (cons epa-file-auto-mode-alist-entry - auto-mode-alist)))) - -(put 'epa-file-handler 'safe-magic t) -(put 'epa-file-handler 'operations '(write-region insert-file-contents)) - -(provide 'epa-file-hook) - -;; arch-tag: f75c8a50-d32e-4eb3-9ec6-9e940c1fc8b5 -;;; epa-file-hook.el ends here
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lisp/epa-hook.el Thu May 08 11:05:25 2008 +0000 @@ -0,0 +1,108 @@ +;;; epa-hook.el --- preloaded code to enable epa-file.el +;; Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc. + +;; Author: Daiki Ueno <ueno@unixuser.org> +;; Keywords: PGP, GnuPG + +;; This file is part of GNU Emacs. + +;; 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 +;; 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 +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. + +;;; Code: + +(defgroup epa-file nil + "The EasyPG Assistant hooks for transparent file encryption" + :version "23.1" + :group 'epa) + +(defun epa-file--file-name-regexp-set (variable value) + (set-default variable value) + (if (fboundp 'epa-file-name-regexp-update) + (epa-file-name-regexp-update))) + +(defcustom epa-file-name-regexp "\\.gpg\\(~\\|\\.~[0-9]+~\\)?\\'" + "Regexp which matches filenames to be encrypted with GnuPG. + +If you set this outside Custom while epa-file is already enabled, you +have to call `epa-file-name-regexp-update' after setting it to +properly update file-name-handler-alist. Setting this through Custom +does that automatically." + :type 'regexp + :group 'epa-file + :set 'epa-file--file-name-regexp-set) + +(defcustom epa-file-inhibit-auto-save t + "If non-nil, disable auto-saving when opening an encrypted file." + :type 'boolean + :group 'epa-file) + +(defvar epa-file-encrypt-to nil + "*Recipient(s) used for encrypting files. +May either be a string or a list of strings.") + +(put 'epa-file-encrypt-to 'safe-local-variable + (lambda (val) + (or (stringp val) + (and (listp val) + (catch 'safe + (mapc (lambda (elt) + (unless (stringp elt) + (throw 'safe nil))) + val) + t))))) + +(put 'epa-file-encrypt-to 'permanent-local t) + +(defvar epa-file-handler + (cons epa-file-name-regexp 'epa-file-handler)) + +(defvar epa-file-auto-mode-alist-entry + (list epa-file-name-regexp nil 'epa-file)) + +(defun epa-file-name-regexp-update () + (interactive) + (unless (equal (car epa-file-handler) epa-file-name-regexp) + (setcar epa-file-handler epa-file-name-regexp))) + +(defun epa-file-find-file-hook () + (if (and buffer-file-name + (string-match epa-file-name-regexp buffer-file-name) + epa-file-inhibit-auto-save) + (auto-save-mode 0)) + (set-buffer-modified-p nil)) + +(define-minor-mode auto-encryption-mode + "Toggle automatic file encryption and decryption. +With prefix argument ARG, turn auto encryption on if positive, else off. +Return the new status of auto encryption (non-nil means on)." + :global t :init-value t :group 'epa-file :version "23.1" + (setq file-name-handler-alist + (delq epa-file-handler file-name-handler-alist)) + (remove-hook 'find-file-hooks 'epa-file-find-file-hook) + (setq auto-mode-alist (delq epa-file-auto-mode-alist-entry + auto-mode-alist)) + (when auto-encryption-mode + (setq file-name-handler-alist + (cons epa-file-handler file-name-handler-alist)) + (add-hook 'find-file-hook 'epa-file-find-file-hook) + (setq auto-mode-alist (cons epa-file-auto-mode-alist-entry + auto-mode-alist)))) + +(put 'epa-file-handler 'safe-magic t) +(put 'epa-file-handler 'operations '(write-region insert-file-contents)) + +(provide 'epa-file-hook) + +;; arch-tag: f75c8a50-d32e-4eb3-9ec6-9e940c1fc8b5 +;;; epa-file-hook.el ends here
--- a/src/ChangeLog Thu May 08 10:55:33 2008 +0000 +++ b/src/ChangeLog Thu May 08 11:05:25 2008 +0000 @@ -1,3 +1,8 @@ +2008-05-08 Eli Zaretskii <eliz@gnu.org> + + * Makefile.in (lisp, shortlisp): Rename epa-file-hook.elc to + epa-hook.elc. + 2008-05-08 Juanma Barranquero <lekktu@gmail.com> * font.c (Ffont_match_p): Don't use `iff' in docstring.
--- a/src/Makefile.in Thu May 08 10:55:33 2008 +0000 +++ b/src/Makefile.in Thu May 08 11:05:25 2008 +0000 @@ -779,7 +779,7 @@ ${lispsource}jka-cmpr-hook.elc \ ${lispsource}vc-hooks.elc \ ${lispsource}ediff-hook.elc \ - ${lispsource}epa-file-hook.elc \ + ${lispsource}epa-hook.elc \ TOOLTIP_SUPPORT \ VMS_SUPPORT \ MSDOS_SUPPORT \ @@ -871,7 +871,7 @@ ../lisp/vc-hooks.elc \ ../lisp/jka-cmpr-hook.elc \ ../lisp/ediff-hook.elc \ - ../lisp/epa-file-hook.elc \ + ../lisp/epa-hook.elc \ ../lisp/widget.elc \ ../lisp/window.elc \ ../lisp/version.el