diff options
| author | Joakim Verona | 2015-01-11 18:40:21 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-01-11 18:40:21 +0100 |
| commit | cc7cb20d6abc0f862e5513b24831bba0eaecaa5f (patch) | |
| tree | afc2fc05401504aa0c28699dc3bc155c5b0d7f58 /lisp/cedet/srecode/map.el | |
| parent | d972b504f30ff4300ba368940751e8736dddf0b4 (diff) | |
| parent | 9a57bda31569294ecaf8138a06e5edda9c0d87e3 (diff) | |
| download | emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.tar.gz emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.zip | |
merge master, fix conflicts
Diffstat (limited to 'lisp/cedet/srecode/map.el')
| -rw-r--r-- | lisp/cedet/srecode/map.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/cedet/srecode/map.el b/lisp/cedet/srecode/map.el index 7224d5942f6..cc0c4ae4427 100644 --- a/lisp/cedet/srecode/map.el +++ b/lisp/cedet/srecode/map.el | |||
| @@ -298,7 +298,7 @@ if that file is NEW, otherwise assume the mode has not changed." | |||
| 298 | (when (not srecode-current-map) | 298 | (when (not srecode-current-map) |
| 299 | (condition-case nil | 299 | (condition-case nil |
| 300 | (setq srecode-current-map | 300 | (setq srecode-current-map |
| 301 | (eieio-persistent-read srecode-map-save-file srecode-map)) | 301 | (eieio-persistent-read srecode-map-save-file 'srecode-map)) |
| 302 | (error | 302 | (error |
| 303 | ;; There was an error loading the old map. Create a new one. | 303 | ;; There was an error loading the old map. Create a new one. |
| 304 | (setq srecode-current-map | 304 | (setq srecode-current-map |