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/fields.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/fields.el')
| -rw-r--r-- | lisp/cedet/srecode/fields.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/cedet/srecode/fields.el b/lisp/cedet/srecode/fields.el index 20852f78b41..f473a0d8261 100644 --- a/lisp/cedet/srecode/fields.el +++ b/lisp/cedet/srecode/fields.el | |||
| @@ -237,7 +237,7 @@ If SET-TO is a string, then replace the text of OLAID wit SET-TO." | |||
| 237 | 237 | ||
| 238 | (defsubst srecode-active-template-region () | 238 | (defsubst srecode-active-template-region () |
| 239 | "Return the active region for template fields." | 239 | "Return the active region for template fields." |
| 240 | (oref srecode-template-inserted-region active-region)) | 240 | (oref-default 'srecode-template-inserted-region active-region)) |
| 241 | 241 | ||
| 242 | (defun srecode-field-post-command () | 242 | (defun srecode-field-post-command () |
| 243 | "Srecode field handler in the post command hook." | 243 | "Srecode field handler in the post command hook." |