branch: elpa/vm
commit b8abcfe7611f7433d561278f260bb7a009e22d22
Author: Stefan Monnier <monn...@iro.umontreal.ca>
Commit: Stefan Monnier <monn...@iro.umontreal.ca>
Don't modify immediate constants
* lisp/vm-toolbar.el (vm-toolbar-fsfemacs-install-toolbar):
* lisp/vm-mime.el (vm-get-coding-system-priorities): Don't modify constant.
---
lisp/vm-mime.el | 16 ++++++++--------
lisp/vm-toolbar.el | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/lisp/vm-mime.el b/lisp/vm-mime.el
index 2e07ea54bf..d0387c40c5 100644
--- a/lisp/vm-mime.el
+++ b/lisp/vm-mime.el
@@ -116,14 +116,14 @@
(defun vm-get-coding-system-priorities ()
"Return the value of `vm-coding-system-priorities', or a reasonable
default for it if it's nil. "
- (if vm-coding-system-priorities
- vm-coding-system-priorities
- (let ((res '(iso-8859-1 iso-8859-2 iso-8859-15 iso-8859-16 utf-8)))
- (dolist (list-item res)
- ;; Assumes iso-8859-1 is always available, which is reasonable.
- (unless (vm-coding-system-p list-item)
- (delq list-item res)))
- res)))
+ (or vm-coding-system-priorities
+ ;; FIXME: `utf-8' should be first nowadays!
+ (let ((res '(iso-8859-1 iso-8859-2 iso-8859-15 iso-8859-16 utf-8)))
+ (dolist (list-item res)
+ ;; Assumes iso-8859-1 is always available, which is reasonable.
+ (unless (vm-coding-system-p list-item)
+ (setq res (remq list-item res))))
+ res)))
(defun vm-mime-charset-to-coding (charset)
"Return the Emacs coding system corresonding to the given mime CHARSET."
diff --git a/lisp/vm-toolbar.el b/lisp/vm-toolbar.el
index edda1173c4..f8d6b701f7 100644
--- a/lisp/vm-toolbar.el
+++ b/lisp/vm-toolbar.el
@@ -566,7 +566,7 @@ s-expression like this one in your .vm file:
(if (and (boundp 'tool-bar-map)
(consp tool-bar-map))
(let ((map (cdr tool-bar-map))
- (v [tool-bar x]))
+ (v (vector 'tool-bar 'x)))
(while map
(aset v 1 (car (car map)))
(define-key vm-mode-map v 'undefined)
