aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/cedet/srecode/insert.el
diff options
context:
space:
mode:
authorAlan Mackenzie2011-11-03 22:03:18 +0000
committerAlan Mackenzie2011-11-03 22:03:18 +0000
commit85ba4cded3ef5a834c880edfdb6cf7ec3a747e9b (patch)
tree2a207d6e9e906119087ad357c892414db01211cb /lisp/cedet/srecode/insert.el
parenta6ba2ab9277496b66f6939766a3470c1f0a84287 (diff)
parent14e1d9eab9f4b7341f92397a0a9a2706f7b26ee9 (diff)
downloademacs-85ba4cded3ef5a834c880edfdb6cf7ec3a747e9b.tar.gz
emacs-85ba4cded3ef5a834c880edfdb6cf7ec3a747e9b.zip
Merge.
Diffstat (limited to 'lisp/cedet/srecode/insert.el')
-rw-r--r--lisp/cedet/srecode/insert.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index 931d0b3d73e..84964a9e8b4 100644
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -1,4 +1,4 @@
1;;; srecode/insert --- Insert srecode templates to an output stream. 1;;; srecode/insert.el --- Insert srecode templates to an output stream.
2 2
3;; Copyright (C) 2005, 2007-2011 Free Software Foundation, Inc. 3;; Copyright (C) 2005, 2007-2011 Free Software Foundation, Inc.
4 4
@@ -911,7 +911,7 @@ this template instance."
911 (setq active (cdr active))) 911 (setq active (cdr active)))
912 (when (not tmpl) 912 (when (not tmpl)
913 ;; If it wasn't in this context, look to see if it 913 ;; If it wasn't in this context, look to see if it
914 ;; defines it's own context 914 ;; defines its own context
915 (setq tmpl (srecode-template-get-table (srecode-table) 915 (setq tmpl (srecode-template-get-table (srecode-table)
916 templatenamepart))) 916 templatenamepart)))
917 ) 917 )