aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/epa-file.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce275997a5c..189eb553ebd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12008-09-30 Daiki Ueno <ueno@unixuser.org>
2
3 * epa-file.el (epa-file-insert-file-contents): Fix typo.
4
12008-09-30 Glenn Morris <rgm@gnu.org> 52008-09-30 Glenn Morris <rgm@gnu.org>
2 6
3 * progmodes/which-func.el (which-func-imenu-joiner-function): Doc fix. 7 * progmodes/which-func.el (which-func-imenu-joiner-function): Doc fix.
diff --git a/lisp/epa-file.el b/lisp/epa-file.el
index f621a53e0f1..abc5bde7277 100644
--- a/lisp/epa-file.el
+++ b/lisp/epa-file.el
@@ -104,7 +104,7 @@
104 (error "Attempt to visit less than an entire file")) 104 (error "Attempt to visit less than an entire file"))
105 (setq file (expand-file-name file)) 105 (setq file (expand-file-name file))
106 (let* ((local-copy 106 (let* ((local-copy
107 (condition-case inl 107 (condition-case nil
108 (epa-file-run-real-handler #'file-local-copy (list file)) 108 (epa-file-run-real-handler #'file-local-copy (list file))
109 (error))) 109 (error)))
110 (local-file (or local-copy file)) 110 (local-file (or local-copy file))