diff options
| author | Joakim Verona | 2013-03-26 16:20:17 +0100 |
|---|---|---|
| committer | Joakim Verona | 2013-03-26 16:20:17 +0100 |
| commit | 6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8 (patch) | |
| tree | 4a58903b4c3d010e90fc37fe10ea4d9895876d01 /lisp/cedet/srecode/mode.el | |
| parent | 62dd123f7c11ddbe156bc0e84dcb7ca1da5368bb (diff) | |
| parent | 48c226c2c2592e31a47559bd1689fcc4354d9479 (diff) | |
| download | emacs-6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8.tar.gz emacs-6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8.zip | |
conflict resolve
Diffstat (limited to 'lisp/cedet/srecode/mode.el')
| -rw-r--r-- | lisp/cedet/srecode/mode.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/cedet/srecode/mode.el b/lisp/cedet/srecode/mode.el index 8c4a53ec891..e8e1c78198e 100644 --- a/lisp/cedet/srecode/mode.el +++ b/lisp/cedet/srecode/mode.el | |||
| @@ -225,7 +225,7 @@ MENU-DEF is the menu to bind this into." | |||
| 225 | (ctxtcons (assoc ctxt alltabs)) | 225 | (ctxtcons (assoc ctxt alltabs)) |
| 226 | (bind (if (slot-boundp temp 'binding) | 226 | (bind (if (slot-boundp temp 'binding) |
| 227 | (oref temp binding))) | 227 | (oref temp binding))) |
| 228 | (name (object-name-string temp))) | 228 | (name (eieio-object-name-string temp))) |
| 229 | 229 | ||
| 230 | (when (not ctxtcons) | 230 | (when (not ctxtcons) |
| 231 | (if (string= context ctxt) | 231 | (if (string= context ctxt) |