diff options
| author | Tassilo Horn | 2010-12-30 15:58:32 +0100 |
|---|---|---|
| committer | Tassilo Horn | 2010-12-30 15:58:32 +0100 |
| commit | f9e68477a2d70c3d371bffb7c9f9f080468ca8ce (patch) | |
| tree | 1755d2c7065a77ab1974de43644d3734e9c50b1c | |
| parent | ad727c819a625c4f9cf482dda17cf339fa88610c (diff) | |
| download | emacs-f9e68477a2d70c3d371bffb7c9f9f080468ca8ce.tar.gz emacs-f9e68477a2d70c3d371bffb7c9f9f080468ca8ce.zip | |
* doc-view.el (doc-view-toggle-display): Perform rassq-delete-all
on a copy of auto-mode-alist, because that deletes with side
effects.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/doc-view.el | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3b28681fec5..e241a65ff50 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,11 @@ | |||
| 1 | 2010-12-30 Tassilo Horn <tassilo@member.fsf.org> | 1 | 2010-12-30 Tassilo Horn <tassilo@member.fsf.org> |
| 2 | 2 | ||
| 3 | * doc-view.el (doc-view-toggle-display): Perform rassq-delete-all | ||
| 4 | on a copy of auto-mode-alist, because that deletes with side | ||
| 5 | effects. | ||
| 6 | |||
| 7 | 2010-12-30 Tassilo Horn <tassilo@member.fsf.org> | ||
| 8 | |||
| 3 | * doc-view.el (doc-view-mode, doc-view-toggle-display): Use | 9 | * doc-view.el (doc-view-mode, doc-view-toggle-display): Use |
| 4 | normal-mode without doc-view-mode bindings in auto-mode-alist as | 10 | normal-mode without doc-view-mode bindings in auto-mode-alist as |
| 5 | fallback instead of hard coding fundamental mode. | 11 | fallback instead of hard coding fundamental mode. |
diff --git a/lisp/doc-view.el b/lisp/doc-view.el index 526bf7694fb..a5dbff10564 100644 --- a/lisp/doc-view.el +++ b/lisp/doc-view.el | |||
| @@ -1061,7 +1061,8 @@ For now these keys are useful: | |||
| 1061 | ;; normal mode. | 1061 | ;; normal mode. |
| 1062 | (if doc-view-previous-major-mode | 1062 | (if doc-view-previous-major-mode |
| 1063 | (funcall doc-view-previous-major-mode) | 1063 | (funcall doc-view-previous-major-mode) |
| 1064 | (let ((auto-mode-alist (rassq-delete-all 'doc-view-mode auto-mode-alist))) | 1064 | (let ((auto-mode-alist (rassq-delete-all 'doc-view-mode |
| 1065 | (copy-alist auto-mode-alist)))) | ||
| 1065 | (normal-mode))) | 1066 | (normal-mode))) |
| 1066 | (doc-view-minor-mode 1)) | 1067 | (doc-view-minor-mode 1)) |
| 1067 | ;; Switch to doc-view-mode | 1068 | ;; Switch to doc-view-mode |